From c34802b37b7459ed2ab794b8cb65260e5e74c12b Mon Sep 17 00:00:00 2001
From: sinbad <sinbadxiii@gmail.com>
Date: Thu, 11 Aug 2022 11:13:33 +0500
Subject: [PATCH 01/76] setcookie() Passing null to parameter #2 ($value) of
 type string is deprecated

---
 phalcon/Http/Cookie.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Http/Cookie.zep b/phalcon/Http/Cookie.zep
index a09beef871b..2009e2d660b 100644
--- a/phalcon/Http/Cookie.zep
+++ b/phalcon/Http/Cookie.zep
@@ -157,7 +157,7 @@ class Cookie extends AbstractInjectionAware implements CookieInterface
             options["secure"]   = this->getArrVal(options, "secure", secure),
             options["httponly"] = this->getArrVal(options, "httponly", httpOnly);
 
-        setcookie(name, null, options);
+        setcookie(name, "", options);
     }
 
     /**

From 755534b5544bbf0116657ddd9f21dd5129a85ebf Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 22 Aug 2022 11:01:42 +0100
Subject: [PATCH 02/76] #16023 - Bump `ZEPHIR_VERSION` to `0.16.1`

---
 .github/workflows/main.yml | 2 +-
 docker/7.4/.bashrc         | 2 +-
 docker/8.0/.bashrc         | 2 +-
 docker/8.1/.bashrc         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e5beb48e53..b1b8b3f8f4f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ env:
   # All versions should be declared here
   PHALCON_VERSION: 5.0.0RC4
   ZEPHIR_PARSER_VERSION: 1.5.0
-  ZEPHIR_VERSION: 0.16.0
+  ZEPHIR_VERSION: 0.16.1
 
   # For tests
   LANG: en_US.UTF-8
diff --git a/docker/7.4/.bashrc b/docker/7.4/.bashrc
index efe64453051..d3a90d0ad92 100644
--- a/docker/7.4/.bashrc
+++ b/docker/7.4/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.0"
+ZEPHIR_VERSION="0.16.1"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
diff --git a/docker/8.0/.bashrc b/docker/8.0/.bashrc
index efe64453051..d3a90d0ad92 100644
--- a/docker/8.0/.bashrc
+++ b/docker/8.0/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.0"
+ZEPHIR_VERSION="0.16.1"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc
index 47fa4435711..d3a90d0ad92 100644
--- a/docker/8.1/.bashrc
+++ b/docker/8.1/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.15.2"
+ZEPHIR_VERSION="0.16.1"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

From 0dc450a4196eacd6406609d3cde60f08145d4413 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 22 Aug 2022 11:03:07 +0100
Subject: [PATCH 03/76] #16023 - Adjust condition

---
 phalcon/Events/Event.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Events/Event.zep b/phalcon/Events/Event.zep
index 27142b0df9c..1d0d5b6060c 100644
--- a/phalcon/Events/Event.zep
+++ b/phalcon/Events/Event.zep
@@ -67,7 +67,7 @@ class Event implements EventInterface
      */
     public function __construct(string! type, var source = null, var data = null, bool cancelable = true)
     {
-        if unlikely null !== source && typeof source != "object" {
+        if unlikely null !== source && typeof source !== "object" {
             throw new Exception(
                 "The source of " . type . " event must be an object, got " . (typeof source)
             );

From 9e95039671d5edbbd87f5753ea239494be0375a9 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 22 Aug 2022 11:04:35 +0100
Subject: [PATCH 04/76] #16023 - Declare `Event:getSource()` method with
 correct signature

---
 phalcon/Events/Event.zep | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phalcon/Events/Event.zep b/phalcon/Events/Event.zep
index 1d0d5b6060c..0b491e2967c 100644
--- a/phalcon/Events/Event.zep
+++ b/phalcon/Events/Event.zep
@@ -44,7 +44,7 @@ class Event implements EventInterface
      *
      * @var object|null
      */
-    protected source { get };
+    protected source = null;
 
     /**
      * Is event propagation stopped?
@@ -100,6 +100,11 @@ class Event implements EventInterface
         return this->stopped;
     }
 
+    public function getSource() -> object | null
+    {
+        return this->source;
+    }
+
     /**
      * Sets event data.
      */

From a56f204f51417e51a7ef8400a44bc7275afd6be3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 22 Aug 2022 23:31:43 +0100
Subject: [PATCH 05/76] #16023 - Bump `ZEPHIR_VERSION` to `0.16.2`

---
 .github/workflows/main.yml | 2 +-
 docker/7.4/.bashrc         | 2 +-
 docker/8.0/.bashrc         | 2 +-
 docker/8.1/.bashrc         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b1b8b3f8f4f..f18c0cec789 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ env:
   # All versions should be declared here
   PHALCON_VERSION: 5.0.0RC4
   ZEPHIR_PARSER_VERSION: 1.5.0
-  ZEPHIR_VERSION: 0.16.1
+  ZEPHIR_VERSION: 0.16.2
 
   # For tests
   LANG: en_US.UTF-8
diff --git a/docker/7.4/.bashrc b/docker/7.4/.bashrc
index d3a90d0ad92..c41a273e86c 100644
--- a/docker/7.4/.bashrc
+++ b/docker/7.4/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.1"
+ZEPHIR_VERSION="0.16.2"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
diff --git a/docker/8.0/.bashrc b/docker/8.0/.bashrc
index d3a90d0ad92..c41a273e86c 100644
--- a/docker/8.0/.bashrc
+++ b/docker/8.0/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.1"
+ZEPHIR_VERSION="0.16.2"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc
index d3a90d0ad92..c41a273e86c 100644
--- a/docker/8.1/.bashrc
+++ b/docker/8.1/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.1"
+ZEPHIR_VERSION="0.16.2"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

From 1cca79de3297a754c780f580697ced4af1250639 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 22 Aug 2022 23:32:36 +0100
Subject: [PATCH 06/76] #16023 - Regenerate ext/ directory

---
 .../pdo/connection/abstractconnection.zep.h   |  6 ++++-
 .../pdo/connection/connectioninterface.zep.h  |  6 ++++-
 ext/phalcon/events/event.zep.c                | 23 ++++++++-----------
 ext/phalcon/events/event.zep.h                | 14 +++++++----
 ext/phalcon/http/cookie.zep.c                 |  4 +++-
 ext/phalcon/mvc/micro/lazyloader.zep.h        |  6 ++++-
 ext/phalcon/support/helper/arr/toobject.zep.h |  6 ++++-
 ext/php_phalcon.h                             |  2 +-
 8 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.h b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.h
index 14c3cbbc90d..9a30fe1d0c9 100644
--- a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.h
+++ b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.h
@@ -114,7 +114,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connectio
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_abstractconnection_fetchobject, 0, 1, NULL, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_datamapper_pdo_connection_abstractconnection_fetchobject, 0, 1, MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_abstractconnection_fetchobject, 0, 1, IS_OBJECT, 0)
+#endif
 	ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, values, IS_ARRAY, 0, "[]")
diff --git a/ext/phalcon/datamapper/pdo/connection/connectioninterface.zep.h b/ext/phalcon/datamapper/pdo/connection/connectioninterface.zep.h
index 63c9ab99cf5..1e3563c7fa2 100644
--- a/ext/phalcon/datamapper/pdo/connection/connectioninterface.zep.h
+++ b/ext/phalcon/datamapper/pdo/connection/connectioninterface.zep.h
@@ -56,7 +56,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connectio
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_connectioninterface_fetchobject, 0, 1, NULL, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_datamapper_pdo_connection_connectioninterface_fetchobject, 0, 1, MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_connectioninterface_fetchobject, 0, 1, IS_OBJECT, 0)
+#endif
 	ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, values, IS_ARRAY, 0, "[]")
diff --git a/ext/phalcon/events/event.zep.c b/ext/phalcon/events/event.zep.c
index 7fdec350012..2c6ef515b96 100644
--- a/ext/phalcon/events/event.zep.c
+++ b/ext/phalcon/events/event.zep.c
@@ -92,18 +92,6 @@ PHP_METHOD(Phalcon_Events_Event, getData)
 	RETURN_MEMBER(getThis(), "data");
 }
 
-/**
- * Event source
- */
-PHP_METHOD(Phalcon_Events_Event, getSource)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "source");
-}
-
 /**
  * Event type
  */
@@ -235,6 +223,15 @@ PHP_METHOD(Phalcon_Events_Event, isStopped)
 	RETURN_MEMBER(getThis(), "stopped");
 }
 
+PHP_METHOD(Phalcon_Events_Event, getSource)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "source");
+}
+
 /**
  * Sets event data.
  */
@@ -323,7 +320,7 @@ PHP_METHOD(Phalcon_Events_Event, stop)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("cancelable"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!zephir_is_true(&_0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_events_exception_ce, "Trying to cancel a non-cancelable event", "phalcon/Events/Event.zep", 135);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_events_exception_ce, "Trying to cancel a non-cancelable event", "phalcon/Events/Event.zep", 140);
 		return;
 	}
 	if (1) {
diff --git a/ext/phalcon/events/event.zep.h b/ext/phalcon/events/event.zep.h
index 23d54cb8271..032be6f3693 100644
--- a/ext/phalcon/events/event.zep.h
+++ b/ext/phalcon/events/event.zep.h
@@ -4,11 +4,11 @@ extern zend_class_entry *phalcon_events_event_ce;
 ZEPHIR_INIT_CLASS(Phalcon_Events_Event);
 
 PHP_METHOD(Phalcon_Events_Event, getData);
-PHP_METHOD(Phalcon_Events_Event, getSource);
 PHP_METHOD(Phalcon_Events_Event, getType);
 PHP_METHOD(Phalcon_Events_Event, __construct);
 PHP_METHOD(Phalcon_Events_Event, isCancelable);
 PHP_METHOD(Phalcon_Events_Event, isStopped);
+PHP_METHOD(Phalcon_Events_Event, getSource);
 PHP_METHOD(Phalcon_Events_Event, setData);
 PHP_METHOD(Phalcon_Events_Event, setType);
 PHP_METHOD(Phalcon_Events_Event, stop);
@@ -16,9 +16,6 @@ PHP_METHOD(Phalcon_Events_Event, stop);
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event_getdata, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_events_event_getsource, 0, 0, NULL, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_gettype, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -35,6 +32,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_isstopped, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_events_event_getsource, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_getsource, 0, 0, IS_OBJECT, 1)
+#endif
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_events_event_setdata, 0, 0, Phalcon\\Events\\EventInterface, 0)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
@@ -52,11 +56,11 @@ ZEPHIR_INIT_FUNCS(phalcon_events_event_method_entry) {
 #else
 	PHP_ME(Phalcon_Events_Event, getData, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Events_Event, getSource, arginfo_phalcon_events_event_getsource, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, getType, arginfo_phalcon_events_event_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, __construct, arginfo_phalcon_events_event___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Events_Event, isCancelable, arginfo_phalcon_events_event_iscancelable, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, isStopped, arginfo_phalcon_events_event_isstopped, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Events_Event, getSource, arginfo_phalcon_events_event_getsource, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, setData, arginfo_phalcon_events_event_setdata, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, setType, arginfo_phalcon_events_event_settype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, stop, arginfo_phalcon_events_event_stop, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c
index 6e474cc2742..1b89cbeaf41 100644
--- a/ext/phalcon/http/cookie.zep.c
+++ b/ext/phalcon/http/cookie.zep.c
@@ -334,7 +334,9 @@ PHP_METHOD(Phalcon_Http_Cookie, delete)
 	ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 332, &options, &_8, &httpOnly);
 	zephir_check_call_status();
 	zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE);
-	ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 333, &name, &__$null, &options);
+	ZEPHIR_INIT_NVAR(&_8);
+	ZVAL_STRING(&_8, "");
+	ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 333, &name, &_8, &options);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
diff --git a/ext/phalcon/mvc/micro/lazyloader.zep.h b/ext/phalcon/mvc/micro/lazyloader.zep.h
index 5d5cd933cc2..639001b5689 100644
--- a/ext/phalcon/mvc/micro/lazyloader.zep.h
+++ b/ext/phalcon/mvc/micro/lazyloader.zep.h
@@ -8,7 +8,11 @@ PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition);
 PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, __construct);
 PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod);
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, NULL, 1)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, IS_OBJECT, 1)
+#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_getdefinition, 0, 0, IS_STRING, 0)
diff --git a/ext/phalcon/support/helper/arr/toobject.zep.h b/ext/phalcon/support/helper/arr/toobject.zep.h
index df4d3649136..9201f906fae 100644
--- a/ext/phalcon/support/helper/arr/toobject.zep.h
+++ b/ext/phalcon/support/helper/arr/toobject.zep.h
@@ -5,7 +5,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Support_Helper_Arr_ToObject);
 
 PHP_METHOD(Phalcon_Support_Helper_Arr_ToObject, __invoke);
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_support_helper_arr_toobject___invoke, 0, 1, NULL, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_support_helper_arr_toobject___invoke, 0, 1, MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_helper_arr_toobject___invoke, 0, 1, IS_OBJECT, 0)
+#endif
 	ZEND_ARG_ARRAY_INFO(0, collection, 0)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
index daaac13d96a..c7f03f18ba0 100644
--- a/ext/php_phalcon.h
+++ b/ext/php_phalcon.h
@@ -14,7 +14,7 @@
 #define PHP_PHALCON_VERSION     "5.0.0RC4"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.0-4fac47b"
+#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

From ef003b1d83d5f871f41bd691d40af942bdf6cb47 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 23 Aug 2022 00:01:32 +0100
Subject: [PATCH 07/76] #16023 - Update CHANGELOG-5.0.md

---
 CHANGELOG-5.0.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 4b7e0c2c901..48f4b1cd279 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -1,3 +1,8 @@
+# [x.x.x](https://github.com/phalcon/cphalcon/releases/tag/vx.x.x) (xxxx-xx-xx)
+
+## Fixed
+- Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
+
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 
 ## Fixed 

From b87f9cc399558d6827e989976f47284e317e762c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 23 Aug 2022 00:03:33 +0100
Subject: [PATCH 08/76] #16023 - Adjust comments style

---
 phalcon/Tag.zep | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phalcon/Tag.zep b/phalcon/Tag.zep
index b52c584bcfd..e066e2d25fd 100644
--- a/phalcon/Tag.zep
+++ b/phalcon/Tag.zep
@@ -1477,8 +1477,8 @@ class Tag
         }
 
         /**
-        * Automatically assign the id if the name is not an array
-        */
+         * Automatically assign the id if the name is not an array
+         */
         if !strpos(id, "[") {
             if !isset params["id"] {
                 let params["id"] = id;
@@ -1502,15 +1502,15 @@ class Tag
             let value = self::getValue(id, params);
 
             /**
-            * Evaluate the value in POST
-            */
+             * Evaluate the value in POST
+             */
             if value != null {
                 let params["checked"] = "checked";
             }
 
             /**
-            * Update the value anyways
-            */
+             * Update the value anyways
+             */
             let params["value"] = value;
         }
 

From 66ce294caacf54caf6fe21792c741756f8423105 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 11:57:48 -0400
Subject: [PATCH 09/76] updating code owners

---
 CODE_OWNERS.TXT | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/CODE_OWNERS.TXT b/CODE_OWNERS.TXT
index 6b6e5a04149..08c4ffe25a6 100644
--- a/CODE_OWNERS.TXT
+++ b/CODE_OWNERS.TXT
@@ -11,20 +11,13 @@ beautification by scripts.  The fields are: name (N), email (E), web-address
 The sample of querying command to search PECL keyword:
   awk -v RS='' -v ORS='\n\n' '/\nD: .*PECL/' CODE_OWNERS.TXT
 
-N: Ruud Boon
-E: ruud@phalcon.io
-W: https://ruudboon.io
-P: 0xF2E9F914DFA1BCD7
-D: PECL and all parts of Phalcon not covered by someone else
+N: Anton Vasiliev
+E: anton@phalcon.io
+P:
+D: PECL, CI/CD Integration, Zephir support, Parsers and Scanners, Volt, Annotation, PHQL support
 
 N: Nikolaos Dimopoulos
 E: niden@phalcon.io
 W: https://niden.net
 P: 0x93F8CA07B9C8C41D
 D: All parts of Phalcon not covered by someone else excluding PECL
-
-N: Serghei Iakovlev
-E: serghei@phalcon.io
-W: https://serghei.blog
-P: 0x1E0B5331219BEA88
-D: CI/CD Integration, Zephir support, Parsers and Scanners, Volt, Annotation, PHQL support

From 0129658f3ac468dcc5294d401403e166302a8069 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 13:33:52 -0400
Subject: [PATCH 10/76] [#.0.x] - fixing docblock for autocompletion

---
 phalcon/Html/TagFactory.zep | 82 ++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/phalcon/Html/TagFactory.zep b/phalcon/Html/TagFactory.zep
index 6b811ade25e..08ab89eab3f 100644
--- a/phalcon/Html/TagFactory.zep
+++ b/phalcon/Html/TagFactory.zep
@@ -26,47 +26,47 @@ use Phalcon\Factory\AbstractFactory;
  * @property EscaperInterface $escaper
  * @property array            $services
  *
- * @method a(string $href, string $text, array $attributes = [], bool $raw = false): string
- * @method base(string $href, array $attributes = []): string
- * @method body(array $attributes = []): string
- * @method button(string $text, array $attributes = [], bool $raw = false): string
- * @method close(string $tag, bool $raw = false): string
- * @method doctype(int $flag, string $delimiter): string
- * @method element(string $tag, string $text, array $attributes = [], bool $raw = false): string
- * @method form(array $attributes = []): string
- * @method img(string $src, array $attributes = []): string
- * @method inputCheckbox(string $name, string $value = null, array $attributes = []): string
- * @method inputColor(string $name, string $value = null, array $attributes = []): string
- * @method inputDate(string $name, string $value = null, array $attributes = []): string
- * @method inputDateTime(string $name, string $value = null, array $attributes = []): string
- * @method inputDateTimeLocal(string $name, string $value = null, array $attributes = []): string
- * @method inputEmail(string $name, string $value = null, array $attributes = []): string
- * @method inputFile(string $name, string $value = null, array $attributes = []): string
- * @method inputHidden(string $name, string $value = null, array $attributes = []): string
- * @method inputImage(string $name, string $value = null, array $attributes = []): string
- * @method inputInput(string $name, string $value = null, array $attributes = []): string
- * @method inputMonth(string $name, string $value = null, array $attributes = []): string
- * @method inputNumeric(string $name, string $value = null, array $attributes = []): string
- * @method inputPassword(string $name, string $value = null, array $attributes = []): string
- * @method inputRadio(string $name, string $value = null, array $attributes = []): string
- * @method inputRange(string $name, string $value = null, array $attributes = []): string
- * @method inputSearch(string $name, string $value = null, array $attributes = []): string
- * @method inputSelect(string $name, string $value = null, array $attributes = []): string
- * @method inputSubmit(string $name, string $value = null, array $attributes = []): string
- * @method inputTel(string $name, string $value = null, array $attributes = []): string
- * @method inputText(string $name, string $value = null, array $attributes = []): string
- * @method inputTextarea(string $name, string $value = null, array $attributes = []): string
- * @method inputTime(string $name, string $value = null, array $attributes = []): string
- * @method inputUrl(string $name, string $value = null, array $attributes = []): string
- * @method inputWeek(string $name, string $value = null, array $attributes = []): string
- * @method label(string $label, array $attributes = [], bool $raw = false): string
- * @method link(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method meta(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method ol(string $text, array $attributes = [], bool $raw = false): string
- * @method script(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method style(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method title(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method ul(string $text, array $attributes = [], bool $raw = false): string
+ * @method string a(string $href, string $text, array $attributes = [], bool $raw = false)
+ * @method string base(string $href, array $attributes = [])
+ * @method string body(array $attributes = [])
+ * @method string button(string $text, array $attributes = [], bool $raw = false)
+ * @method string close(string $tag, bool $raw = false)
+ * @method string doctype(int $flag, string $delimiter)
+ * @method string element(string $tag, string $text, array $attributes = [], bool $raw = false)
+ * @method string form(array $attributes = [])
+ * @method string img(string $src, array $attributes = [])
+ * @method string inputCheckbox(string $name, string $value = null, array $attributes = [])
+ * @method string inputColor(string $name, string $value = null, array $attributes = [])
+ * @method string inputDate(string $name, string $value = null, array $attributes = [])
+ * @method string inputDateTime(string $name, string $value = null, array $attributes = [])
+ * @method string inputDateTimeLocal(string $name, string $value = null, array $attributes = [])
+ * @method string inputEmail(string $name, string $value = null, array $attributes = [])
+ * @method string inputFile(string $name, string $value = null, array $attributes = [])
+ * @method string inputHidden(string $name, string $value = null, array $attributes = [])
+ * @method string inputImage(string $name, string $value = null, array $attributes = [])
+ * @method string inputInput(string $name, string $value = null, array $attributes = [])
+ * @method string inputMonth(string $name, string $value = null, array $attributes = [])
+ * @method string inputNumeric(string $name, string $value = null, array $attributes = [])
+ * @method string inputPassword(string $name, string $value = null, array $attributes = [])
+ * @method string inputRadio(string $name, string $value = null, array $attributes = [])
+ * @method string inputRange(string $name, string $value = null, array $attributes = [])
+ * @method string inputSearch(string $name, string $value = null, array $attributes = [])
+ * @method string inputSelect(string $name, string $value = null, array $attributes = [])
+ * @method string inputSubmit(string $name, string $value = null, array $attributes = [])
+ * @method string inputTel(string $name, string $value = null, array $attributes = [])
+ * @method string inputText(string $name, string $value = null, array $attributes = [])
+ * @method string inputTextarea(string $name, string $value = null, array $attributes = [])
+ * @method string inputTime(string $name, string $value = null, array $attributes = [])
+ * @method string inputUrl(string $name, string $value = null, array $attributes = [])
+ * @method string inputWeek(string $name, string $value = null, array $attributes = [])
+ * @method string label(string $label, array $attributes = [], bool $raw = false)
+ * @method string link(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string meta(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string ol(string $text, array $attributes = [], bool $raw = false)
+ * @method string script(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string style(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string title(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string ul(string $text, array $attributes = [], bool $raw = false)
  */
 class TagFactory extends AbstractFactory
 {

From 4fc9e9db2d6e39310cf3d5379f38c280d3aa9445 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 13:59:48 -0400
Subject: [PATCH 11/76] [#16064] - casting value to string to remove
 deprecation warning for php 8+

---
 phalcon/Filter/Validation/Validator/Digit.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Filter/Validation/Validator/Digit.zep b/phalcon/Filter/Validation/Validator/Digit.zep
index 87f92455e16..d758b2eccf5 100644
--- a/phalcon/Filter/Validation/Validator/Digit.zep
+++ b/phalcon/Filter/Validation/Validator/Digit.zep
@@ -76,7 +76,7 @@ class Digit extends AbstractValidator
             return true;
         }
 
-        if is_int(value) || ctype_digit(value) {
+        if is_int(value) || ctype_digit((string) value) {
             return true;
         }
 

From c632eff516d137f13ea7a399bf53dbc4ffaeaabb Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 14:01:47 -0400
Subject: [PATCH 12/76] [#16064] - updating changelog

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 48f4b1cd279..2e27e62d7b6 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -2,6 +2,7 @@
 
 ## Fixed
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
+- Fixed `Phalcon\Filter\Validation\Validator\Digit` to use only strings for `ctype_*` calls [#16064](https://github.com/phalcon/cphalcon/issues/16064)
 
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 

From 9df6187eb40fb50517a6a212e9adb4ce42927894 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 17:15:13 -0400
Subject: [PATCH 13/76] [#16063] - updating composer

---
 composer.lock | 317 ++++++++++++++++++++------------------------------
 1 file changed, 126 insertions(+), 191 deletions(-)

diff --git a/composer.lock b/composer.lock
index c9e6af77f8a..4861df13bef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -238,16 +238,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.2.1",
+            "version": "4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "77b3e2003fd4446b35826cb9dc397129c521c888"
+                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/77b3e2003fd4446b35826cb9dc397129c521c888",
-                "reference": "77b3e2003fd4446b35826cb9dc397129c521c888",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b88014f3348c93f3df99dc6d0967b0dbfa804474",
+                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474",
                 "shasum": ""
             },
             "require": {
@@ -324,7 +324,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/4.2.1"
+                "source": "https://github.com/Codeception/Codeception/tree/4.2.2"
             },
             "funding": [
                 {
@@ -332,7 +332,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-06-22T06:18:59+00:00"
+            "time": "2022-08-13T13:28:25+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -1665,16 +1665,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.9.1",
+            "version": "v3.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "94441633b80495464eb34eb3f7d63445221b2585"
+                "reference": "4465d70ba776806857a1ac2a6f877e582445ff36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/94441633b80495464eb34eb3f7d63445221b2585",
-                "reference": "94441633b80495464eb34eb3f7d63445221b2585",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4465d70ba776806857a1ac2a6f877e582445ff36",
+                "reference": "4465d70ba776806857a1ac2a6f877e582445ff36",
                 "shasum": ""
             },
             "require": {
@@ -1742,7 +1742,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.1"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.5"
             },
             "funding": [
                 {
@@ -1750,28 +1750,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-07-11T08:51:43+00:00"
+            "time": "2022-07-22T08:43:51+00:00"
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.0.4",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca"
+                "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
+                "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0",
-                "phpoption/phpoption": "^1.8"
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+                "phpunit/phpunit": "^8.5.28 || ^9.5.21"
             },
             "type": "library",
             "autoload": {
@@ -1800,7 +1800,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
             },
             "funding": [
                 {
@@ -1812,7 +1812,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-21T21:41:47+00:00"
+            "time": "2022-07-30T15:56:11+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -2139,16 +2139,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524"
+                "reference": "720488632c590286b88b80e62aa3d3d551ad4a50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524",
-                "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50",
+                "reference": "720488632c590286b88b80e62aa3d3d551ad4a50",
                 "shasum": ""
             },
             "require": {
@@ -2168,11 +2168,10 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "php-console/php-console": "^3.1.3",
                 "phpspec/prophecy": "^1.15",
                 "phpstan/phpstan": "^0.12.91",
                 "phpunit/phpunit": "^8.5.14",
-                "predis/predis": "^1.1",
+                "predis/predis": "^1.1 || ^2.0",
                 "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
                 "swiftmailer/swiftmailer": "^5.3|^6.0",
@@ -2192,7 +2191,6 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "php-console/php-console": "Allow sending log messages to Google Chrome",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
@@ -2227,7 +2225,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.7.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.8.0"
             },
             "funding": [
                 {
@@ -2239,20 +2237,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-09T08:59:12+00:00"
+            "time": "2022-07-24T11:55:47+00:00"
         },
         {
             "name": "mustache/mustache",
-            "version": "v2.14.1",
+            "version": "v2.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/mustache.php.git",
-                "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e"
+                "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/579ffa5c96e1d292c060b3dd62811ff01ad8c24e",
-                "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e62b7c3849d22ec55f3ec425507bf7968193a6cb",
+                "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb",
                 "shasum": ""
             },
             "require": {
@@ -2287,9 +2285,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/mustache.php/issues",
-                "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.1"
+                "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.2"
             },
-            "time": "2022-01-21T06:08:36+00:00"
+            "time": "2022-08-23T13:07:01+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -2579,16 +2577,16 @@
         },
         {
             "name": "phalcon/zephir",
-            "version": "0.16.0",
+            "version": "0.16.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zephir-lang/zephir.git",
-                "reference": "4fac47bacac2fac3c23548b409ea952c556c1c2d"
+                "reference": "3e961ab90912b4887ebee219243126763850088f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/4fac47bacac2fac3c23548b409ea952c556c1c2d",
-                "reference": "4fac47bacac2fac3c23548b409ea952c556c1c2d",
+                "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/3e961ab90912b4887ebee219243126763850088f",
+                "reference": "3e961ab90912b4887ebee219243126763850088f",
                 "shasum": ""
             },
             "require": {
@@ -2663,7 +2661,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-21T09:31:27+00:00"
+            "time": "2022-08-22T17:26:36+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -2826,6 +2824,7 @@
                 "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
                 "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
             },
+            "abandoned": true,
             "time": "2020-10-14T08:32:19+00:00"
         },
         {
@@ -2990,29 +2989,33 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.8.1",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"
+                "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
+                "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+                "bamarni/composer-bin-plugin": "^1.8",
+                "phpunit/phpunit": "^8.5.28 || ^9.5.21"
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                },
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -3045,7 +3048,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.8.1"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.0"
             },
             "funding": [
                 {
@@ -3057,74 +3060,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-04T23:24:31+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2022-07-30T15:51:26+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -3425,16 +3361,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.27",
+            "version": "8.5.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "df70070f2711b8fe8dcca0797c1239ede8c94be6"
+                "reference": "e8c563c47a9a303662955518ca532b022b337f4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/df70070f2711b8fe8dcca0797c1239ede8c94be6",
-                "reference": "df70070f2711b8fe8dcca0797c1239ede8c94be6",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e8c563c47a9a303662955518ca532b022b337f4d",
+                "reference": "e8c563c47a9a303662955518ca532b022b337f4d",
                 "shasum": ""
             },
             "require": {
@@ -3449,7 +3385,6 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.2",
-                "phpspec/prophecy": "^1.10.3",
                 "phpunit/php-code-coverage": "^7.0.12",
                 "phpunit/php-file-iterator": "^2.0.4",
                 "phpunit/php-text-template": "^1.2.1",
@@ -3503,7 +3438,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.27"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.29"
             },
             "funding": [
                 {
@@ -3515,7 +3450,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-19T12:11:16+00:00"
+            "time": "2022-08-22T13:59:39+00:00"
         },
         {
             "name": "predis/predis",
@@ -4771,16 +4706,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v5.4.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "18e73179c6a33d520de1b644941eba108dd811ad"
+                "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/18e73179c6a33d520de1b644941eba108dd811ad",
-                "reference": "18e73179c6a33d520de1b644941eba108dd811ad",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/081fe28a26b6bd671dea85ef3a4b5003f3c88027",
+                "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027",
                 "shasum": ""
             },
             "require": {
@@ -4823,7 +4758,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v5.4.3"
+                "source": "https://github.com/symfony/browser-kit/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -4839,20 +4774,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-07-27T15:50:05+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.10",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000"
+                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000",
-                "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000",
+                "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
+                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
                 "shasum": ""
             },
             "require": {
@@ -4922,7 +4857,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.10"
+                "source": "https://github.com/symfony/console/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -4938,20 +4873,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-26T13:00:04+00:00"
+            "time": "2022-07-22T10:42:43+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.4.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e"
+                "reference": "c1681789f059ab756001052164726ae88512ae3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d",
+                "reference": "c1681789f059ab756001052164726ae88512ae3d",
                 "shasum": ""
             },
             "require": {
@@ -4988,7 +4923,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -5004,7 +4939,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -5075,16 +5010,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v5.4.9",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "a213cbc80382320b0efdccdcdce232f191fafe3a"
+                "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a213cbc80382320b0efdccdcdce232f191fafe3a",
-                "reference": "a213cbc80382320b0efdccdcdce232f191fafe3a",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0b900ca5576ecd59e08c76127e616667cfe427a7",
+                "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7",
                 "shasum": ""
             },
             "require": {
@@ -5130,7 +5065,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.9"
+                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -5146,7 +5081,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-04T14:46:32+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5314,16 +5249,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.9",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba"
+                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba",
-                "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd",
+                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd",
                 "shasum": ""
             },
             "require": {
@@ -5358,7 +5293,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.9"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -5374,20 +5309,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-20T13:55:35+00:00"
+            "time": "2022-07-20T13:00:38+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.8",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9"
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9",
-                "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
                 "shasum": ""
             },
             "require": {
@@ -5421,7 +5356,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.8"
+                "source": "https://github.com/symfony/finder/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -5437,20 +5372,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-15T08:07:45+00:00"
+            "time": "2022-07-29T07:37:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.4.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8"
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8",
-                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690",
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690",
                 "shasum": ""
             },
             "require": {
@@ -5490,7 +5425,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v5.4.3"
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -5506,7 +5441,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-07-20T13:00:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6081,16 +6016,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.8",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
-                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1",
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1",
                 "shasum": ""
             },
             "require": {
@@ -6123,7 +6058,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.8"
+                "source": "https://github.com/symfony/process/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -6139,7 +6074,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-08T05:07:18+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6288,16 +6223,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.10",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097"
+                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097",
-                "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097",
+                "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
+                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
                 "shasum": ""
             },
             "require": {
@@ -6354,7 +6289,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.10"
+                "source": "https://github.com/symfony/string/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -6370,20 +6305,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-26T15:57:47+00:00"
+            "time": "2022-07-24T16:15:25+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.10",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "04e42926429d9e8b39c174387ab990bf7817f7a2"
+                "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/04e42926429d9e8b39c174387ab990bf7817f7a2",
-                "reference": "04e42926429d9e8b39c174387ab990bf7817f7a2",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/05d4ea560f3402c6c116afd99fdc66e60eda227e",
+                "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e",
                 "shasum": ""
             },
             "require": {
@@ -6429,7 +6364,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.10"
+                "source": "https://github.com/symfony/yaml/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -6445,7 +6380,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T11:50:59+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -6577,16 +6512,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "4.24.0",
+            "version": "4.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "06dd975cb55d36af80f242561738f16c5f58264f"
+                "reference": "6998fabb2bf528b65777bf9941920888d23c03ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/06dd975cb55d36af80f242561738f16c5f58264f",
-                "reference": "06dd975cb55d36af80f242561738f16c5f58264f",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac",
+                "reference": "6998fabb2bf528b65777bf9941920888d23c03ac",
                 "shasum": ""
             },
             "require": {
@@ -6678,9 +6613,9 @@
             ],
             "support": {
                 "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.24.0"
+                "source": "https://github.com/vimeo/psalm/tree/4.26.0"
             },
-            "time": "2022-06-26T11:47:54+00:00"
+            "time": "2022-07-31T13:10:26+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

From 347c91209a49a6e6a9a9d4253c1397a0d09014a2 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 17:15:41 -0400
Subject: [PATCH 14/76] [#16063] - corrected flash implicit flush to return the
 message back

---
 phalcon/Flash/AbstractFlash.zep        |  10 +-
 tests/unit/Flash/Direct/OutputCest.php | 852 +++++++++----------------
 2 files changed, 315 insertions(+), 547 deletions(-)

diff --git a/phalcon/Flash/AbstractFlash.zep b/phalcon/Flash/AbstractFlash.zep
index d5904e0fba4..eef4e6d72b1 100644
--- a/phalcon/Flash/AbstractFlash.zep
+++ b/phalcon/Flash/AbstractFlash.zep
@@ -314,14 +314,10 @@ abstract class AbstractFlash extends AbstractInjectionAware implements FlashInte
         }
 
         /**
-         * We return the message as a string if the implicitFlush is turned
-         * off
+         * If we are here then implicitFlush is off - otherwise it has been
+         * echoed back during the loop. Return the string back.
          */
-        if (true !== this->implicitFlush) {
-            return content;
-        }
-
-        return null;
+        return content;
     }
 
     /**
diff --git a/tests/unit/Flash/Direct/OutputCest.php b/tests/unit/Flash/Direct/OutputCest.php
index a8ec913d3bd..083353d8ae8 100644
--- a/tests/unit/Flash/Direct/OutputCest.php
+++ b/tests/unit/Flash/Direct/OutputCest.php
@@ -18,6 +18,7 @@
 use Phalcon\Html\Escaper;
 use UnitTester;
 
+use function MongoDB\BSON\toRelaxedExtendedJSON;
 use function ob_end_clean;
 use function ob_get_contents;
 use function ob_start;
@@ -59,11 +60,11 @@ public function flashDirectOutputCombinations(UnitTester $I, Example $example)
 
         if (true === $example['implicit']) {
             ob_start();
-            $flash->success($message);
+            $flash->outputMessage('success', $message);
             $actual = ob_get_contents();
             ob_end_clean();
         } else {
-            $actual = $flash->success($message);
+            $actual = $flash->outputMessage('success', $message);
         }
 
         $expected = $example['expected'];
@@ -134,449 +135,436 @@ private function getExamples(): array
             'warning' => 'warningIconPhalcon',
         ];
 
-        // 'classes,icon classes,html,escape,implicit,template',
+        // 'string/array message, classes,icon classes,html,escape,implicit,template',
         return [
             [
-                'label'       => 'CLS-ICO-HTML-ESC-IMP-TPL',
+                'label'       => 'S:X:X:X:X:X:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon"><i class="successIconPhalcon">'
-                    . '</i> sample &lt;phalcon&gt; message</div>',
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => $template,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-HTML-ESC-IMP-XXX',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample &lt;phalcon&gt; message</div>' . PHP_EOL,
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => true,
+                'label'       => 'A:X:X:X:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-HTML-ESC-XXX-TPL',
+                'label'       => 'S:X:X:X:X:X:T',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample &lt;phalcon&gt; message</div>',
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'CLS-ICO-HTML-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample &lt;phalcon&gt; message</div>' . PHP_EOL,
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
+                'label'       => 'A:X:X:X:X:X:T',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => false,
                 'implicit'    => false,
-                'template'    => '',
+                'template'    => $template,
             ],
             [
-                'label'       => 'CLS-ICO-HTML-XXX-IMP-TPL',
+                'label'       => 'S:X:X:X:X:I:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample <phalcon> message</div>',
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
                 'autoescape'  => false,
                 'implicit'    => true,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-HTML-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample <phalcon> message</div>' . PHP_EOL,
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
+                'label'       => 'A:X:X:X:X:I:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
                 'autoescape'  => false,
                 'implicit'    => true,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-HTML-XXX-XXX-TPL',
+                'label'       => 'S:X:X:X:E:X:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample <phalcon> message</div>',
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => false,
+                'expected'    => 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
                 'implicit'    => false,
-                'template'    => $template,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'A:X:X:X:E:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample &lt;phalcon&gt; message'
+                    . 'sample &lt;phalcon&gt; message',
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => false,
+                'autoescape'  => true,
+                'implicit'    => false,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-HTML-XXX-XXX-XXX',
+                'label'       => 'S:X:X:H:X:X:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample <phalcon> message</div>' . PHP_EOL,
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
+                'expected'    => '<div>sample <phalcon> message</div>'
+                    . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => [],
                 'autoHtml'    => true,
                 'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-ESC-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => $classes,
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => $template,
+                'label'       => 'A:X:X:H:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => '<div>sample <phalcon> message</div>'
+                    . PHP_EOL
+                    . '<div>sample <phalcon> message</div>'
+                    . PHP_EOL,
+                'classes'     => [],
+                'iconClasses' => [],
+                'autoHtml'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-ESC-IMP-XXX',
+                'label'       => 'S:X:I:X:X:X:X',
                 'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => $classes,
+                'expected'    => 'sample <phalcon> message',
+                'classes'     => [],
                 'iconClasses' => $iconClasses,
                 'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => true,
+                'autoescape'  => false,
+                'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-ESC-XXX-TPL',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => $classes,
+                'label'       => 'A:X:I:X:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
+                'classes'     => [],
                 'iconClasses' => $iconClasses,
                 'autoHtml'    => false,
-                'autoescape'  => true,
+                'autoescape'  => false,
                 'implicit'    => false,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-ESC-XXX-XXX',
+                'label'       => 'S:C:X:X:X:X:X',
                 'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
+                'expected'    => 'sample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => $iconClasses,
+                'iconClasses' => [],
                 'autoHtml'    => false,
-                'autoescape'  => true,
+                'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-XXX-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
+                'label'       => 'A:C:X:X:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => $iconClasses,
+                'iconClasses' => [],
                 'autoHtml'    => false,
                 'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => $template,
+                'implicit'    => false,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-XXX-IMP-XXX',
+                'label'       => 'S:C:X:X:X:X:T',
                 'message'     => $message,
                 'expected'    => 'sample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => $iconClasses,
+                'iconClasses' => [],
                 'autoHtml'    => false,
                 'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => '',
+                'implicit'    => false,
+                'template'    => $template,
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-XXX-XXX-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
+                'label'       => 'A:C:X:X:X:X:T',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => $iconClasses,
+                'iconClasses' => [],
                 'autoHtml'    => false,
                 'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'CLS-ICO-XXXX-XXX-XXX-XXX',
+                'label'       => 'S:C:X:X:X:I:X',
                 'message'     => $message,
                 'expected'    => 'sample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => $iconClasses,
+                'iconClasses' => [],
                 'autoHtml'    => false,
                 'autoescape'  => false,
-                'implicit'    => false,
+                'implicit'    => true,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-ESC-IMP-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class=""></i> sample &lt;phalcon&gt; message</div>',
+                'label'       => 'A:C:X:X:X:I:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
                 'classes'     => $classes,
                 'iconClasses' => [],
-                'autoHtml'    => true,
-                'autoescape'  => true,
+                'autoHtml'    => false,
+                'autoescape'  => false,
                 'implicit'    => true,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-ESC-IMP-XXX',
+                'label'       => 'S:C:X:X:E:X:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . 'sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'expected'    => 'sample &lt;phalcon&gt; message',
                 'classes'     => $classes,
                 'iconClasses' => [],
-                'autoHtml'    => true,
+                'autoHtml'    => false,
                 'autoescape'  => true,
-                'implicit'    => true,
+                'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-ESC-XXX-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class=""></i> sample &lt;phalcon&gt; message</div>',
+                'label'       => 'A:C:X:X:E:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample &lt;phalcon&gt; message'
+                    . 'sample &lt;phalcon&gt; message',
                 'classes'     => $classes,
                 'iconClasses' => [],
-                'autoHtml'    => true,
+                'autoHtml'    => false,
                 'autoescape'  => true,
                 'implicit'    => false,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-ESC-XXX-XXX',
+                'label'       => 'S:C:X:H:X:X:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . 'sample &lt;phalcon&gt; message</div>' . PHP_EOL,
+                'expected'    => '<div class="successPhalcon">sample <phalcon> message</div>'
+                    . PHP_EOL,
                 'classes'     => $classes,
                 'iconClasses' => [],
                 'autoHtml'    => true,
-                'autoescape'  => true,
+                'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-XXX-IMP-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class=""></i> sample <phalcon> message</div>',
+                'label'       => 'A:C:X:H:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">sample <phalcon> message</div>'
+                    . PHP_EOL
+                    . '<div class="successPhalcon">sample <phalcon> message</div>'
+                    . PHP_EOL,
                 'classes'     => $classes,
                 'iconClasses' => [],
                 'autoHtml'    => true,
                 'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => $template,
+                'implicit'    => false,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-XXX-IMP-XXX',
+                'label'       => 'S:C:I:X:X:X:X',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . 'sample <phalcon> message</div>' . PHP_EOL,
+                'expected'    => 'sample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => true,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
                 'autoescape'  => false,
-                'implicit'    => true,
+                'implicit'    => false,
+                'template'    => '',
+            ],
+            [
+                'label'       => 'A:C:I:X:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
+                'autoescape'  => false,
+                'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-HTML-XXX-XXX-TPL',
+                'label'       => 'S:C:I:X:X:X:T',
                 'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . '<i class=""></i> sample <phalcon> message</div>',
+                'expected'    => 'sample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => true,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
                 'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'CLS-XXX-HTML-XXX-XXX-XXX',
-                'message'     => $message,
-                'expected'    => '<div class="successPhalcon">'
-                    . 'sample <phalcon> message</div>' . PHP_EOL,
+                'label'       => 'A:C:I:X:X:X:T',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => true,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => false,
                 'autoescape'  => false,
                 'implicit'    => false,
-                'template'    => '',
+                'template'    => $template,
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-ESC-IMP-TPL',
+                'label'       => 'S:C:I:X:X:I:X',
                 'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
+                'expected'    => 'sample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => [],
+                'iconClasses' => $iconClasses,
                 'autoHtml'    => false,
-                'autoescape'  => true,
+                'autoescape'  => false,
                 'implicit'    => true,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-ESC-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
+                'label'       => 'A:C:I:X:X:I:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample <phalcon> messagesample <phalcon> message',
                 'classes'     => $classes,
-                'iconClasses' => [],
+                'iconClasses' => $iconClasses,
                 'autoHtml'    => false,
-                'autoescape'  => true,
+                'autoescape'  => false,
                 'implicit'    => true,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-ESC-XXX-TPL',
+                'label'       => 'S:C:I:X:E:X:X',
                 'message'     => $message,
                 'expected'    => 'sample &lt;phalcon&gt; message',
                 'classes'     => $classes,
-                'iconClasses' => [],
+                'iconClasses' => $iconClasses,
                 'autoHtml'    => false,
                 'autoescape'  => true,
                 'implicit'    => false,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
+                'label'       => 'A:C:I:X:E:X:X',
+                'message'     => [$message, $message],
+                'expected'    => 'sample &lt;phalcon&gt; message'
+                    . 'sample &lt;phalcon&gt; message',
                 'classes'     => $classes,
-                'iconClasses' => [],
+                'iconClasses' => $iconClasses,
                 'autoHtml'    => false,
                 'autoescape'  => true,
                 'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-XXX-IMP-TPL',
+                'label'       => 'S:C:I:H:X:X:X',
                 'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . PHP_EOL,
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => false,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
                 'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => $template,
+                'implicit'    => false,
+                'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
+                'label'       => 'A:C:I:H:X:X:X',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . PHP_EOL
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . PHP_EOL,
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => false,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
                 'autoescape'  => false,
-                'implicit'    => true,
+                'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-XXX-XXX-TPL',
+                'label'       => 'S:C:I:H:X:X:T',
                 'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>',
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => false,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
                 'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'CLS-XXX-XXXX-XXX-XXX-XXX',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
+                'label'       => 'A:C:I:H:X:X:T',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>',
                 'classes'     => $classes,
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-ICO-HTML-ESC-IMP-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample &lt;phalcon&gt; message</div>',
-                'classes'     => [],
                 'iconClasses' => $iconClasses,
                 'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-ICO-HTML-ESC-IMP-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-ICO-HTML-ESC-XXX-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample &lt;phalcon&gt; message</div>',
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
+                'autoescape'  => false,
                 'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'XXX-ICO-HTML-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-ICO-HTML-XXX-IMP-TPL',
+                'label'       => 'S:C:I:H:X:I:X',
                 'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample <phalcon> message</div>',
-                'classes'     => [],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . PHP_EOL,
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
                 'autoHtml'    => true,
                 'autoescape'  => false,
                 'implicit'    => true,
-                'template'    => $template,
+                'template'    => '',
             ],
             [
-                'label'       => 'XXX-ICO-HTML-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
-                'classes'     => [],
+                'label'       => 'A:C:I:H:X:I:X',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . PHP_EOL
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample <phalcon> message</div>'
+                    . PHP_EOL,
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
                 'autoHtml'    => true,
                 'autoescape'  => false,
@@ -584,343 +572,127 @@ private function getExamples(): array
                 'template'    => '',
             ],
             [
-                'label'       => 'XXX-ICO-HTML-XXX-XXX-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class="successIconPhalcon"></i>'
-                    . ' sample <phalcon> message</div>',
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => true,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-ICO-HTML-XXX-XXX-XXX',
+                'label'       => 'S:C:I:H:E:X:X',
                 'message'     => $message,
-                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
-                'classes'     => [],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . PHP_EOL,
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
                 'autoHtml'    => true,
-                'autoescape'  => false,
+                'autoescape'  => true,
                 'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'XXX-ICO-XXXX-ESC-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-ICO-XXXX-ESC-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
+                'label'       => 'A:C:I:H:H:X:X',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . PHP_EOL
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . PHP_EOL,
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
+                'autoHtml'    => true,
                 'autoescape'  => true,
-                'implicit'    => true,
+                'implicit'    => false,
                 'template'    => '',
             ],
             [
-                'label'       => 'XXX-ICO-XXXX-ESC-XXX-TPL',
+                'label'       => 'S:C:I:H:E:X:T',
                 'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
+                'autoHtml'    => true,
                 'autoescape'  => true,
                 'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'XXX-ICO-XXXX-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
+                'label'       => 'A:C:I:H:E:X:T',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
+                'autoHtml'    => true,
                 'autoescape'  => true,
                 'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-ICO-XXXX-XXX-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-ICO-XXXX-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-ICO-XXXX-XXX-XXX-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => false,
                 'template'    => $template,
             ],
             [
-                'label'       => 'XXX-ICO-XXXX-XXX-XXX-XXX',
+                'label'       => 'S:C:I:H:E:I:X',
                 'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . PHP_EOL,
+                'classes'     => $classes,
                 'iconClasses' => $iconClasses,
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-HTML-ESC-IMP-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class=""></i>'
-                    . ' sample &lt;phalcon&gt; message</div>',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-HTML-ESC-IMP-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
-                'classes'     => [],
-                'iconClasses' => [],
                 'autoHtml'    => true,
                 'autoescape'  => true,
                 'implicit'    => true,
                 'template'    => '',
             ],
             [
-                'label'       => 'XXX-XXX-HTML-ESC-XXX-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class=""></i>'
-                    . ' sample &lt;phalcon&gt; message</div>',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => true,
-                'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-HTML-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample &lt;phalcon&gt; message</div>' . PHP_EOL,
-                'classes'     => [],
-                'iconClasses' => [],
+                'label'       => 'A:C:I:H:E:I:X',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . PHP_EOL
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . PHP_EOL,
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
                 'autoHtml'    => true,
                 'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-HTML-XXX-IMP-TPL',
-                'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class=""></i> sample <phalcon> message</div>',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => true,
-                'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-HTML-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => true,
-                'autoescape'  => false,
                 'implicit'    => true,
                 'template'    => '',
             ],
             [
-                'label'       => 'XXX-XXX-HTML-XXX-XXX-TPL',
+                'label'       => 'S:C:I:H:E:I:T',
                 'message'     => $message,
-                'expected'    => '<div class="">'
-                    . '<i class=""></i> sample <phalcon> message</div>',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => true,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-HTML-XXX-XXX-XXX',
-                'message'     => $message,
-                'expected'    => '<div>sample <phalcon> message</div>' . PHP_EOL,
-                'classes'     => [],
-                'iconClasses' => [],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
                 'autoHtml'    => true,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-ESC-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => true,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-ESC-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
                 'autoescape'  => true,
                 'implicit'    => true,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-ESC-XXX-TPL',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-XXX-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => true,
                 'template'    => $template,
             ],
             [
-                'label'       => 'XXX-XXX-XXXX-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-ESC-XXX-TPL',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-ESC-XXX-XXX',
-                'message'     => $message,
-                'expected'    => 'sample &lt;phalcon&gt; message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
+                'label'       => 'A:C:I:H:E:I:T',
+                'message'     => [$message, $message],
+                'expected'    => '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>'
+                    . '<div class="successPhalcon">'
+                    . '<i class="successIconPhalcon"></i> '
+                    . 'sample &lt;phalcon&gt; message</div>',
+                'classes'     => $classes,
+                'iconClasses' => $iconClasses,
+                'autoHtml'    => true,
                 'autoescape'  => true,
-                'implicit'    => false,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-XXX-IMP-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
                 'implicit'    => true,
                 'template'    => $template,
             ],
-            [
-                'label'       => 'XXX-XXX-XXXX-XXX-IMP-XXX',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => true,
-                'template'    => '',
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-XXX-XXX-TPL',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => $template,
-            ],
-            [
-                'label'       => 'XXX-XXX-XXXX-XXX-XXX-XXX',
-                'message'     => $message,
-                'expected'    => 'sample <phalcon> message',
-                'classes'     => [],
-                'iconClasses' => [],
-                'autoHtml'    => false,
-                'autoescape'  => false,
-                'implicit'    => false,
-                'template'    => '',
-            ],
         ];
     }
 }

From 62039c2795bcb6c017b633ee1a6f610a0c6b359b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 23 Aug 2022 17:17:34 -0400
Subject: [PATCH 15/76] [#16063] - updating changelog

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 2e27e62d7b6..05dac5cf5f9 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -3,6 +3,7 @@
 ## Fixed
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
 - Fixed `Phalcon\Filter\Validation\Validator\Digit` to use only strings for `ctype_*` calls [#16064](https://github.com/phalcon/cphalcon/issues/16064)
+- Fixed `Phalcon\Flash\AbstractFlash::outputMessage` to return the message (implicitFlush) [#16063](https://github.com/phalcon/cphalcon/issues/16063)
 
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 

From 59c6f642eeb458b9447b071636ad270c62a91c1e Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 24 Aug 2022 10:02:56 -0400
Subject: [PATCH 16/76] [#16070] - moved tests in their correct folder

---
 .../{ => Filter}/Validation/AddCest.php       |  2 +-
 .../Validation/AllowEmptyCest.php             |  3 +-
 .../Validation/AppendMessageCest.php          |  2 +-
 .../{ => Filter}/Validation/BindCest.php      |  2 +-
 .../{ => Filter}/Validation/ConstructCest.php |  2 +-
 .../{ => Filter}/Validation/GetDataCest.php   |  2 +-
 .../{ => Filter}/Validation/GetEntityCest.php |  2 +-
 .../{ => Filter}/Validation/GetLabelCest.php  |  2 +-
 .../Validation/GetMessagesCest.php            |  2 +-
 .../Validation/GetSetFiltersCest.php          |  2 +-
 .../Validation/GetSetValidatorsCest.php       |  2 +-
 .../Validation/GetValueByDataCest.php         |  4 +-
 .../Validation/GetValueByEntityCest.php       |  4 +-
 .../{ => Filter}/Validation/GetValueCest.php  |  2 +-
 .../{ => Filter}/Validation/RuleCest.php      |  2 +-
 .../{ => Filter}/Validation/RulesCest.php     |  2 +-
 .../Validation/SetDefaultMessagesCest.php     |  2 +-
 .../{ => Filter}/Validation/SetEntityCest.php |  2 +-
 .../{ => Filter}/Validation/SetLabelsCest.php |  2 +-
 .../Validation/UnderscoreGetCest.php          |  2 +-
 .../{ => Filter}/Validation/ValidateCest.php  |  6 +-
 .../Validator/Alnum/ConstructCest.php         |  4 +-
 .../Validator/Alnum/GetOptionCest.php         |  4 +-
 .../Validator/Alnum/HasOptionCest.php         |  4 +-
 .../Validator/Alnum/SetOptionCest.php         |  4 +-
 .../Validator/Alnum/ValidateCest.php          |  2 +-
 .../Validator/Alpha/ConstructCest.php         |  4 +-
 .../Validator/Alpha/GetOptionCest.php         |  4 +-
 .../Validator/Alpha/HasOptionCest.php         |  4 +-
 .../Validator/Alpha/SetOptionCest.php         |  4 +-
 .../Validator/Alpha/ValidateCest.php          |  6 +-
 .../Validator/Between/ConstructCest.php       |  4 +-
 .../Validator/Between/GetOptionCest.php       |  4 +-
 .../Validator/Between/HasOptionCest.php       |  4 +-
 .../Validator/Between/SetOptionCest.php       |  4 +-
 .../Validator/Between/ValidateCest.php        |  6 +-
 .../Validator/Callback/ConstructCest.php      |  4 +-
 .../Validator/Callback/GetOptionCest.php      |  4 +-
 .../Validator/Callback/HasOptionCest.php      |  4 +-
 .../Validator/Callback/SetOptionCest.php      |  4 +-
 .../Validator/Callback/ValidateCest.php       |  6 +-
 .../Validator/Confirmation/ConstructCest.php  |  4 +-
 .../Validator/Confirmation/GetOptionCest.php  |  4 +-
 .../Validator/Confirmation/HasOptionCest.php  |  4 +-
 .../Validator/Confirmation/SetOptionCest.php  |  4 +-
 .../Validator/Confirmation/ValidateCest.php   |  6 +-
 .../Validation/Validator/ConstructCest.php    |  2 +-
 .../Validator/CreditCard/ConstructCest.php    |  4 +-
 .../Validator/CreditCard/GetOptionCest.php    |  4 +-
 .../Validator/CreditCard/HasOptionCest.php    |  4 +-
 .../Validator/CreditCard/SetOptionCest.php    |  4 +-
 .../Validator/CreditCard/ValidateCest.php     |  6 +-
 .../Validator/Date/ConstructCest.php          |  4 +-
 .../Validator/Date/GetOptionCest.php          |  4 +-
 .../Validator/Date/HasOptionCest.php          |  4 +-
 .../Validator/Date/SetOptionCest.php          |  4 +-
 .../Validator/Date/ValidateCest.php           |  2 +-
 .../Validation/Validator/DateCest.php         |  6 +-
 .../Validator/Digit/ConstructCest.php         |  4 +-
 .../Validator/Digit/GetOptionCest.php         |  4 +-
 .../Validator/Digit/HasOptionCest.php         |  4 +-
 .../Validator/Digit/SetOptionCest.php         |  4 +-
 .../Validator/Digit/ValidateCest.php          |  2 +-
 .../Validation/Validator/DigitCest.php        |  2 +-
 .../Validator/Email/ConstructCest.php         |  4 +-
 .../Validator/Email/GetOptionCest.php         |  4 +-
 .../Validator/Email/HasOptionCest.php         |  4 +-
 .../Validator/Email/SetOptionCest.php         |  4 +-
 .../Validator/Email/ValidateCest.php          |  2 +-
 .../Validation/Validator/EmailCest.php        |  6 +-
 .../Validator/ExclusionIn/ConstructCest.php   |  4 +-
 .../Validator/ExclusionIn/GetOptionCest.php   |  4 +-
 .../Validator/ExclusionIn/HasOptionCest.php   |  4 +-
 .../Validator/ExclusionIn/SetOptionCest.php   |  4 +-
 .../Validator/ExclusionIn/ValidateCest.php    |  2 +-
 .../Validation/Validator/ExclusionInCest.php  |  6 +-
 .../Validator/File/ConstructCest.php          |  4 +-
 .../Validator/File/CustomMessagesCest.php     |  4 +-
 .../Validator/File/GetOptionCest.php          |  4 +-
 .../Validator/File/HasOptionCest.php          |  4 +-
 .../Validator/File/IsAllowEmptyCest.php       |  2 +-
 .../Validator/File/SetOptionCest.php          |  4 +-
 .../Validator/File/ValidateCest.php           |  2 +-
 .../Validation/Validator/GetOptionCest.php    |  2 +-
 .../Validation/Validator/HasOptionCest.php    |  2 +-
 .../Validator/Identical/ConstructCest.php     |  4 +-
 .../Validator/Identical/GetOptionCest.php     |  4 +-
 .../Validator/Identical/HasOptionCest.php     |  4 +-
 .../Validator/Identical/SetOptionCest.php     |  4 +-
 .../Validator/Identical/ValidateCest.php      |  2 +-
 .../Validation/Validator/IdenticalCest.php    |  6 +-
 .../Validator/InclusionIn/ConstructCest.php   |  4 +-
 .../Validator/InclusionIn/GetOptionCest.php   |  4 +-
 .../Validator/InclusionIn/HasOptionCest.php   |  4 +-
 .../Validator/InclusionIn/SetOptionCest.php   |  4 +-
 .../Validator/InclusionIn/ValidateCest.php    |  2 +-
 .../Validation/Validator/InclusionInCest.php  |  6 +-
 .../Validation/Validator/Ip/ConstructCest.php |  4 +-
 .../Validation/Validator/Ip/GetOptionCest.php |  4 +-
 .../Validation/Validator/Ip/HasOptionCest.php |  4 +-
 .../Validation/Validator/Ip/SetOptionCest.php |  4 +-
 .../Validation/Validator/Ip/ValidateCest.php  |  2 +-
 .../Validator/Numericality/ConstructCest.php  |  4 +-
 .../Validator/Numericality/GetOptionCest.php  |  4 +-
 .../Validator/Numericality/HasOptionCest.php  |  4 +-
 .../Validator/Numericality/SetOptionCest.php  |  4 +-
 .../Validator/Numericality/ValidateCest.php   |  5 +-
 .../Validation/Validator/NumericalityCest.php | 61 ++++++++++---------
 .../Validator/PresenceOf/ConstructCest.php    |  4 +-
 .../Validator/PresenceOf/GetOptionCest.php    |  4 +-
 .../Validator/PresenceOf/HasOptionCest.php    |  4 +-
 .../Validator/PresenceOf/SetOptionCest.php    |  4 +-
 .../Validator/PresenceOf/ValidateCest.php     |  2 +-
 .../Validation/Validator/PresenceOfCest.php   |  6 +-
 .../Validator/Regex/ConstructCest.php         |  4 +-
 .../Validator/Regex/GetOptionCest.php         |  4 +-
 .../Validator/Regex/HasOptionCest.php         |  4 +-
 .../Validator/Regex/SetOptionCest.php         |  4 +-
 .../Validator/Regex/ValidateCest.php          |  2 +-
 .../Validation/Validator/RegexCest.php        |  6 +-
 .../Validation/Validator/SetOptionCest.php    |  2 +-
 .../Validator/StringLength/ConstructCest.php  |  4 +-
 .../Validator/StringLength/GetOptionCest.php  |  4 +-
 .../StringLength/GetTemplateCest.php          |  4 +-
 .../StringLength/GetTemplatesCest.php         |  2 +-
 .../StringLength/GetValidatorsCest.php        |  4 +-
 .../Validator/StringLength/HasOptionCest.php  |  4 +-
 .../StringLength/Max/ConstructCest.php        |  4 +-
 .../StringLength/Max/GetOptionCest.php        |  2 +-
 .../StringLength/Max/GetTemplateCest.php      |  2 +-
 .../StringLength/Max/GetTemplatesCest.php     |  2 +-
 .../StringLength/Max/HasOptionCest.php        |  2 +-
 .../StringLength/Max/MessageFactoryCest.php   |  6 +-
 .../StringLength/Max/SetOptionCest.php        |  4 +-
 .../StringLength/Max/SetTemplateCest.php      |  2 +-
 .../StringLength/Max/SetTemplatesCest.php     |  2 +-
 .../StringLength/Max/ValidateCest.php         |  2 +-
 .../StringLength/MessageFactoryCest.php       |  2 +-
 .../StringLength/Min/ConstructCest.php        |  4 +-
 .../StringLength/Min/GetOptionCest.php        |  2 +-
 .../StringLength/Min/GetTemplateCest.php      |  2 +-
 .../StringLength/Min/GetTemplatesCest.php     |  2 +-
 .../StringLength/Min/HasOptionCest.php        |  2 +-
 .../StringLength/Min/MessageFactoryCest.php   |  6 +-
 .../StringLength/Min/SetOptionCest.php        |  4 +-
 .../StringLength/Min/SetTemplateCest.php      |  2 +-
 .../StringLength/Min/SetTemplatesCest.php     |  2 +-
 .../StringLength/Min/ValidateCest.php         |  2 +-
 .../Validator/StringLength/SetOptionCest.php  |  4 +-
 .../StringLength/SetTemplateCest.php          |  4 +-
 .../StringLength/SetTemplatesCest.php         |  4 +-
 .../Validator/StringLength/ValidateCest.php   |  6 +-
 .../Validator/Uniqueness/ConstructCest.php    |  4 +-
 .../Validator/Uniqueness/GetOptionCest.php    |  4 +-
 .../Validator/Uniqueness/HasOptionCest.php    |  4 +-
 .../Validator/Uniqueness/SetOptionCest.php    |  4 +-
 .../Validator/Url/ConstructCest.php           |  4 +-
 .../Validator/Url/GetOptionCest.php           |  4 +-
 .../Validator/Url/HasOptionCest.php           |  4 +-
 .../Validator/Url/SetOptionCest.php           |  4 +-
 .../Validation/Validator/Url/ValidateCest.php |  6 +-
 .../Validation/Validator/ValidateCest.php     |  2 +-
 .../ValidatorFactory/NewInstanceCest.php      |  2 +-
 .../Validation/GetEventsManagerCest.php       | 35 -----------
 tests/integration/Validation/GetSetDICest.php | 32 ----------
 .../Validation/SetEventsManagerCest.php       | 35 -----------
 166 files changed, 323 insertions(+), 418 deletions(-)
 rename tests/integration/{ => Filter}/Validation/AddCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/AllowEmptyCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/AppendMessageCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/BindCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/ConstructCest.php (95%)
 rename tests/integration/{ => Filter}/Validation/GetDataCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/GetEntityCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/GetLabelCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/GetMessagesCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/GetSetFiltersCest.php (95%)
 rename tests/integration/{ => Filter}/Validation/GetSetValidatorsCest.php (95%)
 rename tests/integration/{ => Filter}/Validation/GetValueByDataCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/GetValueByEntityCest.php (97%)
 rename tests/integration/{ => Filter}/Validation/GetValueCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/RuleCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/RulesCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/SetDefaultMessagesCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/SetEntityCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/SetLabelsCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/UnderscoreGetCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/ValidateCest.php (97%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alnum/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alnum/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alnum/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alnum/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alnum/ValidateCest.php (97%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alpha/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alpha/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alpha/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alpha/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Alpha/ValidateCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/Between/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Between/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Between/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Between/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Between/ValidateCest.php (98%)
 rename tests/integration/{ => Filter}/Validation/Validator/Callback/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Callback/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Callback/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Callback/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Callback/ValidateCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/Confirmation/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Confirmation/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Confirmation/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Confirmation/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Confirmation/ValidateCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/ConstructCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/Validator/CreditCard/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/CreditCard/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/CreditCard/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/CreditCard/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/CreditCard/ValidateCest.php (98%)
 rename tests/integration/{ => Filter}/Validation/Validator/Date/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Date/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Date/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Date/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Date/ValidateCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/DateCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/Digit/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Digit/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Digit/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Digit/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Digit/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/DigitCest.php (98%)
 rename tests/integration/{ => Filter}/Validation/Validator/Email/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Email/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Email/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Email/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Email/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/EmailCest.php (98%)
 rename tests/integration/{ => Filter}/Validation/Validator/ExclusionIn/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/ExclusionIn/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/ExclusionIn/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/ExclusionIn/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/ExclusionIn/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/ExclusionInCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/CustomMessagesCest.php (95%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/IsAllowEmptyCest.php (89%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/File/ValidateCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/GetOptionCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/HasOptionCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/Identical/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Identical/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Identical/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Identical/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Identical/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/IdenticalCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/InclusionIn/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/InclusionIn/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/InclusionIn/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/InclusionIn/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/InclusionIn/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/InclusionInCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/Ip/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Ip/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Ip/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Ip/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Ip/ValidateCest.php (98%)
 rename tests/integration/{ => Filter}/Validation/Validator/Numericality/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Numericality/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Numericality/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Numericality/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Numericality/ValidateCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/NumericalityCest.php (73%)
 rename tests/integration/{ => Filter}/Validation/Validator/PresenceOf/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/PresenceOf/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/PresenceOf/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/PresenceOf/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/PresenceOf/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/PresenceOfCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/Regex/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Regex/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Regex/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Regex/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Regex/ValidateCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/RegexCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/SetOptionCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/ConstructCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/GetTemplateCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/GetTemplatesCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/GetValidatorsCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/ConstructCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/GetOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/GetTemplateCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/GetTemplatesCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/MessageFactoryCest.php (95%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/SetOptionCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/SetTemplateCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/SetTemplatesCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Max/ValidateCest.php (97%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/MessageFactoryCest.php (90%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/ConstructCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/GetOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/GetTemplateCest.php (94%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/GetTemplatesCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/MessageFactoryCest.php (95%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/SetOptionCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/SetTemplateCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/SetTemplatesCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/Min/ValidateCest.php (96%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/SetTemplateCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/SetTemplatesCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/StringLength/ValidateCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/Uniqueness/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Uniqueness/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Uniqueness/HasOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Uniqueness/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Url/ConstructCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Url/GetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Url/HasOptionCest.php (93%)
 rename tests/integration/{ => Filter}/Validation/Validator/Url/SetOptionCest.php (92%)
 rename tests/integration/{ => Filter}/Validation/Validator/Url/ValidateCest.php (99%)
 rename tests/integration/{ => Filter}/Validation/Validator/ValidateCest.php (91%)
 rename tests/integration/{ => Filter}/Validation/ValidatorFactory/NewInstanceCest.php (93%)
 delete mode 100644 tests/integration/Validation/GetEventsManagerCest.php
 delete mode 100644 tests/integration/Validation/GetSetDICest.php
 delete mode 100644 tests/integration/Validation/SetEventsManagerCest.php

diff --git a/tests/integration/Validation/AddCest.php b/tests/integration/Filter/Validation/AddCest.php
similarity index 96%
rename from tests/integration/Validation/AddCest.php
rename to tests/integration/Filter/Validation/AddCest.php
index 96f9d16ab12..d0ed9ed72e8 100644
--- a/tests/integration/Validation/AddCest.php
+++ b/tests/integration/Filter/Validation/AddCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/AllowEmptyCest.php b/tests/integration/Filter/Validation/AllowEmptyCest.php
similarity index 94%
rename from tests/integration/Validation/AllowEmptyCest.php
rename to tests/integration/Filter/Validation/AllowEmptyCest.php
index 065efcfd4b9..5dab0118724 100644
--- a/tests/integration/Validation/AllowEmptyCest.php
+++ b/tests/integration/Filter/Validation/AllowEmptyCest.php
@@ -11,10 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Alpha;
 
diff --git a/tests/integration/Validation/AppendMessageCest.php b/tests/integration/Filter/Validation/AppendMessageCest.php
similarity index 92%
rename from tests/integration/Validation/AppendMessageCest.php
rename to tests/integration/Filter/Validation/AppendMessageCest.php
index 6db2886d912..5915b0773ba 100644
--- a/tests/integration/Validation/AppendMessageCest.php
+++ b/tests/integration/Filter/Validation/AppendMessageCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/BindCest.php b/tests/integration/Filter/Validation/BindCest.php
similarity index 94%
rename from tests/integration/Validation/BindCest.php
rename to tests/integration/Filter/Validation/BindCest.php
index 0c5d92c627d..bcc9b9e9ace 100644
--- a/tests/integration/Validation/BindCest.php
+++ b/tests/integration/Filter/Validation/BindCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/ConstructCest.php b/tests/integration/Filter/Validation/ConstructCest.php
similarity index 95%
rename from tests/integration/Validation/ConstructCest.php
rename to tests/integration/Filter/Validation/ConstructCest.php
index 5f10fa6c02a..abedbed10da 100644
--- a/tests/integration/Validation/ConstructCest.php
+++ b/tests/integration/Filter/Validation/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/GetDataCest.php b/tests/integration/Filter/Validation/GetDataCest.php
similarity index 94%
rename from tests/integration/Validation/GetDataCest.php
rename to tests/integration/Filter/Validation/GetDataCest.php
index babf6b6477c..c144038cab5 100644
--- a/tests/integration/Validation/GetDataCest.php
+++ b/tests/integration/Filter/Validation/GetDataCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/GetEntityCest.php b/tests/integration/Filter/Validation/GetEntityCest.php
similarity index 94%
rename from tests/integration/Validation/GetEntityCest.php
rename to tests/integration/Filter/Validation/GetEntityCest.php
index c742cf96917..7020b14bcde 100644
--- a/tests/integration/Validation/GetEntityCest.php
+++ b/tests/integration/Filter/Validation/GetEntityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/GetLabelCest.php b/tests/integration/Filter/Validation/GetLabelCest.php
similarity index 92%
rename from tests/integration/Validation/GetLabelCest.php
rename to tests/integration/Filter/Validation/GetLabelCest.php
index b61b69f3bd3..60e3f59a2b0 100644
--- a/tests/integration/Validation/GetLabelCest.php
+++ b/tests/integration/Filter/Validation/GetLabelCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetMessagesCest.php b/tests/integration/Filter/Validation/GetMessagesCest.php
similarity index 92%
rename from tests/integration/Validation/GetMessagesCest.php
rename to tests/integration/Filter/Validation/GetMessagesCest.php
index dcf0f49227d..48a2a298ff2 100644
--- a/tests/integration/Validation/GetMessagesCest.php
+++ b/tests/integration/Filter/Validation/GetMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/GetSetFiltersCest.php b/tests/integration/Filter/Validation/GetSetFiltersCest.php
similarity index 95%
rename from tests/integration/Validation/GetSetFiltersCest.php
rename to tests/integration/Filter/Validation/GetSetFiltersCest.php
index bece5aef30d..2e475f0a211 100644
--- a/tests/integration/Validation/GetSetFiltersCest.php
+++ b/tests/integration/Filter/Validation/GetSetFiltersCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/GetSetValidatorsCest.php b/tests/integration/Filter/Validation/GetSetValidatorsCest.php
similarity index 95%
rename from tests/integration/Validation/GetSetValidatorsCest.php
rename to tests/integration/Filter/Validation/GetSetValidatorsCest.php
index 0303c3f3504..f83f1909ddc 100644
--- a/tests/integration/Validation/GetSetValidatorsCest.php
+++ b/tests/integration/Filter/Validation/GetSetValidatorsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/GetValueByDataCest.php b/tests/integration/Filter/Validation/GetValueByDataCest.php
similarity index 96%
rename from tests/integration/Validation/GetValueByDataCest.php
rename to tests/integration/Filter/Validation/GetValueByDataCest.php
index 9b00e0d3bcc..6514033f8d5 100644
--- a/tests/integration/Validation/GetValueByDataCest.php
+++ b/tests/integration/Filter/Validation/GetValueByDataCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
-use Phalcon\Tests\Models\EntityWithPublic;
 use Phalcon\Filter\Validation;
+use Phalcon\Tests\Models\EntityWithPublic;
 
 /**
  * Class GetValueByDataCest
diff --git a/tests/integration/Validation/GetValueByEntityCest.php b/tests/integration/Filter/Validation/GetValueByEntityCest.php
similarity index 97%
rename from tests/integration/Validation/GetValueByEntityCest.php
rename to tests/integration/Filter/Validation/GetValueByEntityCest.php
index b59bc66e365..9191fbc186e 100644
--- a/tests/integration/Validation/GetValueByEntityCest.php
+++ b/tests/integration/Filter/Validation/GetValueByEntityCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
+use Phalcon\Filter\Validation;
 use Phalcon\Tests\Models\EntityWithGetter;
 use Phalcon\Tests\Models\EntityWithHook;
 use Phalcon\Tests\Models\EntityWithPublic;
-use Phalcon\Filter\Validation;
 
 /**
  * Class GetValueByEntityCest
diff --git a/tests/integration/Validation/GetValueCest.php b/tests/integration/Filter/Validation/GetValueCest.php
similarity index 92%
rename from tests/integration/Validation/GetValueCest.php
rename to tests/integration/Filter/Validation/GetValueCest.php
index f0b7204c2a8..e0d62596f4a 100644
--- a/tests/integration/Validation/GetValueCest.php
+++ b/tests/integration/Filter/Validation/GetValueCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/RuleCest.php b/tests/integration/Filter/Validation/RuleCest.php
similarity index 96%
rename from tests/integration/Validation/RuleCest.php
rename to tests/integration/Filter/Validation/RuleCest.php
index bc172b2bf88..882713becf9 100644
--- a/tests/integration/Validation/RuleCest.php
+++ b/tests/integration/Filter/Validation/RuleCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/RulesCest.php b/tests/integration/Filter/Validation/RulesCest.php
similarity index 96%
rename from tests/integration/Validation/RulesCest.php
rename to tests/integration/Filter/Validation/RulesCest.php
index 605c2af4741..d61025fcf2a 100644
--- a/tests/integration/Validation/RulesCest.php
+++ b/tests/integration/Filter/Validation/RulesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/SetDefaultMessagesCest.php b/tests/integration/Filter/Validation/SetDefaultMessagesCest.php
similarity index 92%
rename from tests/integration/Validation/SetDefaultMessagesCest.php
rename to tests/integration/Filter/Validation/SetDefaultMessagesCest.php
index de0ab496fb2..c4c54f91a8c 100644
--- a/tests/integration/Validation/SetDefaultMessagesCest.php
+++ b/tests/integration/Filter/Validation/SetDefaultMessagesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/SetEntityCest.php b/tests/integration/Filter/Validation/SetEntityCest.php
similarity index 93%
rename from tests/integration/Validation/SetEntityCest.php
rename to tests/integration/Filter/Validation/SetEntityCest.php
index 46809f2b10b..a0424d5b63c 100644
--- a/tests/integration/Validation/SetEntityCest.php
+++ b/tests/integration/Filter/Validation/SetEntityCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/SetLabelsCest.php b/tests/integration/Filter/Validation/SetLabelsCest.php
similarity index 92%
rename from tests/integration/Validation/SetLabelsCest.php
rename to tests/integration/Filter/Validation/SetLabelsCest.php
index e1a2b13710e..a34cba6fa8a 100644
--- a/tests/integration/Validation/SetLabelsCest.php
+++ b/tests/integration/Filter/Validation/SetLabelsCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/UnderscoreGetCest.php b/tests/integration/Filter/Validation/UnderscoreGetCest.php
similarity index 92%
rename from tests/integration/Validation/UnderscoreGetCest.php
rename to tests/integration/Filter/Validation/UnderscoreGetCest.php
index ceb4ca00d4d..c66e3dac535 100644
--- a/tests/integration/Validation/UnderscoreGetCest.php
+++ b/tests/integration/Filter/Validation/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/ValidateCest.php b/tests/integration/Filter/Validation/ValidateCest.php
similarity index 97%
rename from tests/integration/Validation/ValidateCest.php
rename to tests/integration/Filter/Validation/ValidateCest.php
index 646195ea6ef..9c88c65e401 100644
--- a/tests/integration/Validation/ValidateCest.php
+++ b/tests/integration/Filter/Validation/ValidateCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation;
+namespace Phalcon\Tests\Integration\Filter\Validation;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 use stdClass;
 
 use function date;
diff --git a/tests/integration/Validation/Validator/Alnum/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Alnum/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alnum/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Alnum/ConstructCest.php
index e602e330bff..22520b84bbf 100644
--- a/tests/integration/Validation/Validator/Alnum/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alnum/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alnum;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class ConstructCest
 {
diff --git a/tests/integration/Validation/Validator/Alnum/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Alnum/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alnum/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Alnum/GetOptionCest.php
index 911e0379bfa..39b6afc743c 100644
--- a/tests/integration/Validation/Validator/Alnum/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alnum/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alnum;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Alnum/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Alnum/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alnum/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Alnum/HasOptionCest.php
index a8ace0bb5ae..33c4972fac5 100644
--- a/tests/integration/Validation/Validator/Alnum/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alnum/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alnum;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class HasOptionCest
 {
diff --git a/tests/integration/Validation/Validator/Alnum/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Alnum/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alnum/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Alnum/SetOptionCest.php
index e1787734c9f..95e28e00843 100644
--- a/tests/integration/Validation/Validator/Alnum/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alnum/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alnum;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alnum;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class SetOptionCest
 {
diff --git a/tests/integration/Validation/Validator/Alnum/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Alnum/ValidateCest.php
similarity index 97%
rename from tests/integration/Validation/Validator/Alnum/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Alnum/ValidateCest.php
index 80d3c694405..e4452389701 100644
--- a/tests/integration/Validation/Validator/Alnum/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alnum/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alnum;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alnum;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/Validator/Alpha/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Alpha/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alpha/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Alpha/ConstructCest.php
index 9e4eadb1023..c52564e5cf2 100644
--- a/tests/integration/Validation/Validator/Alpha/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alpha/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alpha;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Alpha/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Alpha/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alpha/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Alpha/GetOptionCest.php
index 65a9b886bc5..18f3477eb12 100644
--- a/tests/integration/Validation/Validator/Alpha/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alpha/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alpha;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Alpha/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Alpha/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Alpha/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Alpha/HasOptionCest.php
index b7d583b3c3f..6fe73bb3ba3 100644
--- a/tests/integration/Validation/Validator/Alpha/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alpha/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alpha;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Alpha/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Alpha/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Alpha/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Alpha/SetOptionCest.php
index ce0f6b783ae..cf2dbdb5624 100644
--- a/tests/integration/Validation/Validator/Alpha/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alpha/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alpha;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Alpha;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Alpha/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Alpha/ValidateCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/Alpha/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Alpha/ValidateCest.php
index 969fc870b65..3ee231d8a0b 100644
--- a/tests/integration/Validation/Validator/Alpha/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Alpha/ValidateCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Alpha;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Alpha;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Alpha;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class ValidateCest
 {
diff --git a/tests/integration/Validation/Validator/Between/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Between/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Between/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Between/ConstructCest.php
index 820db02da8c..f2a75c7a843 100644
--- a/tests/integration/Validation/Validator/Between/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Between/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Between;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Between/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Between/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Between/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Between/GetOptionCest.php
index 2c74f552592..99b0e73f87e 100644
--- a/tests/integration/Validation/Validator/Between/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Between/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Between;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Between/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Between/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Between/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Between/HasOptionCest.php
index 0e4b59750e1..f6fbf8bfaa2 100644
--- a/tests/integration/Validation/Validator/Between/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Between/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Between;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class HasOptionCest
 {
diff --git a/tests/integration/Validation/Validator/Between/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Between/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Between/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Between/SetOptionCest.php
index 1625a747f2f..c6e45bc6fc5 100644
--- a/tests/integration/Validation/Validator/Between/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Between/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Between;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Between/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Between/ValidateCest.php
similarity index 98%
rename from tests/integration/Validation/Validator/Between/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Between/ValidateCest.php
index 19016b91393..9a3c79a1e53 100644
--- a/tests/integration/Validation/Validator/Between/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Between/ValidateCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Between;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Between;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Between;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 /**
  * Class ValidateCest
diff --git a/tests/integration/Validation/Validator/Callback/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Callback/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Callback/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Callback/ConstructCest.php
index febded5b6e2..7174ff9aea9 100644
--- a/tests/integration/Validation/Validator/Callback/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Callback/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Callback;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Callback/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Callback/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Callback/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Callback/GetOptionCest.php
index de535e53c37..f5588e89433 100644
--- a/tests/integration/Validation/Validator/Callback/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Callback/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Callback;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Callback/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Callback/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Callback/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Callback/HasOptionCest.php
index b401177933e..bd36c9b959b 100644
--- a/tests/integration/Validation/Validator/Callback/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Callback/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Callback;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class HasOptionCest
 {
diff --git a/tests/integration/Validation/Validator/Callback/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Callback/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Callback/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Callback/SetOptionCest.php
index feefa77b127..07f59651604 100644
--- a/tests/integration/Validation/Validator/Callback/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Callback/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Callback;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Callback/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Callback/ValidateCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/Callback/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Callback/ValidateCest.php
index 338db60776d..78ba6a0f38c 100644
--- a/tests/integration/Validation/Validator/Callback/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Callback/ValidateCest.php
@@ -11,17 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Callback;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Callback;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Callback;
 use Phalcon\Filter\Validation\Validator\Exception;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
 use Phalcon\Filter\Validation\Validator\StringLength;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class ValidateCest
 {
diff --git a/tests/integration/Validation/Validator/Confirmation/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Confirmation/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Confirmation/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Confirmation/ConstructCest.php
index 39769e648fc..d8239d6ee63 100644
--- a/tests/integration/Validation/Validator/Confirmation/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Confirmation/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Confirmation;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Confirmation/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Confirmation/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Confirmation/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Confirmation/GetOptionCest.php
index e3a1a0cc1ea..023ce1ef041 100644
--- a/tests/integration/Validation/Validator/Confirmation/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Confirmation/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Confirmation;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Confirmation/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Confirmation/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Confirmation/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Confirmation/HasOptionCest.php
index 218787eb39a..e7be604b831 100644
--- a/tests/integration/Validation/Validator/Confirmation/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Confirmation/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Confirmation;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class HasOptionCest
 {
diff --git a/tests/integration/Validation/Validator/Confirmation/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Confirmation/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Confirmation/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Confirmation/SetOptionCest.php
index a00579e3133..f905146babc 100644
--- a/tests/integration/Validation/Validator/Confirmation/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Confirmation/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Confirmation;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Confirmation/ValidateCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/Confirmation/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Confirmation/ValidateCest.php
index f5e749484e4..435620fa315 100644
--- a/tests/integration/Validation/Validator/Confirmation/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Confirmation/ValidateCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Confirmation;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Confirmation;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Confirmation;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 /**
  * Class ValidateCest
diff --git a/tests/integration/Validation/Validator/ConstructCest.php b/tests/integration/Filter/Validation/Validator/ConstructCest.php
similarity index 96%
rename from tests/integration/Validation/Validator/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/ConstructCest.php
index 6566d732a37..7c11ddb54f6 100644
--- a/tests/integration/Validation/Validator/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/ConstructCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
diff --git a/tests/integration/Validation/Validator/CreditCard/ConstructCest.php b/tests/integration/Filter/Validation/Validator/CreditCard/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/CreditCard/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/CreditCard/ConstructCest.php
index ab505686a79..6452f8cfcb2 100644
--- a/tests/integration/Validation/Validator/CreditCard/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/CreditCard/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\CreditCard;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/CreditCard/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/CreditCard/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/CreditCard/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/CreditCard/GetOptionCest.php
index 4bfabea40ee..be638812861 100644
--- a/tests/integration/Validation/Validator/CreditCard/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/CreditCard/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\CreditCard;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/CreditCard/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/CreditCard/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/CreditCard/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/CreditCard/HasOptionCest.php
index 7a6a0cde5a3..04184a1f570 100644
--- a/tests/integration/Validation/Validator/CreditCard/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/CreditCard/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\CreditCard;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/CreditCard/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/CreditCard/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/CreditCard/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/CreditCard/SetOptionCest.php
index b6a5b7f0d70..bfe8a596806 100644
--- a/tests/integration/Validation/Validator/CreditCard/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/CreditCard/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\CreditCard;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/CreditCard/ValidateCest.php b/tests/integration/Filter/Validation/Validator/CreditCard/ValidateCest.php
similarity index 98%
rename from tests/integration/Validation/Validator/CreditCard/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/CreditCard/ValidateCest.php
index ef427977885..bbe2dc0e242 100644
--- a/tests/integration/Validation/Validator/CreditCard/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/CreditCard/ValidateCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\CreditCard;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\CreditCard;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\CreditCard;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 /**
  * Class ValidateCest
diff --git a/tests/integration/Validation/Validator/Date/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Date/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Date/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Date/ConstructCest.php
index 9099b2e07d1..28539a75ecd 100644
--- a/tests/integration/Validation/Validator/Date/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Date/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Date;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Date/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Date/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Date/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Date/GetOptionCest.php
index 92ac6b5f9bf..3271f443d72 100644
--- a/tests/integration/Validation/Validator/Date/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Date/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Date;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Date/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Date/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Date/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Date/HasOptionCest.php
index 261587f6006..6141d89f600 100644
--- a/tests/integration/Validation/Validator/Date/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Date/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Date;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Date/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Date/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Date/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Date/SetOptionCest.php
index 07d7eee8c9e..dfa13fd44c1 100644
--- a/tests/integration/Validation/Validator/Date/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Date/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Date;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Date;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Date/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Date/ValidateCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/Date/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Date/ValidateCest.php
index 81e14fc4723..3bd6c5e75c4 100644
--- a/tests/integration/Validation/Validator/Date/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Date/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Date;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Date;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/DateCest.php b/tests/integration/Filter/Validation/Validator/DateCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/DateCest.php
rename to tests/integration/Filter/Validation/Validator/DateCest.php
index a5bce55552e..39a44d4395b 100644
--- a/tests/integration/Validation/Validator/DateCest.php
+++ b/tests/integration/Filter/Validation/Validator/DateCest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Date;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 use stdClass;
 
 class DateCest
diff --git a/tests/integration/Validation/Validator/Digit/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Digit/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Digit/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Digit/ConstructCest.php
index 7db4daeb789..48bd9b822b2 100644
--- a/tests/integration/Validation/Validator/Digit/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Digit/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Digit;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Digit/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Digit/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Digit/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Digit/GetOptionCest.php
index 9058dd2b7e6..e127d1ef633 100644
--- a/tests/integration/Validation/Validator/Digit/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Digit/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Digit;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Digit/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Digit/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Digit/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Digit/HasOptionCest.php
index e2840d6bbd1..145aec2935f 100644
--- a/tests/integration/Validation/Validator/Digit/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Digit/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Digit;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Digit/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Digit/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Digit/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Digit/SetOptionCest.php
index e8078b25f7b..c22900f6f34 100644
--- a/tests/integration/Validation/Validator/Digit/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Digit/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Digit;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Digit;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Digit/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Digit/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/Digit/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Digit/ValidateCest.php
index e221d73db0e..b6002ed08ab 100644
--- a/tests/integration/Validation/Validator/Digit/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Digit/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Digit;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Digit;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/DigitCest.php b/tests/integration/Filter/Validation/Validator/DigitCest.php
similarity index 98%
rename from tests/integration/Validation/Validator/DigitCest.php
rename to tests/integration/Filter/Validation/Validator/DigitCest.php
index a3bf07655b0..abc967a2332 100644
--- a/tests/integration/Validation/Validator/DigitCest.php
+++ b/tests/integration/Filter/Validation/Validator/DigitCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
diff --git a/tests/integration/Validation/Validator/Email/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Email/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Email/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Email/ConstructCest.php
index 47bc33fd48f..4ac7d3e5d25 100644
--- a/tests/integration/Validation/Validator/Email/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Email/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Email;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Email/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Email/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Email/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Email/GetOptionCest.php
index 00f5a313a38..2057926ede9 100644
--- a/tests/integration/Validation/Validator/Email/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Email/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Email;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Email/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Email/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Email/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Email/HasOptionCest.php
index c90c0d60e81..a25c490169b 100644
--- a/tests/integration/Validation/Validator/Email/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Email/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Email;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Email/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Email/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Email/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Email/SetOptionCest.php
index 4b6a4ffa827..278cc314e73 100644
--- a/tests/integration/Validation/Validator/Email/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Email/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Email;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Email;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Email/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Email/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/Email/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Email/ValidateCest.php
index bace4e9348a..5d38a1e6738 100644
--- a/tests/integration/Validation/Validator/Email/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Email/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Email;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Email;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/EmailCest.php b/tests/integration/Filter/Validation/Validator/EmailCest.php
similarity index 98%
rename from tests/integration/Validation/Validator/EmailCest.php
rename to tests/integration/Filter/Validation/Validator/EmailCest.php
index ca285e1a913..49e90101205 100644
--- a/tests/integration/Validation/Validator/EmailCest.php
+++ b/tests/integration/Filter/Validation/Validator/EmailCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Email;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class EmailCest
 {
diff --git a/tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php b/tests/integration/Filter/Validation/Validator/ExclusionIn/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/ExclusionIn/ConstructCest.php
index 98330e86f55..8581256ec25 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/ExclusionIn/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\ExclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/ExclusionIn/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/ExclusionIn/GetOptionCest.php
index 4d8b30af013..166f8452b5c 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/ExclusionIn/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\ExclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/ExclusionIn/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/ExclusionIn/HasOptionCest.php
index 00753f7f2af..1257af87616 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/ExclusionIn/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\ExclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/ExclusionIn/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/ExclusionIn/SetOptionCest.php
index 31bff4ec2f3..25abca42b89 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/ExclusionIn/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\ExclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php b/tests/integration/Filter/Validation/Validator/ExclusionIn/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/ExclusionIn/ValidateCest.php
index 4d2fdf2147b..ea84ee2a585 100644
--- a/tests/integration/Validation/Validator/ExclusionIn/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/ExclusionIn/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\ExclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\ExclusionIn;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/ExclusionInCest.php b/tests/integration/Filter/Validation/Validator/ExclusionInCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/ExclusionInCest.php
rename to tests/integration/Filter/Validation/Validator/ExclusionInCest.php
index 98abb7c0e1d..20e6e0cf4e9 100644
--- a/tests/integration/Validation/Validator/ExclusionInCest.php
+++ b/tests/integration/Filter/Validation/Validator/ExclusionInCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\ExclusionIn;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class ExclusionInCest
 {
diff --git a/tests/integration/Validation/Validator/File/ConstructCest.php b/tests/integration/Filter/Validation/Validator/File/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/File/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/File/ConstructCest.php
index d7e0d4a8ab1..9baec44c6f5 100644
--- a/tests/integration/Validation/Validator/File/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\File;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/File/CustomMessagesCest.php b/tests/integration/Filter/Validation/Validator/File/CustomMessagesCest.php
similarity index 95%
rename from tests/integration/Validation/Validator/File/CustomMessagesCest.php
rename to tests/integration/Filter/Validation/Validator/File/CustomMessagesCest.php
index 925fd8e3308..9adeaf9dfa6 100644
--- a/tests/integration/Validation/Validator/File/CustomMessagesCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/CustomMessagesCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\File;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class CustomMessagesCest
diff --git a/tests/integration/Validation/Validator/File/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/File/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/File/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/File/GetOptionCest.php
index f4f597d5d8a..11d116652b0 100644
--- a/tests/integration/Validation/Validator/File/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\File;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/File/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/File/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/File/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/File/HasOptionCest.php
index b66f5951551..ec959644641 100644
--- a/tests/integration/Validation/Validator/File/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\File;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/File/IsAllowEmptyCest.php b/tests/integration/Filter/Validation/Validator/File/IsAllowEmptyCest.php
similarity index 89%
rename from tests/integration/Validation/Validator/File/IsAllowEmptyCest.php
rename to tests/integration/Filter/Validation/Validator/File/IsAllowEmptyCest.php
index ed08bc1b076..fab987b5578 100644
--- a/tests/integration/Validation/Validator/File/IsAllowEmptyCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/IsAllowEmptyCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/File/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/File/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/File/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/File/SetOptionCest.php
index ca475e18b89..837f5d88811 100644
--- a/tests/integration/Validation/Validator/File/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\File;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/File/ValidateCest.php b/tests/integration/Filter/Validation/Validator/File/ValidateCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/File/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/File/ValidateCest.php
index a0175972ae5..192f2cfe898 100644
--- a/tests/integration/Validation/Validator/File/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/File/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\File;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\File;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/GetOptionCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/GetOptionCest.php
index 63b5b47c0ca..0526d31c5d5 100644
--- a/tests/integration/Validation/Validator/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/HasOptionCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/HasOptionCest.php
index 33754e4c2f0..c1007b20879 100644
--- a/tests/integration/Validation/Validator/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/Identical/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Identical/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Identical/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Identical/ConstructCest.php
index 7b9453edd10..42f912309e9 100644
--- a/tests/integration/Validation/Validator/Identical/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Identical/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Identical;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Identical/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Identical/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Identical/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Identical/GetOptionCest.php
index c089d6dda91..8c508906c91 100644
--- a/tests/integration/Validation/Validator/Identical/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Identical/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Identical;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Identical/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Identical/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Identical/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Identical/HasOptionCest.php
index 50c5d3c2508..fd0dc4a8d93 100644
--- a/tests/integration/Validation/Validator/Identical/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Identical/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Identical;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Identical/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Identical/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Identical/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Identical/SetOptionCest.php
index aaebdb4c4b0..624ae07e52c 100644
--- a/tests/integration/Validation/Validator/Identical/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Identical/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Identical;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Identical;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Identical/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Identical/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/Identical/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Identical/ValidateCest.php
index 6762dfb5eb6..236e5334e4f 100644
--- a/tests/integration/Validation/Validator/Identical/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Identical/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Identical;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Identical;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/IdenticalCest.php b/tests/integration/Filter/Validation/Validator/IdenticalCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/IdenticalCest.php
rename to tests/integration/Filter/Validation/Validator/IdenticalCest.php
index bf9a70588a8..73acc5af325 100644
--- a/tests/integration/Validation/Validator/IdenticalCest.php
+++ b/tests/integration/Filter/Validation/Validator/IdenticalCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Identical;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class IdenticalCest
 {
diff --git a/tests/integration/Validation/Validator/InclusionIn/ConstructCest.php b/tests/integration/Filter/Validation/Validator/InclusionIn/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/InclusionIn/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/InclusionIn/ConstructCest.php
index 15483f60669..8e2b9d15aaf 100644
--- a/tests/integration/Validation/Validator/InclusionIn/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/InclusionIn/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\InclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/InclusionIn/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/InclusionIn/GetOptionCest.php
index 3fd96a0260d..39807269fb7 100644
--- a/tests/integration/Validation/Validator/InclusionIn/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/InclusionIn/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\InclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/InclusionIn/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/InclusionIn/HasOptionCest.php
index 99f7addaf2f..4c9b30de612 100644
--- a/tests/integration/Validation/Validator/InclusionIn/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/InclusionIn/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\InclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/InclusionIn/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/InclusionIn/SetOptionCest.php
index f7fbb603498..7fb298095d5 100644
--- a/tests/integration/Validation/Validator/InclusionIn/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/InclusionIn/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\InclusionIn;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/InclusionIn/ValidateCest.php b/tests/integration/Filter/Validation/Validator/InclusionIn/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/InclusionIn/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/InclusionIn/ValidateCest.php
index 56c1709f8c5..59a31f8a8db 100644
--- a/tests/integration/Validation/Validator/InclusionIn/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/InclusionIn/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\InclusionIn;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\InclusionIn;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/InclusionInCest.php b/tests/integration/Filter/Validation/Validator/InclusionInCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/InclusionInCest.php
rename to tests/integration/Filter/Validation/Validator/InclusionInCest.php
index d7573c85e50..9a16e5f1e4d 100644
--- a/tests/integration/Validation/Validator/InclusionInCest.php
+++ b/tests/integration/Filter/Validation/Validator/InclusionInCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\InclusionIn;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class InclusionInCest
 {
diff --git a/tests/integration/Validation/Validator/Ip/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Ip/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Ip/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Ip/ConstructCest.php
index 7195e70408f..0da947db9ec 100644
--- a/tests/integration/Validation/Validator/Ip/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Ip/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Ip;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Ip/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Ip/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Ip/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Ip/GetOptionCest.php
index f648ebe69e8..8b50d8c3caf 100644
--- a/tests/integration/Validation/Validator/Ip/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Ip/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Ip;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Ip/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Ip/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Ip/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Ip/HasOptionCest.php
index 4c9455f11b1..ff9b2c1ab9f 100644
--- a/tests/integration/Validation/Validator/Ip/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Ip/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Ip;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Ip/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Ip/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Ip/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Ip/SetOptionCest.php
index e6116172412..bdc36d533e4 100644
--- a/tests/integration/Validation/Validator/Ip/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Ip/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Ip;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Ip;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Ip/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Ip/ValidateCest.php
similarity index 98%
rename from tests/integration/Validation/Validator/Ip/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Ip/ValidateCest.php
index 1cbddcb49cc..c89eca871d6 100644
--- a/tests/integration/Validation/Validator/Ip/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Ip/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Ip;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Ip;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/Validator/Numericality/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Numericality/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Numericality/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Numericality/ConstructCest.php
index e169661fa77..e06786b7623 100644
--- a/tests/integration/Validation/Validator/Numericality/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Numericality/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Numericality;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Numericality/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Numericality/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Numericality/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Numericality/GetOptionCest.php
index ecf1dcf3655..0992d582a86 100644
--- a/tests/integration/Validation/Validator/Numericality/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Numericality/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Numericality;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Numericality/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Numericality/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Numericality/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Numericality/HasOptionCest.php
index 5d44c66e1db..5ccee07d236 100644
--- a/tests/integration/Validation/Validator/Numericality/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Numericality/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Numericality;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Numericality/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Numericality/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Numericality/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Numericality/SetOptionCest.php
index 06ea5f397fe..f79bf16e3eb 100644
--- a/tests/integration/Validation/Validator/Numericality/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Numericality/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Numericality;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Numericality;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Numericality/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Numericality/ValidateCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/Numericality/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Numericality/ValidateCest.php
index aecb3659a32..76ec0c589ec 100644
--- a/tests/integration/Validation/Validator/Numericality/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Numericality/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Numericality;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Numericality;
 
 use Codeception\Example;
 use IntegrationTester;
@@ -72,6 +72,9 @@ private function getExamples(): array
             ['-1,234.56aa', false],
             ['-1.23aa', false],
             ['-1.123,56aa', false],
+            ['-12,000', true],
+            ['-12,0@0', false],
+            ['-12,0@@0', false],
         ];
     }
 }
diff --git a/tests/integration/Validation/Validator/NumericalityCest.php b/tests/integration/Filter/Validation/Validator/NumericalityCest.php
similarity index 73%
rename from tests/integration/Validation/Validator/NumericalityCest.php
rename to tests/integration/Filter/Validation/Validator/NumericalityCest.php
index d58434694d9..05a40c23431 100644
--- a/tests/integration/Validation/Validator/NumericalityCest.php
+++ b/tests/integration/Filter/Validation/Validator/NumericalityCest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
@@ -25,27 +25,23 @@ class NumericalityCest
      * @author       Andrey Izman <izmanw@gmail.com>
      * @since        2016-06-05
      *
-     * @dataProvider validationValidatorSingleFieldProvider
+     * @dataProvider getExamples
      */
     public function filterValidationValidatorSingleField(IntegrationTester $I, Example $example)
     {
         $validation = new Validation();
+        $validation->add('amount', new Numericality());
 
-        $validation->add(
-            'amount',
-            new Numericality()
-        );
-
+        $amount   = $example['amount'];
+        $expected = $example['expected'];
         $messages = $validation->validate(
             [
-                'amount' => $example['amount'],
+                'amount' => $amount,
             ]
         );
 
-        $I->assertEquals(
-            $example['expected'],
-            $messages->count()
-        );
+        $actual = $messages->count();
+        $I->assertEquals($expected, $actual);
     }
 
     /**
@@ -82,10 +78,9 @@ public function filterValidationValidatorMultipleField(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
-            0,
-            $messages->count()
-        );
+        $expected = 0;
+        $actual   = $messages->count();
+        $I->assertEquals($expected, $actual);
 
         $messages = $validation->validate(
             [
@@ -94,10 +89,9 @@ public function filterValidationValidatorMultipleField(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
-            1,
-            $messages->count()
-        );
+        $expected = 1;
+        $actual   = $messages->count();
+        $I->assertEquals($expected, $actual);
 
         $expected = $validationMessages['amount'];
         $actual   = $messages->offsetGet(0)->getMessage();
@@ -110,10 +104,9 @@ public function filterValidationValidatorMultipleField(IntegrationTester $I)
             ]
         );
 
-        $I->assertEquals(
-            2,
-            $messages->count()
-        );
+        $expected = 2;
+        $actual   = $messages->count();
+        $I->assertEquals($expected, $actual);
 
         $expected = $validationMessages['amount'];
         $actual   = $messages->offsetGet(0)->getMessage();
@@ -124,24 +117,36 @@ public function filterValidationValidatorMultipleField(IntegrationTester $I)
         $I->assertEquals($expected, $actual);
     }
 
-    private function validationValidatorSingleFieldProvider(): array
+    /**
+     * @return array
+     */
+    private function getExamples(): array
     {
         return [
             [
                 'amount'   => 123,
                 'expected' => 0,
             ],
-
             [
                 'amount'   => 123.12,
                 'expected' => 0,
             ],
-
+            [
+                'amount'   => '-12,000',
+                'expected' => 0,
+            ],
+            [
+                'amount'   => '-12,0@0',
+                'expected' => 1,
+            ],
+            [
+                'amount'   => '-12,0@@0',
+                'expected' => 1,
+            ],
             [
                 'amount'   => '123abc',
                 'expected' => 1,
             ],
-
             [
                 'amount'   => '123.12e3',
                 'expected' => 1,
diff --git a/tests/integration/Validation/Validator/PresenceOf/ConstructCest.php b/tests/integration/Filter/Validation/Validator/PresenceOf/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/PresenceOf/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/PresenceOf/ConstructCest.php
index 16696a0e8b8..8a9e1092aec 100644
--- a/tests/integration/Validation/Validator/PresenceOf/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/PresenceOf/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class ConstructCest
 {
diff --git a/tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/PresenceOf/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/PresenceOf/GetOptionCest.php
index 8d8b8ae3a11..1f5bddc2ee9 100644
--- a/tests/integration/Validation/Validator/PresenceOf/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/PresenceOf/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/PresenceOf/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/PresenceOf/HasOptionCest.php
index 1eaa0622066..7081a908288 100644
--- a/tests/integration/Validation/Validator/PresenceOf/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/PresenceOf/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class HasOptionCest
 {
diff --git a/tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/PresenceOf/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/PresenceOf/SetOptionCest.php
index 6d210590946..82a1374c836 100644
--- a/tests/integration/Validation/Validator/PresenceOf/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/PresenceOf/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/PresenceOf/ValidateCest.php b/tests/integration/Filter/Validation/Validator/PresenceOf/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/PresenceOf/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/PresenceOf/ValidateCest.php
index f35fe8ac1b0..f07b1125d8e 100644
--- a/tests/integration/Validation/Validator/PresenceOf/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/PresenceOf/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\PresenceOf;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\PresenceOf;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/PresenceOfCest.php b/tests/integration/Filter/Validation/Validator/PresenceOfCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/PresenceOfCest.php
rename to tests/integration/Filter/Validation/Validator/PresenceOfCest.php
index c2eaa831d14..91b641117db 100644
--- a/tests/integration/Validation/Validator/PresenceOfCest.php
+++ b/tests/integration/Filter/Validation/Validator/PresenceOfCest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\PresenceOf;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class PresenceOfCest
 {
diff --git a/tests/integration/Validation/Validator/Regex/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Regex/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Regex/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Regex/ConstructCest.php
index cf394ccc8ab..6a059dfacc0 100644
--- a/tests/integration/Validation/Validator/Regex/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Regex/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Regex;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Regex/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Regex/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Regex/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Regex/GetOptionCest.php
index b029c04cfa4..88e6085ced6 100644
--- a/tests/integration/Validation/Validator/Regex/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Regex/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Regex;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Regex/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Regex/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Regex/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Regex/HasOptionCest.php
index 11994b8d776..7851432c13a 100644
--- a/tests/integration/Validation/Validator/Regex/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Regex/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Regex;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Regex/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Regex/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Regex/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Regex/SetOptionCest.php
index 976f8b1b10e..178ae63c930 100644
--- a/tests/integration/Validation/Validator/Regex/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Regex/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Regex;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Regex;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Regex/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Regex/ValidateCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/Regex/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Regex/ValidateCest.php
index 62b167359ca..0756b5c8955 100644
--- a/tests/integration/Validation/Validator/Regex/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Regex/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Regex;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Regex;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/RegexCest.php b/tests/integration/Filter/Validation/Validator/RegexCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/RegexCest.php
rename to tests/integration/Filter/Validation/Validator/RegexCest.php
index 74cfadb1b85..62349711b30 100644
--- a/tests/integration/Validation/Validator/RegexCest.php
+++ b/tests/integration/Filter/Validation/Validator/RegexCest.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Regex;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class RegexCest
 {
diff --git a/tests/integration/Validation/Validator/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/SetOptionCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/SetOptionCest.php
index e6dd6889b69..e2e5ae772e0 100644
--- a/tests/integration/Validation/Validator/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/SetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/StringLength/ConstructCest.php b/tests/integration/Filter/Validation/Validator/StringLength/ConstructCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/ConstructCest.php
index e38f0e4d6b0..71c222e20ae 100644
--- a/tests/integration/Validation/Validator/StringLength/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/ConstructCest.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength;
 use Phalcon\Filter\Validation\ValidatorCompositeInterface;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/StringLength/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/StringLength/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/GetOptionCest.php
index b30e1a2b8a5..5f769d9f86c 100644
--- a/tests/integration/Validation/Validator/StringLength/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/StringLength/GetTemplateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/GetTemplateCest.php
similarity index 94%
rename from tests/integration/Validation/Validator/StringLength/GetTemplateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/GetTemplateCest.php
index afd162b99f9..a1ee6273569 100644
--- a/tests/integration/Validation/Validator/StringLength/GetTemplateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/GetTemplateCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
-use Phalcon\Filter\Validation\Validator\StringLength;
 use IntegrationTester;
+use Phalcon\Filter\Validation\Validator\StringLength;
 
 class GetTemplateCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php b/tests/integration/Filter/Validation/Validator/StringLength/GetTemplatesCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/GetTemplatesCest.php
index f92f8c2e247..41eb28afde0 100644
--- a/tests/integration/Validation/Validator/StringLength/GetTemplatesCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/GetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php b/tests/integration/Filter/Validation/Validator/StringLength/GetValidatorsCest.php
similarity index 94%
rename from tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/GetValidatorsCest.php
index b108524114c..bc18328f8e3 100644
--- a/tests/integration/Validation/Validator/StringLength/GetValidatorsCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/GetValidatorsCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
-use Phalcon\Filter\Validation\Validator\StringLength;
 use IntegrationTester;
+use Phalcon\Filter\Validation\Validator\StringLength;
 
 class GetValidatorsCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/StringLength/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/HasOptionCest.php
index 1bd0ddfbb5a..fbdcc5f16ae 100644
--- a/tests/integration/Validation/Validator/StringLength/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/ConstructCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/ConstructCest.php
index 62db878db70..7aee9b1b06a 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class ConstructCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/GetOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/GetOptionCest.php
index 604b6639b2a..8cce59b96c2 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/GetTemplateCest.php
similarity index 94%
rename from tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/GetTemplateCest.php
index f27f4857ac9..52ee5986b2c 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/GetTemplateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/GetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/GetTemplatesCest.php
similarity index 96%
rename from tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/GetTemplatesCest.php
index 1bf67742d64..bcb415c259b 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/GetTemplatesCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/GetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/HasOptionCest.php
index 4088a7bc647..3a5b0699b99 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/MessageFactoryCest.php
similarity index 95%
rename from tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/MessageFactoryCest.php
index 281d153e8d7..ae6c34b9ae9 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/MessageFactoryCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/MessageFactoryCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class MessageFactoryCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/SetOptionCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/SetOptionCest.php
index 4af6a8ed3c1..d91d5a14e5f 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class SetOptionCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/SetTemplateCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/SetTemplateCest.php
index 00758481976..c8937b6c1c6 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/SetTemplateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/SetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/SetTemplatesCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/SetTemplatesCest.php
index f238b3312fc..40c0e24bd21 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/SetTemplatesCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/SetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
diff --git a/tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/ValidateCest.php
similarity index 97%
rename from tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Max/ValidateCest.php
index e2be625b45c..53b379e0197 100644
--- a/tests/integration/Validation/Validator/StringLength/Max/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Max/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Max;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Max;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php b/tests/integration/Filter/Validation/Validator/StringLength/MessageFactoryCest.php
similarity index 90%
rename from tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/MessageFactoryCest.php
index 4dfb53a2d66..80be4ff2dfe 100644
--- a/tests/integration/Validation/Validator/StringLength/MessageFactoryCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/MessageFactoryCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/ConstructCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/ConstructCest.php
index 760704185f0..3c3572fb982 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class ConstructCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/GetOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/GetOptionCest.php
index 55307982742..7b016e1b804 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/GetOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/GetTemplateCest.php
similarity index 94%
rename from tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/GetTemplateCest.php
index 565ee8af73c..b0f784151e8 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/GetTemplateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/GetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/GetTemplatesCest.php
similarity index 96%
rename from tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/GetTemplatesCest.php
index 90d44458af7..45a0f19208c 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/GetTemplatesCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/GetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/HasOptionCest.php
index c4609b1e273..098d0e8ba21 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/HasOptionCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/MessageFactoryCest.php
similarity index 95%
rename from tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/MessageFactoryCest.php
index e0af31ae930..7ea7c217403 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/MessageFactoryCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/MessageFactoryCest.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 class MessageFactoryCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/SetOptionCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/SetOptionCest.php
index d4eb3b62323..9fb7e7df665 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 class SetOptionCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/SetTemplateCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/SetTemplateCest.php
index 4a542e75539..86c8aec430a 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/SetTemplateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/SetTemplateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/SetTemplatesCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/SetTemplatesCest.php
index e03d4143a90..80d139c5c1d 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/SetTemplatesCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/SetTemplatesCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
diff --git a/tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/ValidateCest.php
similarity index 96%
rename from tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/Min/ValidateCest.php
index 6b267b6cefb..54af3b6b2b9 100644
--- a/tests/integration/Validation/Validator/StringLength/Min/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/Min/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength\Min;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength\Min;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation;
diff --git a/tests/integration/Validation/Validator/StringLength/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/StringLength/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/StringLength/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/SetOptionCest.php
index ead4f98f3da..4bc6ecb7157 100644
--- a/tests/integration/Validation/Validator/StringLength/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\StringLength;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/StringLength/SetTemplateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/SetTemplateCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/SetTemplateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/SetTemplateCest.php
index 4ca96faa1e2..2bcab559422 100644
--- a/tests/integration/Validation/Validator/StringLength/SetTemplateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/SetTemplateCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
-use Phalcon\Filter\Validation\Validator\StringLength;
 use IntegrationTester;
+use Phalcon\Filter\Validation\Validator\StringLength;
 
 class SetTemplateCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php b/tests/integration/Filter/Validation/Validator/StringLength/SetTemplatesCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/SetTemplatesCest.php
index 195ca87b5c4..b89b1d3799d 100644
--- a/tests/integration/Validation/Validator/StringLength/SetTemplatesCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/SetTemplatesCest.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
-use Phalcon\Filter\Validation\Validator\StringLength;
 use IntegrationTester;
+use Phalcon\Filter\Validation\Validator\StringLength;
 
 class SetTemplatesCest
 {
diff --git a/tests/integration/Validation/Validator/StringLength/ValidateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/ValidateCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/StringLength/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/StringLength/ValidateCest.php
index fe78356478e..0f4e9ff6f94 100644
--- a/tests/integration/Validation/Validator/StringLength/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/StringLength/ValidateCest.php
@@ -11,15 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\StringLength;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\StringLength;
 
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\StringLength;
 use Phalcon\Filter\Validation\Validator\StringLength\Max;
 use Phalcon\Filter\Validation\Validator\StringLength\Min;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 /**
  * Class ValidateCest
diff --git a/tests/integration/Validation/Validator/Uniqueness/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Uniqueness/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Uniqueness/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Uniqueness/ConstructCest.php
index 0727edb91d4..28f1c0ed03e 100644
--- a/tests/integration/Validation/Validator/Uniqueness/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Uniqueness/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Uniqueness;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Uniqueness/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Uniqueness/GetOptionCest.php
index 03692d42e05..fbecfdf8a6c 100644
--- a/tests/integration/Validation/Validator/Uniqueness/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Uniqueness/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Uniqueness;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Uniqueness/HasOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Uniqueness/HasOptionCest.php
index 757c853934a..965b60f2052 100644
--- a/tests/integration/Validation/Validator/Uniqueness/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Uniqueness/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Uniqueness;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Uniqueness/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Uniqueness/SetOptionCest.php
index 65288be5c13..571c22c694f 100644
--- a/tests/integration/Validation/Validator/Uniqueness/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Uniqueness/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Uniqueness;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Uniqueness;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Uniqueness;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Url/ConstructCest.php b/tests/integration/Filter/Validation/Validator/Url/ConstructCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Url/ConstructCest.php
rename to tests/integration/Filter/Validation/Validator/Url/ConstructCest.php
index 455cb135772..41da1a8fe7a 100644
--- a/tests/integration/Validation/Validator/Url/ConstructCest.php
+++ b/tests/integration/Filter/Validation/Validator/Url/ConstructCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Url;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class ConstructCest
diff --git a/tests/integration/Validation/Validator/Url/GetOptionCest.php b/tests/integration/Filter/Validation/Validator/Url/GetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Url/GetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Url/GetOptionCest.php
index 2f9a48cdd43..10debff5eeb 100644
--- a/tests/integration/Validation/Validator/Url/GetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Url/GetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Url;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class GetOptionCest
diff --git a/tests/integration/Validation/Validator/Url/HasOptionCest.php b/tests/integration/Filter/Validation/Validator/Url/HasOptionCest.php
similarity index 93%
rename from tests/integration/Validation/Validator/Url/HasOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Url/HasOptionCest.php
index 34c895335ff..29f290c4118 100644
--- a/tests/integration/Validation/Validator/Url/HasOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Url/HasOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Url;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class HasOptionCest
diff --git a/tests/integration/Validation/Validator/Url/SetOptionCest.php b/tests/integration/Filter/Validation/Validator/Url/SetOptionCest.php
similarity index 92%
rename from tests/integration/Validation/Validator/Url/SetOptionCest.php
rename to tests/integration/Filter/Validation/Validator/Url/SetOptionCest.php
index bedfa7d9edc..6a4f781e1da 100644
--- a/tests/integration/Validation/Validator/Url/SetOptionCest.php
+++ b/tests/integration/Filter/Validation/Validator/Url/SetOptionCest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Url;
 
 use IntegrationTester;
-use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 use Phalcon\Filter\Validation\Validator\Url;
+use Phalcon\Tests\Fixtures\Traits\ValidationTrait;
 
 /**
  * Class SetOptionCest
diff --git a/tests/integration/Validation/Validator/Url/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Url/ValidateCest.php
similarity index 99%
rename from tests/integration/Validation/Validator/Url/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/Url/ValidateCest.php
index f630508875f..1c880a7d9c4 100644
--- a/tests/integration/Validation/Validator/Url/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/Url/ValidateCest.php
@@ -11,14 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator\Url;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator\Url;
 
 use Codeception\Example;
 use IntegrationTester;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\Messages;
 use Phalcon\Filter\Validation;
 use Phalcon\Filter\Validation\Validator\Url;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\Messages;
 
 use const FILTER_FLAG_PATH_REQUIRED;
 use const FILTER_FLAG_QUERY_REQUIRED;
diff --git a/tests/integration/Validation/Validator/ValidateCest.php b/tests/integration/Filter/Validation/Validator/ValidateCest.php
similarity index 91%
rename from tests/integration/Validation/Validator/ValidateCest.php
rename to tests/integration/Filter/Validation/Validator/ValidateCest.php
index d0102f29e0c..bea137ad5c4 100644
--- a/tests/integration/Validation/Validator/ValidateCest.php
+++ b/tests/integration/Filter/Validation/Validator/ValidateCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\Validator;
+namespace Phalcon\Tests\Integration\Filter\Validation\Validator;
 
 use IntegrationTester;
 
diff --git a/tests/integration/Validation/ValidatorFactory/NewInstanceCest.php b/tests/integration/Filter/Validation/ValidatorFactory/NewInstanceCest.php
similarity index 93%
rename from tests/integration/Validation/ValidatorFactory/NewInstanceCest.php
rename to tests/integration/Filter/Validation/ValidatorFactory/NewInstanceCest.php
index d9755f85dae..44715b3aa51 100644
--- a/tests/integration/Validation/ValidatorFactory/NewInstanceCest.php
+++ b/tests/integration/Filter/Validation/ValidatorFactory/NewInstanceCest.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Tests\Integration\Validation\ValidatorFactory;
+namespace Phalcon\Tests\Integration\Filter\Validation\ValidatorFactory;
 
 use IntegrationTester;
 use Phalcon\Filter\Validation\Validator\Alnum;
diff --git a/tests/integration/Validation/GetEventsManagerCest.php b/tests/integration/Validation/GetEventsManagerCest.php
deleted file mode 100644
index aa29775c7da..00000000000
--- a/tests/integration/Validation/GetEventsManagerCest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Tests\Integration\Validation;
-
-use IntegrationTester;
-
-/**
- * Class GetEventsManagerCest
- */
-class GetEventsManagerCest
-{
-    /**
-     * Tests Phalcon\Filter\Validation :: getEventsManager()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2019-04-16
-     */
-    public function filterValidationGetEventsManager(IntegrationTester $I)
-    {
-        $I->wantToTest('Validation - getEventsManager()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Validation/GetSetDICest.php b/tests/integration/Validation/GetSetDICest.php
deleted file mode 100644
index 950a03275e1..00000000000
--- a/tests/integration/Validation/GetSetDICest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Tests\Integration\Validation;
-
-use IntegrationTester;
-
-class GetSetDICest
-{
-    /**
-     * Tests Phalcon\Filter\Validation :: getDI() / setDI()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2019-04-16
-     */
-    public function filterValidationGetSetDI(IntegrationTester $I)
-    {
-        $I->wantToTest('Validation - getDI() / setDI()');
-
-        $I->skipTest('Need implementation');
-    }
-}
diff --git a/tests/integration/Validation/SetEventsManagerCest.php b/tests/integration/Validation/SetEventsManagerCest.php
deleted file mode 100644
index 3b3057e98a0..00000000000
--- a/tests/integration/Validation/SetEventsManagerCest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Tests\Integration\Validation;
-
-use IntegrationTester;
-
-/**
- * Class SetEventsManagerCest
- */
-class SetEventsManagerCest
-{
-    /**
-     * Tests Phalcon\Filter\Validation :: setEventsManager()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2019-04-16
-     */
-    public function filterValidationSetEventsManager(IntegrationTester $I)
-    {
-        $I->wantToTest('Validation - setEventsManager()');
-
-        $I->skipTest('Need implementation');
-    }
-}

From 16212a9d20cec30316c5ed2be168ddc5d9b4c45e Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 24 Aug 2022 10:03:09 -0400
Subject: [PATCH 17/76] [#16070] - correcting preg_match pattern

---
 phalcon/Filter/Validation/Validator/Numericality.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Filter/Validation/Validator/Numericality.zep b/phalcon/Filter/Validation/Validator/Numericality.zep
index 03e57063eb1..8b269e1378c 100644
--- a/phalcon/Filter/Validation/Validator/Numericality.zep
+++ b/phalcon/Filter/Validation/Validator/Numericality.zep
@@ -78,7 +78,7 @@ class Numericality extends AbstractValidator
         let value   = validation->getValue(field),
             value   = (string) value,
             value   = str_replace(" ", "", value),
-            pattern = "/((^[-]?[0-9,]+(.[0-9]+)?$)|(^[-]?[0-9.]+(,[0-9]+)?$))/";
+            pattern = "/((^[-]?[0-9,]+(\\.[0-9]+)?$)|(^[-]?[0-9.]+(,[0-9]+)?$))/";
 
         if this->allowEmpty(field, value) {
             return true;

From cccffb01e986d0d06de462eee8cb418270055287 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 24 Aug 2022 10:04:43 -0400
Subject: [PATCH 18/76] [#16070] - updating changelog

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 05dac5cf5f9..bfb964452ea 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -4,6 +4,7 @@
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
 - Fixed `Phalcon\Filter\Validation\Validator\Digit` to use only strings for `ctype_*` calls [#16064](https://github.com/phalcon/cphalcon/issues/16064)
 - Fixed `Phalcon\Flash\AbstractFlash::outputMessage` to return the message (implicitFlush) [#16063](https://github.com/phalcon/cphalcon/issues/16063)
+- Fixed `Phalcon\Filter\Validation\Validator\Numericality` to correctly detect illegal characters within string numbers [#16070](https://github.com/phalcon/cphalcon/issues/16070)
 
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 

From 60054b1dea0ef6d1feb32d50dee6b3e1f7be7843 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 24 Aug 2022 18:09:10 -0400
Subject: [PATCH 19/76] [#16072] - refactored process() to open, check for
 locks, write, close stream

---
 phalcon/Logger/Adapter/Stream.zep | 53 +++++++++++--------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/phalcon/Logger/Adapter/Stream.zep b/phalcon/Logger/Adapter/Stream.zep
index 5756194518a..d01d77c1675 100644
--- a/phalcon/Logger/Adapter/Stream.zep
+++ b/phalcon/Logger/Adapter/Stream.zep
@@ -29,20 +29,12 @@ use Phalcon\Logger\Item;
  * $logger->close();
  *```
  *
- * @property resource|null $handler
  * @property string        $mode
  * @property string        $name
  * @property array         $options
  */
 class Stream extends AbstractAdapter
 {
-    /**
-     * Stream handler resource
-     *
-     * @var resource|null
-     */
-    protected handler = null;
-
     /**
      * The file open mode. Defaults to 'ab'
      *
@@ -93,15 +85,7 @@ class Stream extends AbstractAdapter
      */
     public function close() -> bool
     {
-        bool result = true;
-
-        if is_resource(this->handler) {
-            let result = fclose(this->handler);
-        }
-
-        let this->handler = null;
-
-        return result;
+        return true;
     }
 
     /**
@@ -111,27 +95,26 @@ class Stream extends AbstractAdapter
      */
     public function process(<Item> item) -> void
     {
-        var message;
-
-        if !is_resource(this->handler) {
-            let this->handler = this->phpFopen(this->name, this->mode);
-
-            if !is_resource(this->handler) {
-                let this->handler = null;
-
-                throw new LogicException(
-                    "The file '" .
-                    this->name .
-                    "' cannot be opened with mode '" .
-                    this->mode .
-                    "'"
-                );
-            }
+        var handler, message;
+
+        let handler = this->phpFopen(this->name, this->mode);
+
+        if !is_resource(handler) {
+            throw new LogicException(
+                "The file '" .
+                this->name .
+                "' cannot be opened with mode '" .
+                this->mode .
+                "'"
+            );
         }
 
-        let message = this->getFormattedItem(item) . PHP_EOL;
+        if (flock(handler, LOCK_SH)) {
+            let message = this->getFormattedItem(item) . PHP_EOL;
+            fwrite(handler, message);
+        }
 
-        fwrite(this->handler, message);
+        fclose(handler);
     }
 
     /**

From 5c032b9ab8cd301a7bace656a8cd9648d90da0c0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 24 Aug 2022 18:09:20 -0400
Subject: [PATCH 20/76] [#16072] - updating changelog

---
 CHANGELOG-5.0.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 05dac5cf5f9..8952ce2cb61 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -1,5 +1,8 @@
 # [x.x.x](https://github.com/phalcon/cphalcon/releases/tag/vx.x.x) (xxxx-xx-xx)
 
+## Changed
+- Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072) 
+
 ## Fixed
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
 - Fixed `Phalcon\Filter\Validation\Validator\Digit` to use only strings for `ctype_*` calls [#16064](https://github.com/phalcon/cphalcon/issues/16064)

From 68f2acb7ca2f141e66afe5129bc52fbe51350180 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 25 Aug 2022 08:02:31 -0400
Subject: [PATCH 21/76] [#16072] - forcing EX lock

---
 phalcon/Logger/Adapter/Stream.zep | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/phalcon/Logger/Adapter/Stream.zep b/phalcon/Logger/Adapter/Stream.zep
index d01d77c1675..4efadfe8a39 100644
--- a/phalcon/Logger/Adapter/Stream.zep
+++ b/phalcon/Logger/Adapter/Stream.zep
@@ -109,10 +109,12 @@ class Stream extends AbstractAdapter
             );
         }
 
-        if (flock(handler, LOCK_SH)) {
-            let message = this->getFormattedItem(item) . PHP_EOL;
-            fwrite(handler, message);
-        }
+        /**
+         * Not much we can do about locking
+         */
+        flock(handler, LOCK_EX);
+        let message = this->getFormattedItem(item) . PHP_EOL;
+        fwrite(handler, message);
 
         fclose(handler);
     }

From 2df77a85aff2e891b66816829f0818991fb0d331 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 30 Aug 2022 09:49:09 -0400
Subject: [PATCH 22/76] [#.0.x] - correcting docblock

---
 phalcon/Di/Injectable.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Di/Injectable.zep b/phalcon/Di/Injectable.zep
index 1a494ee34a2..241cd331e87 100644
--- a/phalcon/Di/Injectable.zep
+++ b/phalcon/Di/Injectable.zep
@@ -31,7 +31,7 @@ use Phalcon\Session\BagInterface;
  * @property \Phalcon\Db\Adapter\AdapterInterface $db
  * @property \Phalcon\Encryption\Security $security
  * @property \Phalcon\Encryption\Crypt|\Phalcon\Encryption\Crypt\CryptInterface $crypt
- * @property \Phalcon\Tag $tag
+ * @property \Phalcon\Html\TagFactory $tag
  * @property \Phalcon\Html\Escaper|\Phalcon\Html\Escaper\EscaperInterface $escaper
  * @property \Phalcon\Annotations\Adapter\Memory|\Phalcon\Annotations\Adapter $annotations
  * @property \Phalcon\Mvc\Model\Manager|\Phalcon\Mvc\Model\ManagerInterface $modelsManager

From 0582045d6ebf1b415c36bdb4bd77f05e366d51bf Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 30 Aug 2022 09:49:23 -0400
Subject: [PATCH 23/76] [#.0.x] - reorganizing if statements

---
 phalcon/Mvc/View/Engine/Volt/Compiler.zep | 325 ++++++----------------
 1 file changed, 81 insertions(+), 244 deletions(-)

diff --git a/phalcon/Mvc/View/Engine/Volt/Compiler.zep b/phalcon/Mvc/View/Engine/Volt/Compiler.zep
index d96b38cadb7..378bc8c1475 100644
--- a/phalcon/Mvc/View/Engine/Volt/Compiler.zep
+++ b/phalcon/Mvc/View/Engine/Volt/Compiler.zep
@@ -2122,46 +2122,19 @@ class Compiler implements InjectionAwareInterface
         if type == PHVOLT_T_IDENTIFIER {
             let name = test["value"];
 
-            /**
-             * Empty uses the PHP's empty operator
-             */
-            if name == "empty" {
-                return "empty(" . left . ")";
-            }
-
-            /**
-             * Check if a value is even
-             */
-            if name == "even" {
-                return "(((" . left . ") % 2) == 0)";
-            }
-
-            /**
-             * Check if a value is odd
-             */
-            if name == "odd" {
-                return "(((" . left . ") % 2) != 0)";
-            }
-
-            /**
-             * Check if a value is numeric
-             */
-            if name == "numeric" {
-                return "is_numeric(" . left . ")";
-            }
-
-            /**
-             * Check if a value is scalar
-             */
-            if name == "scalar" {
-                return "is_scalar(" . left . ")";
-            }
-
-            /**
-             * Check if a value is iterable
-             */
-            if name == "iterable" {
-                return "(is_array(" . left . ") || (" . left . ") instanceof Traversable)";
+            switch (name) {
+                case "empty":
+                    return "empty(" . left . ")";
+                case "even":
+                    return "(((" . left . ") % 2) == 0)";
+                case "odd":
+                    return "(((" . left . ") % 2) != 0)";
+                case "numeric":
+                    return "is_numeric(" . left . ")";
+                case "scalar":
+                    return "is_scalar(" . left . ")";
+                case "iterable":
+                    return "(is_array(" . left . ") || (" . left . ") instanceof Traversable)";
             }
 
         }
@@ -2173,22 +2146,13 @@ class Compiler implements InjectionAwareInterface
             let testName = test["name"];
 
             if fetch name, testName["value"] {
-                if name == "divisibleby" {
-                    return "(((" . left . ") % (" . this->expression(test["arguments"]) . ")) == 0)";
-                }
-
-                /**
-                 * Checks if a value is equals to other
-                 */
-                if name == "sameas" {
-                    return "(" . left . ") === (" . this->expression(test["arguments"]) . ")";
-                }
-
-                /**
-                 * Checks if a variable match a type
-                 */
-                if name == "type" {
-                    return "gettype(" . left . ") === (" . this->expression(test["arguments"]) . ")";
+                switch (name) {
+                    case "divisibleby":
+                        return "(((" . left . ") % (" . this->expression(test["arguments"]) . ")) == 0)";
+                    case "sameas":
+                        return "(" . left . ") === (" . this->expression(test["arguments"]) . ")";
+                    case "type":
+                        return "gettype(" . left . ") === (" . this->expression(test["arguments"]) . ")";
                 }
             }
         }
@@ -2505,197 +2469,70 @@ class Compiler implements InjectionAwareInterface
             );
         }
 
-        /**
-         * "length" uses the length method implemented in the Volt adapter
-         */
-        if name == "length" {
-            return "$this->length(" . arguments . ")";
-        }
-
-        /**
-         * "e"/"escape" filter uses the escaper component
-         */
-        if name == "e" || name == "escape" {
-            return "$this->escaper->html(" . arguments . ")";
-        }
-
-        /**
-         * "escape_css" filter uses the escaper component to filter CSS
-         */
-        if name == "escape_css" {
-            return "$this->escaper->css(" . arguments . ")";
-        }
-
-        /**
-         * "escape_js" filter uses the escaper component to escape JavaScript
-         */
-        if name == "escape_js" {
-            return "$this->escaper->js(" . arguments . ")";
-        }
-
-        /**
-         * "escape_attr" filter uses the escaper component to escape HTML
-         * attributes
-         */
-        if name == "escape_attr" {
-            return "$this->escaper->attributes(" . arguments . ")";
-        }
-
-        /**
-         * "trim" calls the "trim" function in the PHP userland
-         */
-        if name == "trim" {
-            return "trim(" . arguments . ")";
-        }
-
-        /**
-         * "left_trim" calls the "ltrim" function in the PHP userland
-         */
-        if name == "left_trim" {
-            return "ltrim(" . arguments . ")";
-        }
-
-        /**
-         * "right_trim" calls the "rtrim" function in the PHP userland
-         */
-        if name == "right_trim" {
-            return "rtrim(" . arguments . ")";
-        }
-
-        /**
-         * "striptags" calls the "strip_tags" function in the PHP userland
-         */
-        if name == "striptags" {
-            return "strip_tags(" . arguments . ")";
-        }
-
-        /**
-         * "url_encode" calls the "urlencode" function in the PHP userland
-         */
-        if name == "url_encode" {
-            return "urlencode(" . arguments . ")";
-        }
-
-        /**
-         * "slashes" calls the "addslashes" function in the PHP userland
-         */
-        if name == "slashes" {
-            return "addslashes(" . arguments . ")";
-        }
-
-        /**
-         * "stripslashes" calls the "stripslashes" function in the PHP userland
-         */
-        if name == "stripslashes" {
-            return "stripslashes(" . arguments . ")";
-        }
-
-        /**
-         * "nl2br" calls the "nl2br" function in the PHP userland
-         */
-        if name == "nl2br" {
-            return "nl2br(" . arguments . ")";
-        }
-
-        /**
-         * "keys" uses calls the "array_keys" function in the PHP userland
-         */
-        if name == "keys" {
-            return "array_keys(" . arguments . ")";
-        }
-
-        /**
-         * "join" uses calls the "join" function in the PHP userland
-         */
-        if name == "join" {
-            return "join('" . funcArguments[1]["expr"]["value"] . "', " . funcArguments[0]["expr"]["value"] . ")";
+        switch (name) {
+            case "abs":
+                return "abs(" . arguments . ")";
+            case "capitalize":
+                return "ucwords(" . arguments . ")";
+            case "convert_encoding":
+                return "$this->convertEncoding(" . arguments . ")";
+            case "default":
+                return "(empty(" . left . ") ? ("
+                    . arguments . ") : ("
+                    . left . "))";
+            case "e":
+            case "escape":
+                return "$this->escaper->html(" . arguments . ")";
+            case "escape_attr":
+                return "$this->escaper->attributes(" . arguments . ")";
+            case "escape_css":
+                return "$this->escaper->css(" . arguments . ")";
+            case "escape_js":
+                return "$this->escaper->js(" . arguments . ")";
+            case "format":
+                return "sprintf(" . arguments . ")";
+            case "join":
+                return "join('" . funcArguments[1]["expr"]["value"]
+                    . "', " . funcArguments[0]["expr"]["value"] . ")";
+            case "json_encode":
+                return "json_encode(" . arguments . ")";
+            case "json_decode":
+                return "json_decode(" . arguments . ")";
+            case "keys":
+                return "array_keys(" . arguments . ")";
+            case "left_trim":
+                return "ltrim(" . arguments . ")";
+            case "length":
+                return "$this->length(" . arguments . ")";
+            case "lower":
+            case "lowercase":
+                return "strtolower(" . arguments . ")";
+            case "right_trim":
+                return "rtrim(" . arguments . ")";
+            case "nl2br":
+                return "nl2br(" . arguments . ")";
+            case "slashes":
+                return "addslashes(" . arguments . ")";
+            case "slice":
+                return "$this->slice(" . arguments . ")";
+            case "sort":
+                return "$this->sort(" . arguments . ")";
+            case "stripslashes":
+                return "stripslashes(" . arguments . ")";
+            case "striptags":
+                return "strip_tags(" . arguments . ")";
+            case "trim":
+                return "trim(" . arguments . ")";
+            case "upper":
+            case "uppercase":
+                return "strtoupper(" . arguments . ")";
+            case "url_encode":
+                return "urlencode(" . arguments . ")";
         }
 
-        /**
-         * "lower"/"lowercase" calls the "strtolower" function or
-         * "mb_strtolower" if the mbstring extension is loaded
-         */
-        if name == "lower" || name == "lowercase" {
-            return "strtolower(" . arguments . ")";
-        }
-
-        /**
-         * "upper"/"uppercase" calls the "strtoupper" function or
-         * "mb_strtoupper" if the mbstring extension is loaded
-         */
-        if name == "upper" || name == "uppercase" {
-            return "strtoupper(" . arguments . ")";
-        }
-
-        /**
-         * "capitalize" filter calls "ucwords"
-         */
-        if name == "capitalize" {
-            return "ucwords(" . arguments . ")";
-        }
-
-        /**
-         * "sort" calls "sort" method in the engine adapter
-         */
-        if name == "sort" {
-            return "$this->sort(" . arguments . ")";
-        }
-
-        /**
-         * "json_encode" calls the "json_encode" function in the PHP userland
-         */
-        if name == "json_encode" {
-            return "json_encode(" . arguments . ")";
-        }
-
-        /**
-         * "json_decode" calls the "json_decode" function in the PHP userland
-         */
-        if name == "json_decode" {
-            return "json_decode(" . arguments . ")";
-        }
-
-        /**
-         * "format" calls the "sprintf" function in the PHP userland
-         */
-        if name == "format" {
-            return "sprintf(" . arguments . ")";
-        }
-
-        /**
-         * "abs" calls the "abs" function in the PHP userland
-         */
-        if name == "abs" {
-            return "abs(" . arguments . ")";
-        }
-
-        /**
-         * "slice" slices string/arrays/traversable objects
-         */
-        if name == "slice" {
-            return "$this->slice(" . arguments . ")";
-        }
-
-        /**
-         * "default" checks if a variable is empty
-         */
-        if name == "default" {
-            return "(empty(" . left . ") ? (" . arguments . ") : (" . left . "))";
-        }
-
-        /**
-         * This function uses mbstring or iconv to convert strings from one
-         * charset to another
-         */
-        if name == "convert_encoding" {
-            return "$this->convertEncoding(" . arguments . ")";
-        }
-
-        /**
-         * Unknown filter throw an exception
-         */
         throw new Exception(
-            "Unknown filter \"" . name . "\" in " . filter["file"] . " on line " . filter["line"]
+            "Unknown filter \"" . name . "\" in "
+                . filter["file"] . " on line " . filter["line"]
         );
     }
 

From 904bd2c8dff888f7f8361bf42c248a190148aa93 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 30 Aug 2022 09:49:33 -0400
Subject: [PATCH 24/76] [#.0.x] - updating composer

---
 composer.json |   2 +-
 composer.lock | 908 +++++++++++++++++++++++++++++++-------------------
 2 files changed, 564 insertions(+), 346 deletions(-)

diff --git a/composer.json b/composer.json
index 433add2571c..814a11eeb3e 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
     "mustache/mustache": "^2.14.1",
     "phalcon/ide-stubs": "^4.1",
     "phalcon/zephir": "^0.16.0",
-    "phpunit/phpunit": "^8.5",
+    "phpunit/phpunit": "^9.0",
     "predis/predis": "^1.1",
     "squizlabs/php_codesniffer": "^3.4",
     "twig/twig": "~1.36",
diff --git a/composer.lock b/composer.lock
index 4861df13bef..4ac9d61b6eb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cadb55c7b26af4d96bb0dc98963cd5be",
+    "content-hash": "268738016771a81f1c6a9decc7763eed",
     "packages": [],
     "packages-dev": [
         {
@@ -879,25 +879,26 @@
         },
         {
             "name": "codeception/module-redis",
-            "version": "1.3.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-redis.git",
-                "reference": "cc04c3de32114c68c4e3c552766606e762b23117"
+                "reference": "a0f26804200346761500a37a39aed919ada20b3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-redis/zipball/cc04c3de32114c68c4e3c552766606e762b23117",
-                "reference": "cc04c3de32114c68c4e3c552766606e762b23117",
+                "url": "https://api.github.com/repos/Codeception/module-redis/zipball/a0f26804200346761500a37a39aed919ada20b3f",
+                "reference": "a0f26804200346761500a37a39aed919ada20b3f",
                 "shasum": ""
             },
             "require": {
-                "codeception/codeception": "^4.0",
-                "php": "^7.4 || ^8.0",
-                "predis/predis": "^1.0"
+                "codeception/codeception": "^4.1",
+                "php": "^7.4 | ^8.0",
+                "predis/predis": "^1.1",
+                "sebastian/comparator": "^4.0"
             },
             "require-dev": {
-                "codeception/stub": "^3.7"
+                "codeception/stub": "^4.0"
             },
             "type": "library",
             "autoload": {
@@ -925,33 +926,31 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/module-redis/issues",
-                "source": "https://github.com/Codeception/module-redis/tree/1.3.0"
+                "source": "https://github.com/Codeception/module-redis/tree/1.4.1"
             },
-            "time": "2021-11-30T03:16:07+00:00"
+            "time": "2021-12-21T01:52:19+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "8.1.6",
+            "version": "9.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "7d3479bab7e2b6349044db8af11cd05d57809f9c"
+                "reference": "7439a53ae367986e9c22b2ac00f9d7376bb2f8cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7d3479bab7e2b6349044db8af11cd05d57809f9c",
-                "reference": "7d3479bab7e2b6349044db8af11cd05d57809f9c",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7439a53ae367986e9c22b2ac00f9d7376bb2f8cf",
+                "reference": "7439a53ae367986e9c22b2ac00f9d7376bb2f8cf",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2",
-                "phpunit/php-code-coverage": "^7.0",
-                "phpunit/phpunit": "^8.0",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0"
+                "phpunit/phpunit": "^9.0"
             },
             "require-dev": {
                 "codeception/specify": "*",
+                "consolidation/robo": "^3.0.0-alpha3",
                 "vlucas/phpdotenv": "^3.0"
             },
             "type": "library",
@@ -968,14 +967,17 @@
                 {
                     "name": "Davert",
                     "email": "davert.php@resend.cc"
+                },
+                {
+                    "name": "Naktibalda"
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
             "support": {
                 "issues": "https://github.com/Codeception/phpunit-wrapper/issues",
-                "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.6"
+                "source": "https://github.com/Codeception/phpunit-wrapper/tree/9.0.9"
             },
-            "time": "2022-05-23T06:22:33+00:00"
+            "time": "2022-05-23T06:24:11+00:00"
         },
         {
             "name": "codeception/stub",
@@ -1665,16 +1667,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.9.5",
+            "version": "v3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "4465d70ba776806857a1ac2a6f877e582445ff36"
+                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4465d70ba776806857a1ac2a6f877e582445ff36",
-                "reference": "4465d70ba776806857a1ac2a6f877e582445ff36",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
+                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
                 "shasum": ""
             },
             "require": {
@@ -1684,7 +1686,7 @@
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": "^7.4 || ^8.0",
-                "php-cs-fixer/diff": "^2.0",
+                "sebastian/diff": "^4.0",
                 "symfony/console": "^5.4 || ^6.0",
                 "symfony/event-dispatcher": "^5.4 || ^6.0",
                 "symfony/filesystem": "^5.4 || ^6.0",
@@ -1742,7 +1744,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.5"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.10.0"
             },
             "funding": [
                 {
@@ -1750,7 +1752,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-07-22T08:43:51+00:00"
+            "time": "2022-08-17T22:13:10+00:00"
         },
         {
             "name": "graham-campbell/result-type",
@@ -1816,16 +1818,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.4.5",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
-                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
                 "shasum": ""
             },
             "require": {
@@ -1840,10 +1842,10 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1853,8 +1855,12 @@
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "7.4-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -1920,7 +1926,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
+                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
             },
             "funding": [
                 {
@@ -1936,20 +1942,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T22:16:13+00:00"
+            "time": "2022-08-28T15:39:27+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.1",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -2004,7 +2010,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": [
                 {
@@ -2020,20 +2026,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-22T20:56:57+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "13388f00956b1503577598873fffb5ae994b5737"
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
-                "reference": "13388f00956b1503577598873fffb5ae994b5737",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
                 "shasum": ""
             },
             "require": {
@@ -2047,15 +2053,19 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
                     "dev-master": "2.4-dev"
                 }
@@ -2119,7 +2129,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
             },
             "funding": [
                 {
@@ -2135,7 +2145,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T21:43:11+00:00"
+            "time": "2022-08-28T14:45:39+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -2774,59 +2784,6 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "sebastian/diff v3 backport support for PHP 5.6+",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
-                "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
-            },
-            "abandoned": true,
-            "time": "2020-10-14T08:32:19+00:00"
-        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.2.0",
@@ -3064,40 +3021,44 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.15",
+            "version": "9.2.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48"
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48",
-                "reference": "819f92bba8b001d4363065928088de22f25a3a48",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "php": ">=7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.1.3 || ^4.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.2.2",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1.3"
+                "nikic/php-parser": "^4.14",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2.2"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-xdebug": "^2.7.2"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.0-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -3125,7 +3086,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
             },
             "funding": [
                 {
@@ -3133,32 +3094,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-26T12:20:09+00:00"
+            "time": "2022-08-20T05:26:47+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
-                "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -3185,7 +3146,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -3193,26 +3154,38 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:42:26+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -3229,41 +3202,47 @@
                     "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
             "keywords": [
-                "template"
+                "process"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
             },
-            "time": "2015-06-21T13:50:34+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.3",
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
-                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -3282,14 +3261,14 @@
                     "role": "lead"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "timer"
+                "template"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
             },
             "funding": [
                 {
@@ -3297,33 +3276,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:20:02+00:00"
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "4.0.4",
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -3338,17 +3316,18 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "tokenizer"
+                "timer"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
             },
             "funding": [
                 {
@@ -3356,21 +3335,20 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
-            "time": "2020-08-04T08:28:15+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.29",
+            "version": "9.5.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e8c563c47a9a303662955518ca532b022b337f4d"
+                "reference": "888556852e7e9bbeeedb9656afe46118765ade34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e8c563c47a9a303662955518ca532b022b337f4d",
-                "reference": "e8c563c47a9a303662955518ca532b022b337f4d",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34",
+                "reference": "888556852e7e9bbeeedb9656afe46118765ade34",
                 "shasum": ""
             },
             "require": {
@@ -3381,28 +3359,30 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.0",
+                "myclabs/deep-copy": "^1.10.1",
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
-                "php": ">=7.2",
-                "phpunit/php-code-coverage": "^7.0.12",
-                "phpunit/php-file-iterator": "^2.0.4",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1.2",
-                "sebastian/comparator": "^3.0.2",
-                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.3",
-                "sebastian/exporter": "^3.1.2",
-                "sebastian/global-state": "^3.0.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.3",
-                "sebastian/version": "^2.0.1"
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.0",
+                "sebastian/version": "^3.0.2"
             },
             "suggest": {
                 "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0.0"
+                "ext-xdebug": "*"
             },
             "bin": [
                 "phpunit"
@@ -3410,10 +3390,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.5-dev"
+                    "dev-master": "9.5-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -3438,7 +3421,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.29"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23"
             },
             "funding": [
                 {
@@ -3450,7 +3433,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-22T13:59:39+00:00"
+            "time": "2022-08-22T14:01:36+00:00"
         },
         {
             "name": "predis/predis",
@@ -3919,30 +3902,142 @@
             },
             "time": "2019-03-08T08:55:37+00:00"
         },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
-                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -3964,7 +4059,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
             },
             "funding": [
                 {
@@ -3972,34 +4067,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:15:22+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.3",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4038,7 +4133,64 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:49:45+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
             },
             "funding": [
                 {
@@ -4046,33 +4198,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T08:04:30+00:00"
+            "time": "2020-10-26T15:52:27+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
-                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4104,7 +4256,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
             },
             "funding": [
                 {
@@ -4112,27 +4264,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:59:04+00:00"
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.4",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
-                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -4140,7 +4292,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4167,7 +4319,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -4175,34 +4327,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:53:42+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.4",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
-                "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^8.5"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4237,14 +4389,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -4252,30 +4404,30 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T13:51:24+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.2",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/de036ec91d55d2a9e0db2ba975b512cdb1c23921",
-                "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -4283,7 +4435,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -4308,7 +4460,64 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-14T08:28:10+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
             },
             "funding": [
                 {
@@ -4316,34 +4525,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-10T06:55:38+00:00"
+            "time": "2020-11-28T06:42:11+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.4",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
-                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4365,7 +4574,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
             },
             "funding": [
                 {
@@ -4373,32 +4582,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:40:27+00:00"
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
-                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -4420,7 +4629,7 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -4428,32 +4637,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:37:18+00:00"
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.1",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
-                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4483,7 +4692,7 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
             },
             "funding": [
                 {
@@ -4491,29 +4700,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:34:24+00:00"
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
-                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4535,7 +4747,7 @@
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
             },
             "funding": [
                 {
@@ -4543,32 +4755,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:30:19+00:00"
+            "time": "2020-09-28T06:45:17+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "1.1.4",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4"
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4",
-                "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e",
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.2"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -4591,7 +4803,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.1.0"
             },
             "funding": [
                 {
@@ -4599,29 +4811,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-30T07:25:11+00:00"
+            "time": "2022-08-29T06:55:37+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4644,9 +4856,15 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
             },
-            "time": "2016-10-03T07:35:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -4778,16 +4996,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
-                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
                 "shasum": ""
             },
             "require": {
@@ -4857,7 +5075,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.11"
+                "source": "https://github.com/symfony/console/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -4873,7 +5091,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-22T10:42:43+00:00"
+            "time": "2022-08-17T13:18:05+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5010,16 +5228,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7"
+                "reference": "291c1e92281a09152dda089f782e23dedd34bd4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0b900ca5576ecd59e08c76127e616667cfe427a7",
-                "reference": "0b900ca5576ecd59e08c76127e616667cfe427a7",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291c1e92281a09152dda089f782e23dedd34bd4f",
+                "reference": "291c1e92281a09152dda089f782e23dedd34bd4f",
                 "shasum": ""
             },
             "require": {
@@ -5065,7 +5283,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.11"
+                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -5081,7 +5299,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-27T16:58:25+00:00"
+            "time": "2022-08-03T13:09:21+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5249,16 +5467,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd"
+                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd",
-                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447",
+                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447",
                 "shasum": ""
             },
             "require": {
@@ -5293,7 +5511,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.11"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -5309,7 +5527,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T13:00:38+00:00"
+            "time": "2022-08-02T13:48:16+00:00"
         },
         {
             "name": "symfony/finder",
@@ -6223,16 +6441,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322"
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
-                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
+                "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
                 "shasum": ""
             },
             "require": {
@@ -6289,7 +6507,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.11"
+                "source": "https://github.com/symfony/string/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -6305,20 +6523,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-24T16:15:25+00:00"
+            "time": "2022-08-12T17:03:11+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e"
+                "reference": "7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/05d4ea560f3402c6c116afd99fdc66e60eda227e",
-                "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c",
+                "reference": "7a3aa21ac8ab1a96cc6de5bbcab4bc9fc943b18c",
                 "shasum": ""
             },
             "require": {
@@ -6364,7 +6582,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.11"
+                "source": "https://github.com/symfony/yaml/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -6380,7 +6598,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-27T16:58:25+00:00"
+            "time": "2022-08-02T15:52:22+00:00"
         },
         {
             "name": "theseer/tokenizer",

From fba0849ad6eea8340da8f1ab3cc96b2d860d0c7f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 30 Aug 2022 13:51:59 -0400
Subject: [PATCH 25/76] [#.0.x] - correcting tests

---
 tests/database/Mvc/Model/Criteria/JoinCest.php       | 2 +-
 tests/tocheck-database/Db/DbCest.php                 | 2 +-
 tests/tocheck-database/Mvc/Model/AddBehaviorCest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/database/Mvc/Model/Criteria/JoinCest.php b/tests/database/Mvc/Model/Criteria/JoinCest.php
index 651bcb7f4b8..617bb7ce686 100644
--- a/tests/database/Mvc/Model/Criteria/JoinCest.php
+++ b/tests/database/Mvc/Model/Criteria/JoinCest.php
@@ -104,7 +104,7 @@ public function mvcModelCriteriaJoinManyToManyMultipleSchema(DatabaseTester $I)
         $query    = $builder->getQuery();
         $request  = $query->getSql();
 
-        $I->assertContains($expected, $request['sql']);
+        $I->assertStringContainsString($expected, $request['sql']);
 
         $I->assertInstanceOf(Simple::class, $query->execute());
     }
diff --git a/tests/tocheck-database/Db/DbCest.php b/tests/tocheck-database/Db/DbCest.php
index c18d25bee6e..5d3a44ec7ca 100644
--- a/tests/tocheck-database/Db/DbCest.php
+++ b/tests/tocheck-database/Db/DbCest.php
@@ -394,7 +394,7 @@ public function db(IntegrationTester $I, Example $example)
         // Gets the list of all views.
         $views = $connection->listViews();
         $I->assertTrue(is_array($views));
-        $I->assertContains('phalcon_test_view', $views);
+        $I->assertStringContainsString('phalcon_test_view', $views);
 
         // Execute created view
         $row = $connection->fetchOne('SELECT * FROM phalcon_test_view');
diff --git a/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php b/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php
index 99fdc2f18c9..a6291a83edb 100644
--- a/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php
+++ b/tests/tocheck-database/Mvc/Model/AddBehaviorCest.php
@@ -33,7 +33,7 @@ public function mvcModelAddBehavior(IntegrationTester $I)
 
     public function testIssue10371(IntegrationTester $I)
     {
-        $I->assertContains(
+        $I->assertStringContainsString(
             'addBehavior',
             get_class_methods(
                 Model::class

From 039ed82344edf86a1553544f1bec92bd1d0992e8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 6 Sep 2022 00:37:30 +0100
Subject: [PATCH 26/76] #16080 - Add separate getter for `transaction` property

---
 phalcon/Mvc/Model.zep | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index a5f4a9a29a8..0bc4ef5284d 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -144,7 +144,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
     /**
      * @var TransactionInterface|null
      */
-    protected transaction = null { get };
+    protected transaction = null;
 
     /**
      * @var string|null
@@ -3060,6 +3060,11 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         return this;
     }
 
+    public function getTransaction() -> <TransactionInterface> | null
+    {
+        return this->transaction;
+    }
+
     /**
      * Enables/disables options in the ORM
      */

From 2760d7a79a971bc7adadb523035b9155c38d3dc1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 6 Sep 2022 00:37:57 +0100
Subject: [PATCH 27/76] #16080 - Add `void` return type

---
 phalcon/Mvc/Model.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index 0bc4ef5284d..52078ed9098 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -5720,7 +5720,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
      * }
      *```
      */
-    protected function skipAttributes(array! attributes)
+    protected function skipAttributes(array! attributes) -> void
     {
         this->skipAttributesOnCreate(attributes);
         this->skipAttributesOnUpdate(attributes);

From c833a0545939a42136ac0cb28d9ea10d7f7071c8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 6 Sep 2022 00:40:54 +0100
Subject: [PATCH 28/76] #16080 - Update CHANGELOG-5.0.md

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 62a7af76c22..4eb9e014e20 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -8,6 +8,7 @@
 - Fixed `Phalcon\Filter\Validation\Validator\Digit` to use only strings for `ctype_*` calls [#16064](https://github.com/phalcon/cphalcon/issues/16064)
 - Fixed `Phalcon\Flash\AbstractFlash::outputMessage` to return the message (implicitFlush) [#16063](https://github.com/phalcon/cphalcon/issues/16063)
 - Fixed `Phalcon\Filter\Validation\Validator\Numericality` to correctly detect illegal characters within string numbers [#16070](https://github.com/phalcon/cphalcon/issues/16070)
+- Fixed segmentation fault on Reflection of `Phalcon\Mvc\Model` class [#16080](https://github.com/phalcon/cphalcon/issues/16080)
 
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 

From b7076dac405f8b35b3f7220ed4302fd7cd656290 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 6 Sep 2022 00:44:34 +0100
Subject: [PATCH 29/76] #16080 - Revert conditions to `null` check

---
 phalcon/Mvc/Model.zep | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index 52078ed9098..408f6285a93 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -173,11 +173,11 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * We use a default DI if the user doesn't define one
          */
-        if typeof container != "object" {
+        if container === null {
             let container = Di::getDefault();
         }
 
-        if unlikely typeof container != "object" {
+        if container === null {
             throw new Exception(
                 "A dependency injection container is required to access the services related to the ODM"
             );
@@ -188,10 +188,9 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Inject the manager service from the DI
          */
-        if typeof modelsManager != "object" {
+        if modelsManager === null {
             let modelsManager = <ManagerInterface> container->getShared("modelsManager");
-
-            if unlikely typeof modelsManager != "object" {
+            if modelsManager === null {
                 throw new Exception(
                     "The injected service 'modelsManager' is not valid"
                 );

From 89bcf96f9e31f47355625e10111652374568303b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 8 Sep 2022 13:27:33 -0400
Subject: [PATCH 30/76] [#.0.x] - docblock corrections

---
 phalcon/Html/Link/AbstractLink.zep  | 4 ++--
 phalcon/Html/Link/EvolvableLink.zep | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phalcon/Html/Link/AbstractLink.zep b/phalcon/Html/Link/AbstractLink.zep
index 1e7d99aa586..e2f338938ac 100644
--- a/phalcon/Html/Link/AbstractLink.zep
+++ b/phalcon/Html/Link/AbstractLink.zep
@@ -134,8 +134,8 @@ abstract class AbstractLink
         );
     }
     /**
-     * @param string $key
-     * @param mixed  $value
+     * @param string       $key
+     * @param string|array $value
      *
      * @return mixed
      */
diff --git a/phalcon/Html/Link/EvolvableLink.zep b/phalcon/Html/Link/EvolvableLink.zep
index 57788705b72..476b6a24b7b 100644
--- a/phalcon/Html/Link/EvolvableLink.zep
+++ b/phalcon/Html/Link/EvolvableLink.zep
@@ -28,8 +28,8 @@ class EvolvableLink extends Link implements EvolvableLinkInterface
      * If the specified attribute is already present, it will be overwritten
      * with the new value.
      *
-     * @param string $attribute The attribute to include.
-     * @param string $value     The value of the attribute to set.
+     * @param string       $attribute The attribute to include.
+     * @param string|array $value     The value of the attribute to set.
      */
     public function withAttribute(var attribute, var value) -> <EvolvableLinkInterface>
     {

From 00bbe5d43b8d250fac3d095b0bcbd6b65574a27c Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 8 Sep 2022 13:26:32 -0400
Subject: [PATCH 31/76] PECL lead developers

---
 package.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.xml b/package.xml
index fd974281b96..7da7a605baf 100644
--- a/package.xml
+++ b/package.xml
@@ -17,9 +17,9 @@
     <active>yes</active>
   </lead>
   <lead>
-    <name>Ruud Boon</name>
-    <user>ruudboon</user>
-    <email>ruud@ruudboon.io</email>
+    <name>Nikolaos Dimopoulos</name>
+    <user>niden</user>
+    <email>nikos@phalcon.io</email>
     <active>yes</active>
   </lead>
   <date>2022-08-08</date>

From 56af9a1c41b9392444a34fe682c93cca67ce2bae Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 15 Sep 2022 15:30:26 -0400
Subject: [PATCH 32/76] [#16094] - adjusting tests

---
 .../Security/JWT/Validator/SetTokenCest.php   | 16 ++++--------
 .../JWT/Validator/ValidateAudienceCest.php    | 17 ++++++-------
 .../JWT/Validator/ValidateExpirationCest.php  | 20 +++++++--------
 .../Security/JWT/Validator/ValidateIdCest.php | 18 ++++++-------
 .../JWT/Validator/ValidateIssuedAtCest.php    | 20 +++++++--------
 .../JWT/Validator/ValidateIssuerCest.php      | 18 ++++++-------
 .../JWT/Validator/ValidateNotBeforeCest.php   | 20 +++++++--------
 .../JWT/Validator/ValidateSignatureCest.php   | 25 ++++++++-----------
 8 files changed, 66 insertions(+), 88 deletions(-)

diff --git a/tests/unit/Encryption/Security/JWT/Validator/SetTokenCest.php b/tests/unit/Encryption/Security/JWT/Validator/SetTokenCest.php
index a7d3ab2fae1..0413d6a43bd 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/SetTokenCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/SetTokenCest.php
@@ -49,16 +49,10 @@ public function encryptionSecurityJWTValidatorSetToken(UnitTester $I)
         );
 
         $validator->setToken($token2);
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: the token cannot be used yet (future)"
-            ),
-            function () use ($validator, $now, $I) {
-                $I->assertInstanceOf(
-                    Validator::class,
-                    $validator->validateIssuedAt($now)
-                );
-            }
-        );
+        $validator->validateIssuedAt($now);
+
+        $expected = ["Validation: the token cannot be used yet (future)"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateAudienceCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateAudienceCest.php
index 926c507e2a1..ba4f54695a6 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateAudienceCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateAudienceCest.php
@@ -38,15 +38,12 @@ public function encryptionSecurityJWTValidatorValidateAudience(UnitTester $I)
         $I->wantToTest('Encryption\Security\JWT\Validator - validateAudience()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: audience not allowed"
-            ),
-            function () use ($token, $I) {
-                $validator = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
-                $validator->validateAudience("unknown");
-            }
-        );
+        $validator = new Validator($token);
+
+        $validator->validateAudience('unknown');
+
+        $expected = ["Validation: audience not allowed"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateExpirationCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateExpirationCest.php
index ad4e7b35df0..64c0b4827af 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateExpirationCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateExpirationCest.php
@@ -38,16 +38,14 @@ public function encryptionSecurityJWTValidatorValidateExpiration(UnitTester $I)
         $I->wantToTest('Encryption\Security\JWT\Validator - validateExpiration()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: the token has expired"
-            ),
-            function () use ($token, $I) {
-                $timestamp = strtotime(("+2 days"));
-                $validator = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
-                $validator->validateExpiration($timestamp);
-            }
-        );
+        $timestamp = strtotime(("-2 days"));
+        $validator = new Validator($token);
+        $I->assertInstanceOf(Validator::class, $validator);
+
+        $validator->validateExpiration($timestamp);
+
+        $expected = ["Validation: the token has expired"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateIdCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateIdCest.php
index 875079fdda4..0c5bda0da25 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateIdCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateIdCest.php
@@ -38,15 +38,13 @@ public function encryptionSecurityJWTValidatorValidateId(UnitTester $I)
         $I->wantToTest('Encryption\Security\JWT\Validator - validateId()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: incorrect Id"
-            ),
-            function () use ($token, $I) {
-                $validator = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
-                $validator->validateId("unknown");
-            }
-        );
+        $validator = new Validator($token);
+        $I->assertInstanceOf(Validator::class, $validator);
+
+        $validator->validateId("unknown");
+
+        $expected = ["Validation: incorrect Id"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuedAtCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuedAtCest.php
index da6feda1f93..7e8507cc88c 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuedAtCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuedAtCest.php
@@ -38,16 +38,14 @@ public function encryptionSecurityJWTValidatorValidateIssuedAt(UnitTester $I)
         $I->wantToTest('Encryption\Security\JWT\Validator - validateIssuedAt()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: the token cannot be used yet (future)"
-            ),
-            function () use ($token, $I) {
-                $timestamp = strtotime(("-1 day"));
-                $validator = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
-                $validator->validateIssuedAt($timestamp);
-            }
-        );
+        $timestamp = strtotime(("-1 day"));
+        $validator = new Validator($token);
+        $I->assertInstanceOf(Validator::class, $validator);
+
+        $validator->validateIssuedAt($timestamp);
+
+        $expected = ["Validation: the token cannot be used yet (future)"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuerCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuerCest.php
index d320f93df29..e6f47d032ee 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuerCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateIssuerCest.php
@@ -38,15 +38,13 @@ public function encryptionSecurityJWTValidatorValidateIssuer(UnitTester $I)
         $I->wantToTest('Encryption\Security\JWT\Validator - validateIssuer()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: incorrect issuer"
-            ),
-            function () use ($token, $I) {
-                $validator = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
-                $validator->validateIssuer("unknown");
-            }
-        );
+        $validator = new Validator($token);
+        $I->assertInstanceOf(Validator::class, $validator);
+
+        $validator->validateIssuer("unknown");
+
+        $expected = ["Validation: incorrect issuer"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateNotBeforeCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateNotBeforeCest.php
index 53a96e0facc..e7adc8e734e 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateNotBeforeCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateNotBeforeCest.php
@@ -38,16 +38,14 @@ public function encryptionSecurityJWTValidatorValidateNotBefore(UnitTester $I)
         $I->wantToTest('Encryption\Security\JWT\Validator - validateNotBefore()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: the token cannot be used yet (not before)"
-            ),
-            function () use ($token, $I) {
-                $timestamp = strtotime(("-2 days"));
-                $validator = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
-                $validator->validateNotBefore($timestamp);
-            }
-        );
+        $timestamp = strtotime(("-2 days"));
+        $validator = new Validator($token);
+        $I->assertInstanceOf(Validator::class, $validator);
+
+        $validator->validateNotBefore($timestamp);
+
+        $expected = ["Validation: the token cannot be used yet (not before)"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Encryption/Security/JWT/Validator/ValidateSignatureCest.php b/tests/unit/Encryption/Security/JWT/Validator/ValidateSignatureCest.php
index dec89e18c42..d8021c23ec7 100644
--- a/tests/unit/Encryption/Security/JWT/Validator/ValidateSignatureCest.php
+++ b/tests/unit/Encryption/Security/JWT/Validator/ValidateSignatureCest.php
@@ -79,21 +79,18 @@ public function encryptionSecurityJWTValidatorValidateNotBeforeException(UnitTes
         $I->wantToTest('Encryption\Security\JWT\Validator - validateSignature()');
 
         $token = $this->newToken();
-        $I->expectThrowable(
-            new ValidatorException(
-                "Validation: the signature does not match"
-            ),
-            function () use ($token, $I) {
-                $signer     = new Hmac();
-                $passphrase = '123456';
-                $validator  = new Validator($token);
-                $I->assertInstanceOf(Validator::class, $validator);
+        $signer     = new Hmac();
+        $passphrase = '123456';
+        $validator  = new Validator($token);
+        $I->assertInstanceOf(Validator::class, $validator);
 
-                $I->assertInstanceOf(
-                    Validator::class,
-                    $validator->validateSignature($signer, $passphrase)
-                );
-            }
+        $I->assertInstanceOf(
+            Validator::class,
+            $validator->validateSignature($signer, $passphrase)
         );
+
+        $expected = ["Validation: the signature does not match"];
+        $actual   = $validator->getErrors();
+        $I->assertSame($expected, $actual);
     }
 }

From 0e53ba09735ae9a8d3473aad574e67673ef1c5a7 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 15 Sep 2022 15:31:27 -0400
Subject: [PATCH 33/76] [#16094] - added verify() and validate() for Token;
 added getErrors() for validator

---
 phalcon/Encryption/Security/JWT/Builder.zep   |  4 +-
 .../UnsupportedAlgorithmException.zep         |  6 +-
 .../JWT/Exceptions/ValidatorException.zep     |  6 +-
 .../Security/JWT/Signer/AbstractSigner.zep    | 11 ++-
 .../Encryption/Security/JWT/Signer/Hmac.zep   | 15 +--
 .../Encryption/Security/JWT/Signer/None.zep   | 11 ++-
 .../Security/JWT/Signer/SignerInterface.zep   |  9 +-
 .../Security/JWT/Token/AbstractItem.zep       |  2 +-
 .../Encryption/Security/JWT/Token/Enum.zep    |  2 +-
 .../Encryption/Security/JWT/Token/Item.zep    |  2 +-
 .../Encryption/Security/JWT/Token/Parser.zep  |  6 +-
 .../Security/JWT/Token/Signature.zep          |  2 +-
 .../Encryption/Security/JWT/Token/Token.zep   | 85 +++++++++++++++-
 phalcon/Encryption/Security/JWT/Validator.zep | 96 +++++++++++++------
 14 files changed, 197 insertions(+), 60 deletions(-)

diff --git a/phalcon/Encryption/Security/JWT/Builder.zep b/phalcon/Encryption/Security/JWT/Builder.zep
index 4d31b9b13dc..596a98e2452 100644
--- a/phalcon/Encryption/Security/JWT/Builder.zep
+++ b/phalcon/Encryption/Security/JWT/Builder.zep
@@ -21,7 +21,9 @@ use Phalcon\Encryption\Security\JWT\Token\Signature;
 use Phalcon\Encryption\Security\JWT\Token\Token;
 
 /**
- * Class Builder
+ * Builder
+ *
+ * The builder offers
  *
  * @property CollectionInterface  $claims
  * @property CollectionInterface  $jose
diff --git a/phalcon/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.zep b/phalcon/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.zep
index 07041fbd44a..3971618dbb8 100644
--- a/phalcon/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.zep
+++ b/phalcon/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.zep
@@ -12,9 +12,11 @@
 namespace Phalcon\Encryption\Security\JWT\Exceptions;
 
 use Exception;
-use Throwable;
 
-class UnsupportedAlgorithmException extends Exception implements Throwable
+/**
+ * Exception thrown when the algorithm is not supported for JWT
+ */
+class UnsupportedAlgorithmException extends Exception
 {
 
 }
diff --git a/phalcon/Encryption/Security/JWT/Exceptions/ValidatorException.zep b/phalcon/Encryption/Security/JWT/Exceptions/ValidatorException.zep
index 33cd15ff94b..7dc95341846 100644
--- a/phalcon/Encryption/Security/JWT/Exceptions/ValidatorException.zep
+++ b/phalcon/Encryption/Security/JWT/Exceptions/ValidatorException.zep
@@ -11,9 +11,11 @@
 namespace Phalcon\Encryption\Security\JWT\Exceptions;
 
 use Exception;
-use Throwable;
 
-class ValidatorException extends Exception implements Throwable
+/**
+ * Exception thrown when the validation does not pass for JWT
+ */
+class ValidatorException extends Exception
 {
 
 }
diff --git a/phalcon/Encryption/Security/JWT/Signer/AbstractSigner.zep b/phalcon/Encryption/Security/JWT/Signer/AbstractSigner.zep
index 18164cdf833..3f09bbf7fb2 100644
--- a/phalcon/Encryption/Security/JWT/Signer/AbstractSigner.zep
+++ b/phalcon/Encryption/Security/JWT/Signer/AbstractSigner.zep
@@ -12,14 +12,17 @@
 namespace Phalcon\Encryption\Security\JWT\Signer;
 
 /**
- * Class AbstractSigner
- *
- * @property string $algo
+ * Abstract class helping with the signer classes
  */
 abstract class AbstractSigner implements SignerInterface
 {
     /**
      * @var string
      */
-    protected algorithm { get };
+    protected algorithm = "";
+
+    public function getAlgorithm() -> string
+    {
+        return this->algorithm;
+    }
 }
diff --git a/phalcon/Encryption/Security/JWT/Signer/Hmac.zep b/phalcon/Encryption/Security/JWT/Signer/Hmac.zep
index eddad58d486..75edefc4fda 100644
--- a/phalcon/Encryption/Security/JWT/Signer/Hmac.zep
+++ b/phalcon/Encryption/Security/JWT/Signer/Hmac.zep
@@ -13,7 +13,7 @@ namespace Phalcon\Encryption\Security\JWT\Signer;
 use Phalcon\Encryption\Security\JWT\Exceptions\UnsupportedAlgorithmException;
 
 /**
- * Class Hmac
+ * HMAC signing class
  */
 class Hmac extends AbstractSigner
 {
@@ -38,7 +38,7 @@ class Hmac extends AbstractSigner
             throw new UnsupportedAlgorithmException(
                 "Unsupported HMAC algorithm"
             );
-        };
+        }
 
         let this->algorithm = algo;
     }
@@ -75,9 +75,12 @@ class Hmac extends AbstractSigner
      *
      * @return bool
      */
-    public function verify(string! source, string! payload, string! passphrase) -> bool
-    {
-        return hash_equals(source, this->getHash(payload, passphrase));
+    public function verify(
+        string source,
+        string payload,
+        string passphrase
+    ) -> bool {
+        return hash_equals($source, $this->getHash($payload, $passphrase));
     }
 
     /**
@@ -88,7 +91,7 @@ class Hmac extends AbstractSigner
      *
      * @return string
      */
-    private function getHash(string! payload, string! passphrase) -> string
+    private function getHash(string payload, string passphrase) -> string
     {
         return hash_hmac(this->getAlgorithm(), payload, passphrase, true);
     }
diff --git a/phalcon/Encryption/Security/JWT/Signer/None.zep b/phalcon/Encryption/Security/JWT/Signer/None.zep
index f055c6ed095..52a5b1c43ec 100644
--- a/phalcon/Encryption/Security/JWT/Signer/None.zep
+++ b/phalcon/Encryption/Security/JWT/Signer/None.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Encryption\Security\JWT\Signer;
 
 /**
- * Class None
+ * No signing class
  */
 class None implements SignerInterface
 {
@@ -57,8 +57,11 @@ class None implements SignerInterface
      *
      * @return bool
      */
-    public function verify(string! source, string! payload, string! passphrase) -> bool
-    {
-        return "" === source;
+    public function verify(
+        string source,
+        string payload,
+        string passphrase
+    ) -> bool {
+        return "" === $source;
     }
 }
diff --git a/phalcon/Encryption/Security/JWT/Signer/SignerInterface.zep b/phalcon/Encryption/Security/JWT/Signer/SignerInterface.zep
index fe075f617eb..c25f2fd3ce6 100644
--- a/phalcon/Encryption/Security/JWT/Signer/SignerInterface.zep
+++ b/phalcon/Encryption/Security/JWT/Signer/SignerInterface.zep
@@ -10,6 +10,9 @@
 
 namespace Phalcon\Encryption\Security\JWT\Signer;
 
+/**
+ * Interface for JWT Signer classes
+ */
 interface SignerInterface
 {
     /**
@@ -45,5 +48,9 @@ interface SignerInterface
      *
      * @return bool
      */
-    public function verify(string! source, string! payload, string! passphrase) -> bool;
+    public function verify(
+        string source,
+        string payload,
+        string passphrase
+    ) -> bool;
 }
diff --git a/phalcon/Encryption/Security/JWT/Token/AbstractItem.zep b/phalcon/Encryption/Security/JWT/Token/AbstractItem.zep
index fccaa126799..9b127ac8c5e 100644
--- a/phalcon/Encryption/Security/JWT/Token/AbstractItem.zep
+++ b/phalcon/Encryption/Security/JWT/Token/AbstractItem.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class AbstractItem
+ * Abstract helper class for Tokens
  *
  * @property array $data
  */
diff --git a/phalcon/Encryption/Security/JWT/Token/Enum.zep b/phalcon/Encryption/Security/JWT/Token/Enum.zep
index 2a7d9b0a5dd..3bcc25607e8 100644
--- a/phalcon/Encryption/Security/JWT/Token/Enum.zep
+++ b/phalcon/Encryption/Security/JWT/Token/Enum.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class Enum
+ * Constants for Tokens. It offers constants for Headers as well as Claims
  *
  * @link https://tools.ietf.org/html/rfc7519
  */
diff --git a/phalcon/Encryption/Security/JWT/Token/Item.zep b/phalcon/Encryption/Security/JWT/Token/Item.zep
index a2521233e93..6813b7cb415 100644
--- a/phalcon/Encryption/Security/JWT/Token/Item.zep
+++ b/phalcon/Encryption/Security/JWT/Token/Item.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class Item
+ * Storage class for a Token Item
  */
 class Item extends AbstractItem
 {
diff --git a/phalcon/Encryption/Security/JWT/Token/Parser.zep b/phalcon/Encryption/Security/JWT/Token/Parser.zep
index 4d3ccaa1df9..1e9b1c8ac57 100644
--- a/phalcon/Encryption/Security/JWT/Token/Parser.zep
+++ b/phalcon/Encryption/Security/JWT/Token/Parser.zep
@@ -13,7 +13,11 @@ namespace Phalcon\Encryption\Security\JWT\Token;
 use InvalidArgumentException;
 
 /**
- * Class Parser
+ * Token Parser class.
+ *
+ * It parses a token by validating if it is formed properly and splits it into
+ * three parts. The headers are decoded, then the claims and finally the
+ * signature. It returns a token object populated with the decoded information.
  */
 class Parser
 {
diff --git a/phalcon/Encryption/Security/JWT/Token/Signature.zep b/phalcon/Encryption/Security/JWT/Token/Signature.zep
index 2b1f775929f..90a4af7c761 100644
--- a/phalcon/Encryption/Security/JWT/Token/Signature.zep
+++ b/phalcon/Encryption/Security/JWT/Token/Signature.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class Item
+ * Signature class containing the encoded data and the hash.
  */
 class Signature extends AbstractItem
 {
diff --git a/phalcon/Encryption/Security/JWT/Token/Token.zep b/phalcon/Encryption/Security/JWT/Token/Token.zep
index a721c415d53..694d8218ee4 100644
--- a/phalcon/Encryption/Security/JWT/Token/Token.zep
+++ b/phalcon/Encryption/Security/JWT/Token/Token.zep
@@ -10,8 +10,14 @@
 
 namespace Phalcon\Encryption\Security\JWT\Token;
 
+use Phalcon\Encryption\Security\JWT\Signer\SignerInterface;
+use Phalcon\Encryption\Security\JWT\Validator;
+
 /**
- * Class Token
+ * Token Class.
+ *
+ * A container for Token related data. It stores the claims, headers, signature
+ * and payload. It also calculates and returns the token string.
  *
  * @property Item      $claims
  * @property Item      $headers
@@ -24,17 +30,17 @@ class Token
     /**
      * @var Item
      */
-    private claims { get };
+    private claims;
 
     /**
      * @var Item
      */
-    private headers { get };
+    private headers;
 
     /**
      * @var Signature
      */
-    private signature { get };
+    private signature;
 
     /**
      * Token constructor.
@@ -53,6 +59,22 @@ class Token
             this->signature = signature;
     }
 
+    /**
+     * @return Item
+     */
+    public function getClaims() -> <Item>
+    {
+        return this->claims;
+    }
+
+    /**
+     * @return Item
+     */
+    public function getHeaders() -> <Item>
+    {
+        return this->headers;
+    }
+
     /**
      * @return string
      */
@@ -61,6 +83,14 @@ class Token
         return this->headers->getEncoded() . "." . this->claims->getEncoded();
     }
 
+    /**
+     * @return Signature
+     */
+    public function getSignature() -> <Signature>
+    {
+        return this->signature;
+    }
+
     /**
      * @return string
      */
@@ -68,4 +98,51 @@ class Token
     {
         return this->getPayload() . "." . this->getSignature()->getEncoded();
     }
+
+    /**
+     * @param Validator $validator
+     *
+     * @return array
+     */
+    public function validate(<Validator> validator) -> array
+    {
+        var claimId, method;
+        array methods;
+
+        let methods = [
+            "validateAudience"   : Enum::AUDIENCE,
+            "validateExpiration" : Enum::EXPIRATION_TIME,
+            "validateId"         : Enum::ID,
+            "validateIssuedAt"   : Enum::ISSUED_AT,
+            "validateIssuer"     : Enum::ISSUER,
+            "validateNotBefore"  : Enum::NOT_BEFORE
+        ];
+
+        for claimId, method in methods {
+            validator->{method}(this->claims->get(claimId));
+        }
+
+        return validator->getErrors();
+    }
+
+    /**
+     * Verify the signature
+     *
+     * @param SignerInterface $signer
+     * @param string          $key
+     *
+     * @return bool
+     */
+    public function verify(<SignerInterface> signer, string key) -> bool
+    {
+        if (signer->getAlgHeader() !== this->getHeaders()->get(Enum::ALGO)) {
+            return false;
+        }
+
+        return signer->verify(
+            this->signature->getHash(),
+            this->getPayload(),
+            key
+        );
+    }
 }
diff --git a/phalcon/Encryption/Security/JWT/Validator.zep b/phalcon/Encryption/Security/JWT/Validator.zep
index 0470e567161..8fa1bed82ee 100644
--- a/phalcon/Encryption/Security/JWT/Validator.zep
+++ b/phalcon/Encryption/Security/JWT/Validator.zep
@@ -23,6 +23,11 @@ use Phalcon\Encryption\Security\JWT\Token\Token;
  */
 class Validator
 {
+    /**
+     * @var array
+     */
+    private errors = [];
+
     /**
      * @var int
      */
@@ -45,6 +50,11 @@ class Validator
             this->timeShift = timeShift;
     }
 
+    public function getErrors() -> array
+    {
+        return this->errors;
+    }
+
     /**
      * @param Token $token
      *
@@ -58,19 +68,33 @@ class Validator
     }
 
     /**
-     * @param string $audience
+     * @param string|arrat $audience
      *
      * @return Validator
      * @throws ValidatorException
      */
-    public function validateAudience(string! audience) -> <Validator>
+    public function validateAudience(var audience) -> <Validator>
     {
-        if (!in_array(audience, this->token->getClaims()->get(Enum::AUDIENCE, []))) {
+        var item, tokenAudience;
+
+        if (typeof audience !== "string" && typeof audience !== "array") {
             throw new ValidatorException(
-                "Validation: audience not allowed"
+                "Audience must be a string or an array"
             );
         }
 
+        if (typeof audience === "string") {
+            let audience = [audience];
+        }
+
+        let tokenAudience = this->token->getClaims()->get(Enum::AUDIENCE, []);
+
+        for item in audience {
+            if (true !== in_array(item, tokenAudience)) {
+                let this->errors[] = "Validation: audience not allowed";
+            }
+        }
+
         return this;
     }
 
@@ -82,13 +106,15 @@ class Validator
      */
     public function validateExpiration(int timestamp) -> <Validator>
     {
+        var tokenExpirationTime;
+
+        let tokenExpirationTime = (int) this->token->getClaims()->get(Enum::EXPIRATION_TIME);
+
         if (
             this->token->getClaims()->has(Enum::EXPIRATION_TIME) &&
-            this->getTimestamp(timestamp) >= (int) this->token->getClaims()->get(Enum::EXPIRATION_TIME)
+            this->getTimestamp(timestamp) < $tokenExpirationTime
         ) {
-            throw new ValidatorException(
-                "Validation: the token has expired"
-            );
+            let this->errors[] = "Validation: the token has expired";
         }
 
         return this;
@@ -100,12 +126,14 @@ class Validator
      * @return Validator
      * @throws ValidatorException
      */
-    public function validateId(string! id) -> <Validator>
+    public function validateId(string id) -> <Validator>
     {
-        if (id !== (string) this->token->getClaims()->get(Enum::ID)) {
-            throw new ValidatorException(
-                "Validation: incorrect Id"
-            );
+        var tokenId;
+
+        let tokenId = (string) this->token->getClaims()->get(Enum::ID);
+
+        if ($id !== tokenId) {
+            let this->errors[] = "Validation: incorrect Id";
         }
 
         return this;
@@ -119,10 +147,12 @@ class Validator
      */
     public function validateIssuedAt(int timestamp) -> <Validator>
     {
-        if (this->getTimestamp(timestamp) <= (int) this->token->getClaims()->get(Enum::ISSUED_AT)) {
-            throw new ValidatorException(
-                "Validation: the token cannot be used yet (future)"
-            );
+        var tokenIssuedAt;
+
+        let tokenIssuedAt = (int) this->token->getClaims()->get(Enum::ISSUED_AT);
+
+        if (this->getTimestamp($timestamp) <= tokenIssuedAt) {
+            let this->errors[] = "Validation: the token cannot be used yet (future)";
         }
 
         return this;
@@ -136,10 +166,12 @@ class Validator
      */
     public function validateIssuer(string! issuer) -> <Validator>
     {
-        if (issuer !== (string) this->token->getClaims()->get(Enum::ISSUER)) {
-            throw new ValidatorException(
-                "Validation: incorrect issuer"
-            );
+        var tokenIssuer;
+
+        let tokenIssuer = (string) this->token->getClaims()->get(Enum::ISSUER);
+
+        if (issuer !== tokenIssuer) {
+            let this->errors[] = "Validation: incorrect issuer";
         }
 
         return this;
@@ -153,10 +185,12 @@ class Validator
      */
     public function validateNotBefore(int timestamp) -> <Validator>
     {
-        if (this->getTimestamp(timestamp) <= (int) this->token->getClaims()->get(Enum::NOT_BEFORE)) {
-            throw new ValidatorException(
-                "Validation: the token cannot be used yet (not before)"
-            );
+        var tokenNotBefore;
+
+        let tokenNotBefore = (int) this->token->getClaims()->get(Enum::NOT_BEFORE);
+
+        if (this->getTimestamp($timestamp) <= tokenNotBefore) {
+            let this->errors[] = "Validation: the token cannot be used yet (not before)";
         }
 
         return this;
@@ -169,18 +203,18 @@ class Validator
      * @return Validator
      * @throws ValidatorException
      */
-    public function validateSignature(<SignerInterface> signer, string passphrase) -> <Validator>
-    {
+    public function validateSignature(
+        <SignerInterface> signer,
+        string passphrase
+    ) -> <Validator> {
         if (
-            !signer->verify(
+            true !== signer->verify(
                 this->token->getSignature()->getHash(),
                 this->token->getPayload(),
                 passphrase
             )
         ) {
-            throw new ValidatorException(
-                "Validation: the signature does not match"
-            );
+            let this->errors[] = "Validation: the signature does not match";
         }
 
         return this;

From dc7864f2562ca722ac2894bcc5495e107e041f98 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 15 Sep 2022 15:31:40 -0400
Subject: [PATCH 34/76] [#16094] - updated changelog

---
 CHANGELOG-5.0.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 62a7af76c22..ee51f4a6b83 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -1,4 +1,4 @@
-# [x.x.x](https://github.com/phalcon/cphalcon/releases/tag/vx.x.x) (xxxx-xx-xx)
+# [5.0.0](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0) (xxxx-xx-xx)
 
 ## Changed
 - Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072) 
@@ -9,6 +9,11 @@
 - Fixed `Phalcon\Flash\AbstractFlash::outputMessage` to return the message (implicitFlush) [#16063](https://github.com/phalcon/cphalcon/issues/16063)
 - Fixed `Phalcon\Filter\Validation\Validator\Numericality` to correctly detect illegal characters within string numbers [#16070](https://github.com/phalcon/cphalcon/issues/16070)
 
+## Added
+- Added `Phalcon\Encryption\Security\JWT\Token::validate()` to validate a token's claims [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+- Added `Phalcon\Encryption\Security\JWT\Token::verify()` to verify a token's signature [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+- Added `Phalcon\Encryption\Security\JWT\Validator::getErrors()` to return any errors with the validation as an array [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+
 # [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 
 ## Fixed 

From 2429cbab4d73e3859e903075fa92f1d492202269 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 15 Sep 2022 15:33:56 -0400
Subject: [PATCH 35/76] [#16094] - correcting typo on docblock

---
 phalcon/Encryption/Security/JWT/Validator.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Encryption/Security/JWT/Validator.zep b/phalcon/Encryption/Security/JWT/Validator.zep
index 8fa1bed82ee..40076bb1b54 100644
--- a/phalcon/Encryption/Security/JWT/Validator.zep
+++ b/phalcon/Encryption/Security/JWT/Validator.zep
@@ -68,7 +68,7 @@ class Validator
     }
 
     /**
-     * @param string|arrat $audience
+     * @param string|array $audience
      *
      * @return Validator
      * @throws ValidatorException

From 3fe28d13c3467ed731763a8385601840b2c54a05 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:35:10 +0100
Subject: [PATCH 36/76] #16096 - Update composer.lock

---
 composer.lock | 110 +++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/composer.lock b/composer.lock
index 4ac9d61b6eb..caba504883c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1667,16 +1667,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.10.0",
+            "version": "v3.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe"
+                "reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
-                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7dcdea3f2f5f473464e835be9be55283ff8cfdc3",
+                "reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3",
                 "shasum": ""
             },
             "require": {
@@ -1744,7 +1744,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.10.0"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.11.0"
             },
             "funding": [
                 {
@@ -1752,7 +1752,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-17T22:13:10+00:00"
+            "time": "2022-09-01T18:24:51+00:00"
         },
         {
             "name": "graham-campbell/result-type",
@@ -2411,16 +2411,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
@@ -2461,9 +2461,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
             },
-            "time": "2022-05-31T20:59:12+00:00"
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
             "name": "openlss/lib-array2xml",
@@ -2587,16 +2587,16 @@
         },
         {
             "name": "phalcon/zephir",
-            "version": "0.16.2",
+            "version": "0.16.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zephir-lang/zephir.git",
-                "reference": "3e961ab90912b4887ebee219243126763850088f"
+                "reference": "5099f34531cf0772ea0da1f8be6c6d9b7622dc79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/3e961ab90912b4887ebee219243126763850088f",
-                "reference": "3e961ab90912b4887ebee219243126763850088f",
+                "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/5099f34531cf0772ea0da1f8be6c6d9b7622dc79",
+                "reference": "5099f34531cf0772ea0da1f8be6c6d9b7622dc79",
                 "shasum": ""
             },
             "require": {
@@ -2671,7 +2671,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-22T17:26:36+00:00"
+            "time": "2022-09-17T09:19:40+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -3021,16 +3021,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.16",
+            "version": "9.2.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
-                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                 "shasum": ""
             },
             "require": {
@@ -3086,7 +3086,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
             },
             "funding": [
                 {
@@ -3094,7 +3094,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-20T05:26:47+00:00"
+            "time": "2022-08-30T12:24:04+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -3339,16 +3339,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.23",
+            "version": "9.5.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "888556852e7e9bbeeedb9656afe46118765ade34"
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34",
-                "reference": "888556852e7e9bbeeedb9656afe46118765ade34",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
                 "shasum": ""
             },
             "require": {
@@ -3377,7 +3377,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.1",
                 "sebastian/version": "^3.0.2"
             },
             "suggest": {
@@ -3421,7 +3421,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
             },
             "funding": [
                 {
@@ -3433,7 +3433,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-22T14:01:36+00:00"
+            "time": "2022-08-30T07:42:16+00:00"
         },
         {
             "name": "predis/predis",
@@ -4071,16 +4071,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
@@ -4133,7 +4133,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -4141,7 +4141,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -4331,16 +4331,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
@@ -4396,7 +4396,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
             },
             "funding": [
                 {
@@ -4404,7 +4404,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -4759,16 +4759,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.1.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb44e1cc6e557418387ad815780360057e40753e"
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e",
-                "reference": "fb44e1cc6e557418387ad815780360057e40753e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
                 "shasum": ""
             },
             "require": {
@@ -4780,7 +4780,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -4803,7 +4803,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.1.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
             },
             "funding": [
                 {
@@ -4811,7 +4811,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-29T06:55:37+00:00"
+            "time": "2022-09-12T14:47:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -6730,16 +6730,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "4.26.0",
+            "version": "4.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "6998fabb2bf528b65777bf9941920888d23c03ac"
+                "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac",
-                "reference": "6998fabb2bf528b65777bf9941920888d23c03ac",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/faf106e717c37b8c81721845dba9de3d8deed8ff",
+                "reference": "faf106e717c37b8c81721845dba9de3d8deed8ff",
                 "shasum": ""
             },
             "require": {
@@ -6831,9 +6831,9 @@
             ],
             "support": {
                 "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.26.0"
+                "source": "https://github.com/vimeo/psalm/tree/4.27.0"
             },
-            "time": "2022-07-31T13:10:26+00:00"
+            "time": "2022-08-31T13:47:09+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

From 054de144947546d48284f660855759899eb93ecb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:36:16 +0100
Subject: [PATCH 37/76] #16096 - Bump ZEPHIR_VERSION to `0.16.3`

---
 .github/workflows/main.yml | 2 +-
 docker/7.4/.bashrc         | 2 +-
 docker/8.0/.bashrc         | 2 +-
 docker/8.1/.bashrc         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f18c0cec789..b0197152ba7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ env:
   # All versions should be declared here
   PHALCON_VERSION: 5.0.0RC4
   ZEPHIR_PARSER_VERSION: 1.5.0
-  ZEPHIR_VERSION: 0.16.2
+  ZEPHIR_VERSION: 0.16.3
 
   # For tests
   LANG: en_US.UTF-8
diff --git a/docker/7.4/.bashrc b/docker/7.4/.bashrc
index c41a273e86c..71787672cca 100644
--- a/docker/7.4/.bashrc
+++ b/docker/7.4/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.2"
+ZEPHIR_VERSION="0.16.3"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
diff --git a/docker/8.0/.bashrc b/docker/8.0/.bashrc
index c41a273e86c..71787672cca 100644
--- a/docker/8.0/.bashrc
+++ b/docker/8.0/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.2"
+ZEPHIR_VERSION="0.16.3"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
diff --git a/docker/8.1/.bashrc b/docker/8.1/.bashrc
index c41a273e86c..71787672cca 100644
--- a/docker/8.1/.bashrc
+++ b/docker/8.1/.bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZEPHIR_VERSION="0.16.2"
+ZEPHIR_VERSION="0.16.3"
 
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."

From 0768b6fb84d26574f0cd73bb07967ac58da99da2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:40:23 +0100
Subject: [PATCH 38/76] #16096 - Create separate getter method for
 `transaction` property

---
 phalcon/Mvc/Model/Query.zep | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep
index 848a72517b7..9085f5cb52f 100644
--- a/phalcon/Mvc/Model/Query.zep
+++ b/phalcon/Mvc/Model/Query.zep
@@ -201,7 +201,7 @@ class Query implements QueryInterface, InjectionAwareInterface
      *
      * @var TransactionInterface|null
      */
-    protected transaction { get };
+    protected transaction = null;
 
     /**
      * @var array|null
@@ -516,6 +516,8 @@ class Query implements QueryInterface, InjectionAwareInterface
 
     /**
      * Gets the type of PHQL statement executed
+     *
+     * @return int
      */
     public function getType() -> int
     {
@@ -525,12 +527,22 @@ class Query implements QueryInterface, InjectionAwareInterface
     /**
      * Check if the query is programmed to get only the first row in the
      * resultset
+     *
+     * @return bool
      */
     public function getUniqueRow() -> bool
     {
         return this->uniqueRow;
     }
 
+    /**
+     * @return TransactionInterface|null
+     */
+    public function getTransaction() -> <TransactionInterface> | null
+    {
+        return this->transaction;
+    }
+
     /**
      * Parses the intermediate code produced by Phalcon\Mvc\Model\Query\Lang
      * generating another intermediate representation that could be executed by

From b2aa4e61ea9c7d62beb7bd1d73a1cd6695178e47 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:41:16 +0100
Subject: [PATCH 39/76] #16096 - Create separate getter methods in
 Phalcon\Forms\Form class

---
 phalcon/Forms/Form.zep | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/phalcon/Forms/Form.zep b/phalcon/Forms/Form.zep
index 457c5e7f5d5..96f107261c9 100644
--- a/phalcon/Forms/Form.zep
+++ b/phalcon/Forms/Form.zep
@@ -82,12 +82,12 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac
     /**
      * @var ValidationInterface|null
      */
-    protected validation = null { get };
+    protected validation = null;
 
     /**
      * @var array
      */
-    protected whitelist = [] { get };
+    protected whitelist = [];
 
     /**
      * Phalcon\Forms\Form constructor
@@ -586,6 +586,22 @@ class Form extends Injectable implements Countable, Iterator, AttributesInterfac
         return null;
     }
 
+    /**
+     * return ValidationInterface|null
+     */
+    public function getValidation() -> <ValidationInterface> | null
+    {
+        return this->validation;
+    }
+
+    /**
+     * return array
+     */
+    public function getWhitelist() -> array
+    {
+        return this->whitelist;
+    }
+
     /**
      * Check if the form contains an element
      */

From 27b6a8f2499d90b1b2a977061e7f9ec42d72f665 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:41:47 +0100
Subject: [PATCH 40/76] #16096 - Add unit test to mock whole Phalcon's codebase

---
 tests/unit/MassMockCest.php | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 tests/unit/MassMockCest.php

diff --git a/tests/unit/MassMockCest.php b/tests/unit/MassMockCest.php
new file mode 100644
index 00000000000..e744b17967d
--- /dev/null
+++ b/tests/unit/MassMockCest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Test\Unit;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+class MassMockCest extends TestCase
+{
+    public function testSegFaults(): void
+    {
+        $classes = array_filter(get_declared_classes(), function ($var) {
+            return preg_match('/^Phalcon/', $var) === 1;
+        });
+        sort($classes);
+
+        foreach ($classes as $class) {
+            $reflector = new ReflectionClass($class);
+            /**
+             * Final class could not be mocked.
+             */
+            if ($reflector->isFinal()) {
+                continue;
+            }
+
+            printf($class . PHP_EOL);
+            ob_flush();
+            $mockBuilder = $this->getMockBuilder($class)->disableOriginalConstructor();
+            $this->assertInstanceOf(MockObject::class, $mockBuilder->getMock());
+        }
+    }
+}

From 4b66a0917618363003691cf328634f711d3a0891 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:44:10 +0100
Subject: [PATCH 41/76] #16096 - Update changelog

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 21bcf240dfd..a6396b7b519 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -9,6 +9,7 @@
 - Fixed `Phalcon\Flash\AbstractFlash::outputMessage` to return the message (implicitFlush) [#16063](https://github.com/phalcon/cphalcon/issues/16063)
 - Fixed `Phalcon\Filter\Validation\Validator\Numericality` to correctly detect illegal characters within string numbers [#16070](https://github.com/phalcon/cphalcon/issues/16070)
 - Fixed segmentation fault on Reflection of `Phalcon\Mvc\Model` class [#16080](https://github.com/phalcon/cphalcon/issues/16080)
+- Fixed segmentation fault on Reflection [#16096](https://github.com/phalcon/cphalcon/issues/16096)
 
 ## Added
 - Added `Phalcon\Encryption\Security\JWT\Token::validate()` to validate a token's claims [#16094](https://github.com/phalcon/cphalcon/issues/16094)

From f2a3031ef66ad48dabbb214c62f8ed92b6f4cd2d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 10:44:27 +0100
Subject: [PATCH 42/76] #16096 - Regenerate ext/ directory

---
 ext/phalcon/annotations/collection.zep.h      |   2 +-
 ext/phalcon/di/di.zep.h                       |   2 +-
 ext/phalcon/di/injectable.zep.c               |   2 +-
 .../encryption/security/jwt/builder.zep.c     |  16 +-
 .../unsupportedalgorithmexception.zep.c       |   4 +-
 .../jwt/exceptions/validatorexception.zep.c   |   4 +-
 .../security/jwt/signer/abstractsigner.zep.c  |   8 +-
 .../encryption/security/jwt/signer/hmac.zep.c |  52 +-
 .../encryption/security/jwt/signer/none.zep.c |  32 +-
 .../security/jwt/signer/signerinterface.zep.c |   3 +
 .../security/jwt/token/abstractitem.zep.c     |   2 +-
 .../encryption/security/jwt/token/enum.zep.c  |   2 +-
 .../encryption/security/jwt/token/item.zep.c  |   2 +-
 .../security/jwt/token/parser.zep.c           |  26 +-
 .../security/jwt/token/signature.zep.c        |   2 +-
 .../encryption/security/jwt/token/token.zep.c | 227 ++++-
 .../encryption/security/jwt/token/token.zep.h |  49 +-
 .../encryption/security/jwt/validator.zep.c   | 285 ++++---
 .../encryption/security/jwt/validator.zep.h   |  11 +-
 .../filter/validation/validator/digit.zep.c   |  15 +-
 .../validation/validator/numericality.zep.c   |   2 +-
 ext/phalcon/flash/abstractflash.zep.c         |  11 +-
 ext/phalcon/forms/form.zep.c                  |  58 +-
 ext/phalcon/forms/form.zep.h                  |  22 +-
 ext/phalcon/html/link/abstractlink.zep.c      |   4 +-
 ext/phalcon/html/link/evolvablelink.zep.c     |   4 +-
 ext/phalcon/html/tagfactory.zep.c             |  82 +-
 ext/phalcon/logger/adapter/stream.zep.c       |  96 +--
 ext/phalcon/messages/messages.zep.h           |   2 +-
 ext/phalcon/mvc/micro.zep.h                   |   2 +-
 ext/phalcon/mvc/model.zep.c                   | 542 ++++++------
 ext/phalcon/mvc/model.zep.h                   |  13 +-
 ext/phalcon/mvc/model/query.zep.c             | 776 +++++++++---------
 ext/phalcon/mvc/model/query.zep.h             |  10 +-
 ext/phalcon/mvc/model/resultset.zep.h         |   2 +-
 ext/phalcon/mvc/model/resultset/complex.zep.h |   2 +-
 ext/phalcon/mvc/model/row.zep.h               |   2 +-
 .../mvc/view/engine/volt/compiler.zep.c       | 464 ++++++-----
 ext/phalcon/storage/serializer/none.zep.h     |   2 +-
 ext/phalcon/storage/serializer/php.zep.h      |   2 +-
 ext/phalcon/support/collection.zep.h          |   2 +-
 ext/phalcon/support/registry.zep.h            |   2 +-
 .../translate/adapter/abstractadapter.zep.h   |   2 +-
 ext/php_phalcon.h                             |   2 +-
 44 files changed, 1517 insertions(+), 1335 deletions(-)

diff --git a/ext/phalcon/annotations/collection.zep.h b/ext/phalcon/annotations/collection.zep.h
index 82c2ec4e30e..3e1ae8da6d0 100644
--- a/ext/phalcon/annotations/collection.zep.h
+++ b/ext/phalcon/annotations/collection.zep.h
@@ -29,7 +29,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/di/di.zep.h b/ext/phalcon/di/di.zep.h
index 40be02f13f3..51faf51b452 100644
--- a/ext/phalcon/di/di.zep.h
+++ b/ext/phalcon/di/di.zep.h
@@ -103,7 +103,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c
index 375131de487..a88f6c7470a 100644
--- a/ext/phalcon/di/injectable.zep.c
+++ b/ext/phalcon/di/injectable.zep.c
@@ -48,7 +48,7 @@
  * @property \Phalcon\Db\Adapter\AdapterInterface $db
  * @property \Phalcon\Encryption\Security $security
  * @property \Phalcon\Encryption\Crypt|\Phalcon\Encryption\Crypt\CryptInterface $crypt
- * @property \Phalcon\Tag $tag
+ * @property \Phalcon\Html\TagFactory $tag
  * @property \Phalcon\Html\Escaper|\Phalcon\Html\Escaper\EscaperInterface $escaper
  * @property \Phalcon\Annotations\Adapter\Memory|\Phalcon\Annotations\Adapter $annotations
  * @property \Phalcon\Mvc\Model\Manager|\Phalcon\Mvc\Model\ManagerInterface $modelsManager
diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c
index 25fd33df31f..8becacfe56d 100644
--- a/ext/phalcon/encryption/security/jwt/builder.zep.c
+++ b/ext/phalcon/encryption/security/jwt/builder.zep.c
@@ -33,7 +33,9 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Builder
+ * Builder
+ *
+ * The builder offers
  *
  * @property CollectionInterface  $claims
  * @property CollectionInterface  $jose
@@ -497,7 +499,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY);
 	if (ZEPHIR_IS_EMPTY(&_0)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (empty)", "phalcon/Encryption/Security/JWT/Builder.zep", 197);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (empty)", "phalcon/Encryption/Security/JWT/Builder.zep", 199);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "getclaims", NULL, 0);
@@ -600,7 +602,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setAudience)
 		_0 = Z_TYPE_P(audience) != IS_ARRAY;
 	}
 	if (_0) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Audience", "phalcon/Encryption/Security/JWT/Builder.zep", 247);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Audience", "phalcon/Encryption/Security/JWT/Builder.zep", 249);
 		return;
 	}
 	if (Z_TYPE_P(audience) == IS_STRING) {
@@ -696,7 +698,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setExpirationTime)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_time(&_0);
 	if (ZEPHIR_GT_LONG(&_0, timestamp)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Expiration Time", "phalcon/Encryption/Security/JWT/Builder.zep", 292);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Expiration Time", "phalcon/Encryption/Security/JWT/Builder.zep", 294);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_1);
@@ -895,7 +897,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setNotBefore)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_time(&_0);
 	if (ZEPHIR_LT_LONG(&_0, timestamp)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Not Before", "phalcon/Encryption/Security/JWT/Builder.zep", 366);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Not Before", "phalcon/Encryption/Security/JWT/Builder.zep", 368);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_1);
@@ -1004,7 +1006,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setPassphrase)
 	ZVAL_STRING(&_3, "/(?=^.{16,}$)((?=.*\\d)|(?=.*\\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/");
 	zephir_preg_match(&_2, &_3, &passphrase, &_0, 0, 0 , 0 );
 	if (!(zephir_is_true(&_2))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (too weak)", "phalcon/Encryption/Security/JWT/Builder.zep", 404);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (too weak)", "phalcon/Encryption/Security/JWT/Builder.zep", 406);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("passphrase"), &passphrase);
@@ -1171,7 +1173,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encode)
 		ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3);
 		ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 192, &_5$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$3, "phalcon/Encryption/Security/JWT/Builder.zep", 451);
+		zephir_throw_exception_debug(&_3$$3, "phalcon/Encryption/Security/JWT/Builder.zep", 453);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
diff --git a/ext/phalcon/encryption/security/jwt/exceptions/unsupportedalgorithmexception.zep.c b/ext/phalcon/encryption/security/jwt/exceptions/unsupportedalgorithmexception.zep.c
index b7f0344ab62..74fd4e6ddd4 100644
--- a/ext/phalcon/encryption/security/jwt/exceptions/unsupportedalgorithmexception.zep.c
+++ b/ext/phalcon/encryption/security/jwt/exceptions/unsupportedalgorithmexception.zep.c
@@ -22,11 +22,13 @@
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
  */
+/**
+ * Exception thrown when the algorithm is not supported for JWT
+ */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Exceptions_UnsupportedAlgorithmException)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Encryption\\Security\\JWT\\Exceptions, UnsupportedAlgorithmException, phalcon, encryption_security_jwt_exceptions_unsupportedalgorithmexception, zend_ce_exception, NULL, 0);
 
-	zend_class_implements(phalcon_encryption_security_jwt_exceptions_unsupportedalgorithmexception_ce, 1, zend_ce_throwable);
 	return SUCCESS;
 }
 
diff --git a/ext/phalcon/encryption/security/jwt/exceptions/validatorexception.zep.c b/ext/phalcon/encryption/security/jwt/exceptions/validatorexception.zep.c
index 0ee54011c2b..242dcbe0007 100644
--- a/ext/phalcon/encryption/security/jwt/exceptions/validatorexception.zep.c
+++ b/ext/phalcon/encryption/security/jwt/exceptions/validatorexception.zep.c
@@ -22,11 +22,13 @@
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
  */
+/**
+ * Exception thrown when the validation does not pass for JWT
+ */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Exceptions_ValidatorException)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Encryption\\Security\\JWT\\Exceptions, ValidatorException, phalcon, encryption_security_jwt_exceptions_validatorexception, zend_ce_exception, NULL, 0);
 
-	zend_class_implements(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, 1, zend_ce_throwable);
 	return SUCCESS;
 }
 
diff --git a/ext/phalcon/encryption/security/jwt/signer/abstractsigner.zep.c b/ext/phalcon/encryption/security/jwt/signer/abstractsigner.zep.c
index f7ac21d486a..b894fc7c14d 100644
--- a/ext/phalcon/encryption/security/jwt/signer/abstractsigner.zep.c
+++ b/ext/phalcon/encryption/security/jwt/signer/abstractsigner.zep.c
@@ -24,9 +24,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class AbstractSigner
- *
- * @property string $algo
+ * Abstract class helping with the signer classes
  */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Signer_AbstractSigner)
 {
@@ -35,13 +33,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Signer_AbstractSigner)
 	/**
 	 * @var string
 	 */
-	zend_declare_property_null(phalcon_encryption_security_jwt_signer_abstractsigner_ce, SL("algorithm"), ZEND_ACC_PROTECTED);
+	zend_declare_property_string(phalcon_encryption_security_jwt_signer_abstractsigner_ce, SL("algorithm"), "", ZEND_ACC_PROTECTED);
 	zend_class_implements(phalcon_encryption_security_jwt_signer_abstractsigner_ce, 1, phalcon_encryption_security_jwt_signer_signerinterface_ce);
 	return SUCCESS;
 }
 
-/**
- */
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_AbstractSigner, getAlgorithm)
 {
 	zval *this_ptr = getThis();
diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c
index db273f996b1..045ce51f03d 100644
--- a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c
+++ b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c
@@ -32,7 +32,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Hmac
+ * HMAC signing class
  */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Signer_Hmac)
 {
@@ -215,33 +215,9 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify)
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 3, 0, &source_param, &payload_param, &passphrase_param);
-	if (UNEXPECTED(Z_TYPE_P(source_param) != IS_STRING && Z_TYPE_P(source_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'source' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(source_param) == IS_STRING)) {
-		zephir_get_strval(&source, source_param);
-	} else {
-		ZEPHIR_INIT_VAR(&source);
-	}
-	if (UNEXPECTED(Z_TYPE_P(payload_param) != IS_STRING && Z_TYPE_P(payload_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'payload' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(payload_param) == IS_STRING)) {
-		zephir_get_strval(&payload, payload_param);
-	} else {
-		ZEPHIR_INIT_VAR(&payload);
-	}
-	if (UNEXPECTED(Z_TYPE_P(passphrase_param) != IS_STRING && Z_TYPE_P(passphrase_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'passphrase' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(passphrase_param) == IS_STRING)) {
-		zephir_get_strval(&passphrase, passphrase_param);
-	} else {
-		ZEPHIR_INIT_VAR(&passphrase);
-	}
+	zephir_get_strval(&source, source_param);
+	zephir_get_strval(&payload, payload_param);
+	zephir_get_strval(&passphrase, passphrase_param);
 
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 257, &payload, &passphrase);
@@ -280,24 +256,8 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash)
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 2, 0, &payload_param, &passphrase_param);
-	if (UNEXPECTED(Z_TYPE_P(payload_param) != IS_STRING && Z_TYPE_P(payload_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'payload' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(payload_param) == IS_STRING)) {
-		zephir_get_strval(&payload, payload_param);
-	} else {
-		ZEPHIR_INIT_VAR(&payload);
-	}
-	if (UNEXPECTED(Z_TYPE_P(passphrase_param) != IS_STRING && Z_TYPE_P(passphrase_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'passphrase' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(passphrase_param) == IS_STRING)) {
-		zephir_get_strval(&passphrase, passphrase_param);
-	} else {
-		ZEPHIR_INIT_VAR(&passphrase);
-	}
+	zephir_get_strval(&payload, payload_param);
+	zephir_get_strval(&passphrase, passphrase_param);
 
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getalgorithm", NULL, 0);
diff --git a/ext/phalcon/encryption/security/jwt/signer/none.zep.c b/ext/phalcon/encryption/security/jwt/signer/none.zep.c
index 6314e991f4f..65290468e09 100644
--- a/ext/phalcon/encryption/security/jwt/signer/none.zep.c
+++ b/ext/phalcon/encryption/security/jwt/signer/none.zep.c
@@ -28,7 +28,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class None
+ * No signing class
  */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Signer_None)
 {
@@ -141,33 +141,9 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_None, verify)
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 3, 0, &source_param, &payload_param, &passphrase_param);
-	if (UNEXPECTED(Z_TYPE_P(source_param) != IS_STRING && Z_TYPE_P(source_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'source' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(source_param) == IS_STRING)) {
-		zephir_get_strval(&source, source_param);
-	} else {
-		ZEPHIR_INIT_VAR(&source);
-	}
-	if (UNEXPECTED(Z_TYPE_P(payload_param) != IS_STRING && Z_TYPE_P(payload_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'payload' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(payload_param) == IS_STRING)) {
-		zephir_get_strval(&payload, payload_param);
-	} else {
-		ZEPHIR_INIT_VAR(&payload);
-	}
-	if (UNEXPECTED(Z_TYPE_P(passphrase_param) != IS_STRING && Z_TYPE_P(passphrase_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'passphrase' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(passphrase_param) == IS_STRING)) {
-		zephir_get_strval(&passphrase, passphrase_param);
-	} else {
-		ZEPHIR_INIT_VAR(&passphrase);
-	}
+	zephir_get_strval(&source, source_param);
+	zephir_get_strval(&payload, payload_param);
+	zephir_get_strval(&passphrase, passphrase_param);
 
 
 	ZEPHIR_INIT_VAR(&_0);
diff --git a/ext/phalcon/encryption/security/jwt/signer/signerinterface.zep.c b/ext/phalcon/encryption/security/jwt/signer/signerinterface.zep.c
index 17b68f869d0..898d12120a3 100644
--- a/ext/phalcon/encryption/security/jwt/signer/signerinterface.zep.c
+++ b/ext/phalcon/encryption/security/jwt/signer/signerinterface.zep.c
@@ -20,6 +20,9 @@
  * For the full copyright and license information, please view the LICENSE.txt
  * file that was distributed with this source code.
  */
+/**
+ * Interface for JWT Signer classes
+ */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Signer_SignerInterface)
 {
 	ZEPHIR_REGISTER_INTERFACE(Phalcon\\Encryption\\Security\\JWT\\Signer, SignerInterface, phalcon, encryption_security_jwt_signer_signerinterface, phalcon_encryption_security_jwt_signer_signerinterface_method_entry);
diff --git a/ext/phalcon/encryption/security/jwt/token/abstractitem.zep.c b/ext/phalcon/encryption/security/jwt/token/abstractitem.zep.c
index b6a67e02a9d..a65973bb2c8 100644
--- a/ext/phalcon/encryption/security/jwt/token/abstractitem.zep.c
+++ b/ext/phalcon/encryption/security/jwt/token/abstractitem.zep.c
@@ -27,7 +27,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class AbstractItem
+ * Abstract helper class for Tokens
  *
  * @property array $data
  */
diff --git a/ext/phalcon/encryption/security/jwt/token/enum.zep.c b/ext/phalcon/encryption/security/jwt/token/enum.zep.c
index b294b542820..c7027145b3b 100644
--- a/ext/phalcon/encryption/security/jwt/token/enum.zep.c
+++ b/ext/phalcon/encryption/security/jwt/token/enum.zep.c
@@ -23,7 +23,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Enum
+ * Constants for Tokens. It offers constants for Headers as well as Claims
  *
  * @link https://tools.ietf.org/html/rfc7519
  */
diff --git a/ext/phalcon/encryption/security/jwt/token/item.zep.c b/ext/phalcon/encryption/security/jwt/token/item.zep.c
index 8a72a3e0ad3..19fbd78e568 100644
--- a/ext/phalcon/encryption/security/jwt/token/item.zep.c
+++ b/ext/phalcon/encryption/security/jwt/token/item.zep.c
@@ -30,7 +30,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Item
+ * Storage class for a Token Item
  */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Item)
 {
diff --git a/ext/phalcon/encryption/security/jwt/token/parser.zep.c b/ext/phalcon/encryption/security/jwt/token/parser.zep.c
index ec26c570383..f86e8200fc8 100644
--- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c
+++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c
@@ -32,7 +32,11 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Parser
+ * Token Parser class.
+ *
+ * It parses a token by validating if it is formed properly and splits it into
+ * three parts. The headers are decoded, then the claims and finally the
+ * signature. It returns a token object populated with the decoded information.
  */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Parser)
 {
@@ -88,11 +92,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse)
 	ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 258, &token);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&encodedHeaders);
-	zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 33);
+	zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 37);
 	ZEPHIR_OBS_VAR(&encodedClaims);
-	zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 34);
+	zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 38);
 	ZEPHIR_OBS_VAR(&encodedSignature);
-	zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 35);
+	zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 39);
 	ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 259, &encodedHeaders);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 260, &encodedClaims);
@@ -148,20 +152,20 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims)
 	ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 263, &_0, &_1);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&decoded) != IS_ARRAY) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 59);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 63);
 		return;
 	}
 	_2 = zephir_array_isset_string(&decoded, SL("aud"));
 	if (_2) {
 		ZEPHIR_OBS_VAR(&_3);
-		zephir_array_fetch_string(&_3, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 65);
+		zephir_array_fetch_string(&_3, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 69);
 		_2 = Z_TYPE_P(&_3) != IS_ARRAY;
 	}
 	if (_2) {
 		ZEPHIR_INIT_VAR(&_4$$4);
 		zephir_create_array(&_4$$4, 1, 0);
 		ZEPHIR_OBS_VAR(&_5$$4);
-		zephir_array_fetch_string(&_5$$4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 66);
+		zephir_array_fetch_string(&_5$$4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 70);
 		zephir_array_fast_append(&_4$$4, &_5$$4);
 		zephir_array_update_string(&decoded, SL("aud"), &_4$$4, PH_COPY | PH_SEPARATE);
 	}
@@ -209,11 +213,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders)
 	ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 263, &_0, &_1);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&decoded) != IS_ARRAY) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 88);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 92);
 		return;
 	}
 	if (!(zephir_array_isset_string(&decoded, SL("typ")))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (missing 'typ' element)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 94);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (missing 'typ' element)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 98);
 		return;
 	}
 	object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce);
@@ -321,7 +325,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parseToken)
 	ZEPHIR_INIT_VAR(&parts);
 	zephir_fast_explode_str(&parts, SL("."), &token, LONG_MAX);
 	if (zephir_fast_count_int(&parts) != 3) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid JWT string (dots misalignment)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 140);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid JWT string (dots misalignment)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 144);
 		return;
 	}
 	RETURN_CCTOR(&parts);
@@ -404,7 +408,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decode)
 		ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3);
 		ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 192, &_6$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_4$$3, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 163);
+		zephir_throw_exception_debug(&_4$$3, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 167);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
diff --git a/ext/phalcon/encryption/security/jwt/token/signature.zep.c b/ext/phalcon/encryption/security/jwt/token/signature.zep.c
index 90f62ebf8db..a595eab0c8b 100644
--- a/ext/phalcon/encryption/security/jwt/token/signature.zep.c
+++ b/ext/phalcon/encryption/security/jwt/token/signature.zep.c
@@ -29,7 +29,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Item
+ * Signature class containing the encoded data and the hash.
  */
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Signature)
 {
diff --git a/ext/phalcon/encryption/security/jwt/token/token.zep.c b/ext/phalcon/encryption/security/jwt/token/token.zep.c
index 2f45e350021..79606360be2 100644
--- a/ext/phalcon/encryption/security/jwt/token/token.zep.c
+++ b/ext/phalcon/encryption/security/jwt/token/token.zep.c
@@ -16,6 +16,8 @@
 #include "kernel/memory.h"
 #include "kernel/concat.h"
 #include "kernel/fcall.h"
+#include "kernel/array.h"
+#include "kernel/operators.h"
 
 
 /**
@@ -27,7 +29,10 @@
  * file that was distributed with this source code.
  */
 /**
- * Class Token
+ * Token Class.
+ *
+ * A container for Token related data. It stores the claims, headers, signature
+ * and payload. It also calculates and returns the token string.
  *
  * @property Item      $claims
  * @property Item      $headers
@@ -54,39 +59,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Token)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getClaims)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "claims");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "headers");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "signature");
-}
-
 /**
  * Token constructor.
  *
@@ -120,6 +92,30 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("signature"), signature);
 }
 
+/**
+ * @return Item
+ */
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getClaims)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "claims");
+}
+
+/**
+ * @return Item
+ */
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "headers");
+}
+
 /**
  * @return string
  */
@@ -148,6 +144,18 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getPayload)
 	RETURN_MM();
 }
 
+/**
+ * @return Signature
+ */
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "signature");
+}
+
 /**
  * @return string
  */
@@ -175,3 +183,154 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getToken)
 	RETURN_MM();
 }
 
+/**
+ * @param Validator $validator
+ *
+ * @return array
+ */
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, validate)
+{
+	zend_string *_3;
+	zend_ulong _2;
+	zval methods;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *validator, validator_sub, claimId, method, *_0, _1, _4$$3, _5$$3, _6$$4, _7$$4;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&validator_sub);
+	ZVAL_UNDEF(&claimId);
+	ZVAL_UNDEF(&method);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_4$$3);
+	ZVAL_UNDEF(&_5$$3);
+	ZVAL_UNDEF(&_6$$4);
+	ZVAL_UNDEF(&_7$$4);
+	ZVAL_UNDEF(&methods);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_encryption_security_jwt_validator_ce)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &validator);
+
+
+	ZEPHIR_INIT_VAR(&methods);
+	zephir_create_array(&methods, 6, 0);
+	add_assoc_stringl_ex(&methods, SL("validateAudience"), SL("aud"));
+	add_assoc_stringl_ex(&methods, SL("validateExpiration"), SL("exp"));
+	add_assoc_stringl_ex(&methods, SL("validateId"), SL("jti"));
+	add_assoc_stringl_ex(&methods, SL("validateIssuedAt"), SL("iat"));
+	add_assoc_stringl_ex(&methods, SL("validateIssuer"), SL("iss"));
+	add_assoc_stringl_ex(&methods, SL("validateNotBefore"), SL("nbf"));
+	zephir_is_iterable(&methods, 0, "phalcon/Encryption/Security/JWT/Token/Token.zep", 125);
+	if (Z_TYPE_P(&methods) == IS_ARRAY) {
+		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methods), _2, _3, _0)
+		{
+			ZEPHIR_INIT_NVAR(&claimId);
+			if (_3 != NULL) { 
+				ZVAL_STR_COPY(&claimId, _3);
+			} else {
+				ZVAL_LONG(&claimId, _2);
+			}
+			ZEPHIR_INIT_NVAR(&method);
+			ZVAL_COPY(&method, _0);
+			zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("claims"), PH_NOISY_CC | PH_READONLY);
+			ZEPHIR_CALL_METHOD(&_5$$3, &_4$$3, "get", NULL, 0, &claimId);
+			zephir_check_call_status();
+			ZEPHIR_CALL_METHOD_ZVAL(NULL, validator, &method, NULL, 0, &_5$$3);
+			zephir_check_call_status();
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		ZEPHIR_CALL_METHOD(NULL, &methods, "rewind", NULL, 0);
+		zephir_check_call_status();
+		while (1) {
+			ZEPHIR_CALL_METHOD(&_1, &methods, "valid", NULL, 0);
+			zephir_check_call_status();
+			if (!zend_is_true(&_1)) {
+				break;
+			}
+			ZEPHIR_CALL_METHOD(&claimId, &methods, "key", NULL, 0);
+			zephir_check_call_status();
+			ZEPHIR_CALL_METHOD(&method, &methods, "current", NULL, 0);
+			zephir_check_call_status();
+				zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("claims"), PH_NOISY_CC | PH_READONLY);
+				ZEPHIR_CALL_METHOD(&_7$$4, &_6$$4, "get", NULL, 0, &claimId);
+				zephir_check_call_status();
+				ZEPHIR_CALL_METHOD_ZVAL(NULL, validator, &method, NULL, 0, &_7$$4);
+				zephir_check_call_status();
+			ZEPHIR_CALL_METHOD(NULL, &methods, "next", NULL, 0);
+			zephir_check_call_status();
+		}
+	}
+	ZEPHIR_INIT_NVAR(&method);
+	ZEPHIR_INIT_NVAR(&claimId);
+	ZEPHIR_RETURN_CALL_METHOD(validator, "geterrors", NULL, 0);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
+/**
+ * Verify the signature
+ *
+ * @param SignerInterface $signer
+ * @param string          $key
+ *
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, verify)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval key;
+	zval *signer, signer_sub, *key_param = NULL, _0, _1, _2, _3, _4, _5, _6;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&signer_sub);
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&key);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce)
+		Z_PARAM_STR(key)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 2, 0, &signer, &key_param);
+	zephir_get_strval(&key, key_param);
+
+
+	ZEPHIR_CALL_METHOD(&_0, signer, "getalgheader", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheaders", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_STRING(&_3, "alg");
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
+	zephir_check_call_status();
+	if (!ZEPHIR_IS_IDENTICAL(&_0, &_2)) {
+		RETURN_MM_BOOL(0);
+	}
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("signature"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_5, &_4, "gethash", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_CALL_METHOD(&_6, this_ptr, "getpayload", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_RETURN_CALL_METHOD(signer, "verify", NULL, 0, &_5, &_6, &key);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
diff --git a/ext/phalcon/encryption/security/jwt/token/token.zep.h b/ext/phalcon/encryption/security/jwt/token/token.zep.h
index 975aa363cc2..5252dbade6a 100644
--- a/ext/phalcon/encryption/security/jwt/token/token.zep.h
+++ b/ext/phalcon/encryption/security/jwt/token/token.zep.h
@@ -3,52 +3,53 @@ extern zend_class_entry *phalcon_encryption_security_jwt_token_token_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Token);
 
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getClaims);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders);
-PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature);
-PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getPayload);
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getToken);
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, validate);
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, verify);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getclaims, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token___construct, 0, 0, 3)
+	ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
+	ZEND_ARG_OBJ_INFO(0, claims, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
+	ZEND_ARG_OBJ_INFO(0, signature, Phalcon\\Encryption\\Security\\JWT\\Token\\Signature, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getheaders, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getclaims, 0, 0, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getsignature, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getheaders, 0, 0, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token___construct, 0, 0, 3)
-	ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
-	ZEND_ARG_OBJ_INFO(0, claims, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
-	ZEND_ARG_OBJ_INFO(0, signature, Phalcon\\Encryption\\Security\\JWT\\Token\\Signature, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getpayload, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getpayload, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getsignature, 0, 0, Phalcon\\Encryption\\Security\\JWT\\Token\\Signature, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_gettoken, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_validate, 0, 1, IS_ARRAY, 0)
+	ZEND_ARG_OBJ_INFO(0, validator, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_verify, 0, 2, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO(0, signer, Phalcon\\Encryption\\Security\\JWT\\Signer\\SignerInterface, 0)
+	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_token_token_method_entry) {
-#if PHP_VERSION_ID >= 80000
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, __construct, arginfo_phalcon_encryption_security_jwt_token_token___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getClaims, arginfo_phalcon_encryption_security_jwt_token_token_getclaims, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getClaims, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders, arginfo_phalcon_encryption_security_jwt_token_token_getheaders, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getSignature, arginfo_phalcon_encryption_security_jwt_token_token_getsignature, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getSignature, NULL, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, __construct, arginfo_phalcon_encryption_security_jwt_token_token___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getPayload, arginfo_phalcon_encryption_security_jwt_token_token_getpayload, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getSignature, arginfo_phalcon_encryption_security_jwt_token_token_getsignature, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getToken, arginfo_phalcon_encryption_security_jwt_token_token_gettoken, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, validate, arginfo_phalcon_encryption_security_jwt_token_token_validate, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, verify, arginfo_phalcon_encryption_security_jwt_token_token_verify, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c
index b7d73639216..56360e550f4 100644
--- a/ext/phalcon/encryption/security/jwt/validator.zep.c
+++ b/ext/phalcon/encryption/security/jwt/validator.zep.c
@@ -15,9 +15,9 @@
 #include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/exception.h"
 #include "kernel/array.h"
 #include "kernel/fcall.h"
-#include "kernel/exception.h"
 #include "ext/spl/spl_exceptions.h"
 
 
@@ -39,6 +39,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Validator)
 {
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Encryption\\Security\\JWT, Validator, phalcon, encryption_security_jwt_validator, phalcon_encryption_security_jwt_validator_method_entry, 0);
 
+	/**
+	 * @var array
+	 */
+	zend_declare_property_null(phalcon_encryption_security_jwt_validator_ce, SL("errors"), ZEND_ACC_PRIVATE);
 	/**
 	 * @var int
 	 */
@@ -47,6 +51,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Validator)
 	 * @var Token
 	 */
 	zend_declare_property_null(phalcon_encryption_security_jwt_validator_ce, SL("token"), ZEND_ACC_PRIVATE);
+	phalcon_encryption_security_jwt_validator_ce->create_object = zephir_init_properties_Phalcon_Encryption_Security_JWT_Validator;
+
 	return SUCCESS;
 }
 
@@ -88,6 +94,15 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, __construct)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("timeShift"), &_0);
 }
 
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getErrors)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "errors");
+}
+
 /**
  * @param Token $token
  *
@@ -115,59 +130,101 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken)
 }
 
 /**
- * @param string $audience
+ * @param string|array $audience
  *
  * @return Validator
  * @throws ValidatorException
  */
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateAudience)
 {
+	zend_bool _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *audience_param = NULL, _0, _1, _2, _3, _4;
-	zval audience;
+	zval *audience = NULL, audience_sub, item, tokenAudience, _2, _3, _4, _5, *_6, _7, _1$$4, _8$$6, _9$$8;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&audience);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&audience_sub);
+	ZVAL_UNDEF(&item);
+	ZVAL_UNDEF(&tokenAudience);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_1$$4);
+	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_9$$8);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(audience)
+		Z_PARAM_ZVAL(audience)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &audience_param);
-	if (UNEXPECTED(Z_TYPE_P(audience_param) != IS_STRING && Z_TYPE_P(audience_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'audience' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(audience_param) == IS_STRING)) {
-		zephir_get_strval(&audience, audience_param);
-	} else {
-		ZEPHIR_INIT_VAR(&audience);
-	}
+	zephir_fetch_params(1, 1, 0, &audience);
+	ZEPHIR_SEPARATE_PARAM(audience);
 
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CALL_METHOD(&_1, &_0, "getclaims", NULL, 0);
+	_0 = Z_TYPE_P(audience) != IS_STRING;
+	if (_0) {
+		_0 = Z_TYPE_P(audience) != IS_ARRAY;
+	}
+	if (_0) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Audience must be a string or an array", "phalcon/Encryption/Security/JWT/Validator.zep", 83);
+		return;
+	}
+	if (Z_TYPE_P(audience) == IS_STRING) {
+		ZEPHIR_INIT_VAR(&_1$$4);
+		zephir_create_array(&_1$$4, 1, 0);
+		zephir_array_fast_append(&_1$$4, audience);
+		ZEPHIR_CPY_WRT(audience, &_1$$4);
+	}
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_3, &_2, "getclaims", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_3);
-	array_init(&_3);
 	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "aud");
-	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_4, &_3);
+	array_init(&_4);
+	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_STRING(&_5, "aud");
+	ZEPHIR_CALL_METHOD(&tokenAudience, &_3, "get", NULL, 0, &_5, &_4);
 	zephir_check_call_status();
-	if (!(zephir_fast_in_array(&audience, &_2))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: audience not allowed", "phalcon/Encryption/Security/JWT/Validator.zep", 71);
-		return;
+	zephir_is_iterable(audience, 0, "phalcon/Encryption/Security/JWT/Validator.zep", 98);
+	if (Z_TYPE_P(audience) == IS_ARRAY) {
+		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(audience), _6)
+		{
+			ZEPHIR_INIT_NVAR(&item);
+			ZVAL_COPY(&item, _6);
+			if (1 != zephir_fast_in_array(&item, &tokenAudience)) {
+				ZEPHIR_INIT_ZVAL_NREF(_8$$6);
+				ZEPHIR_INIT_NVAR(&_8$$6);
+				ZVAL_STRING(&_8$$6, "Validation: audience not allowed");
+				zephir_update_property_array_append(this_ptr, SL("errors"), &_8$$6);
+			}
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		ZEPHIR_CALL_METHOD(NULL, audience, "rewind", NULL, 0);
+		zephir_check_call_status();
+		while (1) {
+			ZEPHIR_CALL_METHOD(&_7, audience, "valid", NULL, 0);
+			zephir_check_call_status();
+			if (!zend_is_true(&_7)) {
+				break;
+			}
+			ZEPHIR_CALL_METHOD(&item, audience, "current", NULL, 0);
+			zephir_check_call_status();
+				if (1 != zephir_fast_in_array(&item, &tokenAudience)) {
+					ZEPHIR_INIT_ZVAL_NREF(_9$$8);
+					ZEPHIR_INIT_NVAR(&_9$$8);
+					ZVAL_STRING(&_9$$8, "Validation: audience not allowed");
+					zephir_update_property_array_append(this_ptr, SL("errors"), &_9$$8);
+				}
+			ZEPHIR_CALL_METHOD(NULL, audience, "next", NULL, 0);
+			zephir_check_call_status();
+		}
 	}
+	ZEPHIR_INIT_NVAR(&item);
 	RETURN_THIS();
 }
 
@@ -179,20 +236,22 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateAudience)
  */
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration)
 {
-	zend_bool _4;
+	zend_bool _7;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *timestamp_param = NULL, _0, _1, _2, _3, _5, _6, _7, _8;
-	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS;
+	zval *timestamp_param = NULL, _0, _1, _2, _3, _4, _5, _6, _8, _9, _10$$3;
+	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS, tokenExpirationTime = 0;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
-	ZVAL_UNDEF(&_7);
 	ZVAL_UNDEF(&_8);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_10$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -211,25 +270,28 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration)
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "exp");
-	ZEPHIR_CALL_METHOD(&_2, &_1, "has", NULL, 0, &_3);
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
-	_4 = zephir_is_true(&_2);
-	if (_4) {
-		ZVAL_LONG(&_6, timestamp);
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 264, &_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);
-		zephir_check_call_status();
-		ZEPHIR_INIT_NVAR(&_3);
-		ZVAL_STRING(&_3, "exp");
-		ZEPHIR_CALL_METHOD(&_8, &_7, "get", NULL, 0, &_3);
+	tokenExpirationTime = zephir_get_intval(&_2);
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_5, &_4, "getclaims", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_INIT_NVAR(&_3);
+	ZVAL_STRING(&_3, "exp");
+	ZEPHIR_CALL_METHOD(&_6, &_5, "has", NULL, 0, &_3);
+	zephir_check_call_status();
+	_7 = zephir_is_true(&_6);
+	if (_7) {
+		ZVAL_LONG(&_9, timestamp);
+		ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 264, &_9);
 		zephir_check_call_status();
-		_4 = ZEPHIR_GE_LONG(&_5, zephir_get_intval(&_8));
+		_7 = ZEPHIR_LT_LONG(&_8, tokenExpirationTime);
 	}
-	if (_4) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the token has expired", "phalcon/Encryption/Security/JWT/Validator.zep", 91);
-		return;
+	if (_7) {
+		ZEPHIR_INIT_ZVAL_NREF(_10$$3);
+		ZEPHIR_INIT_VAR(&_10$$3);
+		ZVAL_STRING(&_10$$3, "Validation: the token has expired");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_10$$3);
 	}
 	RETURN_THIS();
 }
@@ -244,16 +306,18 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *id_param = NULL, _0, _1, _2, _3;
+	zval *id_param = NULL, tokenId, _0, _1, _2, _3, _5$$3;
 	zval id, _4;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&id);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&tokenId);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_5$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -264,15 +328,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 1, 0, &id_param);
-	if (UNEXPECTED(Z_TYPE_P(id_param) != IS_STRING && Z_TYPE_P(id_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'id' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(id_param) == IS_STRING)) {
-		zephir_get_strval(&id, id_param);
-	} else {
-		ZEPHIR_INIT_VAR(&id);
-	}
+	zephir_get_strval(&id, id_param);
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
@@ -283,9 +339,12 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
 	zephir_cast_to_string(&_4, &_2);
-	if (!ZEPHIR_IS_IDENTICAL(&id, &_4)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: incorrect Id", "phalcon/Encryption/Security/JWT/Validator.zep", 108);
-		return;
+	ZEPHIR_CPY_WRT(&tokenId, &_4);
+	if (!ZEPHIR_IS_IDENTICAL(&id, &tokenId)) {
+		ZEPHIR_INIT_ZVAL_NREF(_5$$3);
+		ZEPHIR_INIT_VAR(&_5$$3);
+		ZVAL_STRING(&_5$$3, "Validation: incorrect Id");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_5$$3);
 	}
 	RETURN_THIS();
 }
@@ -299,8 +358,8 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *timestamp_param = NULL, _0, _1, _2, _3, _4;
-	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS;
+	zval *timestamp_param = NULL, _0, _1, _2, _3, _4, _5, _6$$3;
+	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS, tokenIssuedAt = 0;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -308,6 +367,8 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -321,19 +382,22 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt)
 	timestamp = zephir_get_intval(timestamp_param);
 
 
-	ZVAL_LONG(&_1, timestamp);
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 264, &_1);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_1, &_0, "getclaims", NULL, 0);
 	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);
+	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_STRING(&_3, "iat");
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "iat");
-	ZEPHIR_CALL_METHOD(&_3, &_2, "get", NULL, 0, &_4);
+	tokenIssuedAt = zephir_get_intval(&_2);
+	ZVAL_LONG(&_5, timestamp);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 264, &_5);
 	zephir_check_call_status();
-	if (ZEPHIR_LE_LONG(&_0, zephir_get_intval(&_3))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the token cannot be used yet (future)", "phalcon/Encryption/Security/JWT/Validator.zep", 125);
-		return;
+	if (ZEPHIR_LE_LONG(&_4, tokenIssuedAt)) {
+		ZEPHIR_INIT_ZVAL_NREF(_6$$3);
+		ZEPHIR_INIT_VAR(&_6$$3);
+		ZVAL_STRING(&_6$$3, "Validation: the token cannot be used yet (future)");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_6$$3);
 	}
 	RETURN_THIS();
 }
@@ -348,16 +412,18 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *issuer_param = NULL, _0, _1, _2, _3;
+	zval *issuer_param = NULL, tokenIssuer, _0, _1, _2, _3, _5$$3;
 	zval issuer, _4;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&issuer);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&tokenIssuer);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_5$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -387,9 +453,12 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer)
 	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
 	zephir_cast_to_string(&_4, &_2);
-	if (!ZEPHIR_IS_IDENTICAL(&issuer, &_4)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: incorrect issuer", "phalcon/Encryption/Security/JWT/Validator.zep", 142);
-		return;
+	ZEPHIR_CPY_WRT(&tokenIssuer, &_4);
+	if (!ZEPHIR_IS_IDENTICAL(&issuer, &tokenIssuer)) {
+		ZEPHIR_INIT_ZVAL_NREF(_5$$3);
+		ZEPHIR_INIT_VAR(&_5$$3);
+		ZVAL_STRING(&_5$$3, "Validation: incorrect issuer");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_5$$3);
 	}
 	RETURN_THIS();
 }
@@ -403,8 +472,8 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer)
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *timestamp_param = NULL, _0, _1, _2, _3, _4;
-	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS;
+	zval *timestamp_param = NULL, _0, _1, _2, _3, _4, _5, _6$$3;
+	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS, tokenNotBefore = 0;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -412,6 +481,8 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -425,19 +496,22 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore)
 	timestamp = zephir_get_intval(timestamp_param);
 
 
-	ZVAL_LONG(&_1, timestamp);
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 264, &_1);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_1, &_0, "getclaims", NULL, 0);
 	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);
+	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_STRING(&_3, "nbf");
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "nbf");
-	ZEPHIR_CALL_METHOD(&_3, &_2, "get", NULL, 0, &_4);
+	tokenNotBefore = zephir_get_intval(&_2);
+	ZVAL_LONG(&_5, timestamp);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 264, &_5);
 	zephir_check_call_status();
-	if (ZEPHIR_LE_LONG(&_0, zephir_get_intval(&_3))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the token cannot be used yet (not before)", "phalcon/Encryption/Security/JWT/Validator.zep", 159);
-		return;
+	if (ZEPHIR_LE_LONG(&_4, tokenNotBefore)) {
+		ZEPHIR_INIT_ZVAL_NREF(_6$$3);
+		ZEPHIR_INIT_VAR(&_6$$3);
+		ZVAL_STRING(&_6$$3, "Validation: the token cannot be used yet (not before)");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_6$$3);
 	}
 	RETURN_THIS();
 }
@@ -454,7 +528,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature)
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval passphrase;
-	zval *signer, signer_sub, *passphrase_param = NULL, _0, _1, _2, _3, _4, _5;
+	zval *signer, signer_sub, *passphrase_param = NULL, _0, _1, _2, _3, _4, _5, _6$$3;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&signer_sub);
@@ -464,6 +538,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6$$3);
 	ZVAL_UNDEF(&passphrase);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
@@ -489,9 +564,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, signer, "verify", NULL, 0, &_3, &_5, &passphrase);
 	zephir_check_call_status();
-	if (!zephir_is_true(&_0)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the signature does not match", "phalcon/Encryption/Security/JWT/Validator.zep", 183);
-		return;
+	if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) {
+		ZEPHIR_INIT_ZVAL_NREF(_6$$3);
+		ZEPHIR_INIT_VAR(&_6$$3);
+		ZVAL_STRING(&_6$$3, "Validation: the signature does not match");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_6$$3);
 	}
 	RETURN_THIS();
 }
@@ -524,3 +601,27 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getTimestamp)
 	RETURN_LONG((timestamp + zephir_get_numberval(&_0)));
 }
 
+zend_object *zephir_init_properties_Phalcon_Encryption_Security_JWT_Validator(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("errors"), 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("errors"), &_1$$3);
+		}
+		ZEPHIR_MM_RESTORE();
+		return Z_OBJ_P(this_ptr);
+	}
+}
+
diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.h b/ext/phalcon/encryption/security/jwt/validator.zep.h
index ccdfb7192ef..365642cf4fa 100644
--- a/ext/phalcon/encryption/security/jwt/validator.zep.h
+++ b/ext/phalcon/encryption/security/jwt/validator.zep.h
@@ -4,6 +4,7 @@ extern zend_class_entry *phalcon_encryption_security_jwt_validator_ce;
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Validator);
 
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, __construct);
+PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getErrors);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateAudience);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration);
@@ -13,18 +14,22 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature);
 PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getTimestamp);
+zend_object *zephir_init_properties_Phalcon_Encryption_Security_JWT_Validator(zend_class_entry *class_type);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, token, Phalcon\\Encryption\\Security\\JWT\\Token\\Token, 0)
 	ZEND_ARG_TYPE_INFO(0, timeShift, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_geterrors, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_settoken, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
 	ZEND_ARG_OBJ_INFO(0, token, Phalcon\\Encryption\\Security\\JWT\\Token\\Token, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_validateaudience, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
-	ZEND_ARG_TYPE_INFO(0, audience, IS_STRING, 0)
+	ZEND_ARG_INFO(0, audience)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_validateexpiration, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
@@ -56,8 +61,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_zephir_init_properties_phalcon_encryption_security_jwt_validator, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_validator_method_entry) {
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, __construct, arginfo_phalcon_encryption_security_jwt_validator___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, getErrors, arginfo_phalcon_encryption_security_jwt_validator_geterrors, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, setToken, arginfo_phalcon_encryption_security_jwt_validator_settoken, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, validateAudience, arginfo_phalcon_encryption_security_jwt_validator_validateaudience, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, validateExpiration, arginfo_phalcon_encryption_security_jwt_validator_validateexpiration, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/filter/validation/validator/digit.zep.c b/ext/phalcon/filter/validation/validator/digit.zep.c
index 9d576d6f9b4..6b966eefbb5 100644
--- a/ext/phalcon/filter/validation/validator/digit.zep.c
+++ b/ext/phalcon/filter/validation/validator/digit.zep.c
@@ -118,18 +118,20 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, __construct)
  */
 PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate)
 {
+	zval _2;
 	zend_bool _1;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *validation, validation_sub, *field, field_sub, value, _0, _2, _3;
+	zval *validation, validation_sub, *field, field_sub, value, _0, _3, _4;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&validation_sub);
 	ZVAL_UNDEF(&field_sub);
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_2);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
@@ -152,16 +154,17 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate)
 	}
 	_1 = Z_TYPE_P(&value) == IS_LONG;
 	if (!(_1)) {
-		ZEPHIR_CALL_FUNCTION(&_2, "ctype_digit", NULL, 297, &value);
+		zephir_cast_to_string(&_2, &value);
+		ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 297, &_2);
 		zephir_check_call_status();
-		_1 = zephir_is_true(&_2);
+		_1 = zephir_is_true(&_3);
 	}
 	if (_1) {
 		RETURN_MM_BOOL(1);
 	}
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "messagefactory", NULL, 0, validation, field);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "messagefactory", NULL, 0, validation, field);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_3);
+	ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_4);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(0);
 }
diff --git a/ext/phalcon/filter/validation/validator/numericality.zep.c b/ext/phalcon/filter/validation/validator/numericality.zep.c
index 74d99765825..4a347299232 100644
--- a/ext/phalcon/filter/validation/validator/numericality.zep.c
+++ b/ext/phalcon/filter/validation/validator/numericality.zep.c
@@ -161,7 +161,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Numericality, validate)
 	zephir_fast_str_replace(&_1, &_2, &_3, &value);
 	ZEPHIR_CPY_WRT(&value, &_1);
 	ZEPHIR_INIT_VAR(&pattern);
-	ZVAL_STRING(&pattern, "/((^[-]?[0-9,]+(.[0-9]+)?$)|(^[-]?[0-9.]+(,[0-9]+)?$))/");
+	ZVAL_STRING(&pattern, "/((^[-]?[0-9,]+(\\.[0-9]+)?$)|(^[-]?[0-9.]+(,[0-9]+)?$))/");
 	ZEPHIR_CALL_METHOD(&_4, this_ptr, "allowempty", NULL, 0, field, &value);
 	zephir_check_call_status();
 	if (zephir_is_true(&_4)) {
diff --git a/ext/phalcon/flash/abstractflash.zep.c b/ext/phalcon/flash/abstractflash.zep.c
index 9bdafc49e6f..c5d7c2894dd 100644
--- a/ext/phalcon/flash/abstractflash.zep.c
+++ b/ext/phalcon/flash/abstractflash.zep.c
@@ -638,7 +638,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL, *_5 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *type_param = NULL, *message = NULL, message_sub, content, html, item, prepared, *_2, _3, _8, _1$$4, _6$$5, _7$$8;
+	zval *type_param = NULL, *message = NULL, message_sub, content, html, item, prepared, *_2, _3, _1$$4, _6$$5, _7$$8;
 	zval type;
 	zval *this_ptr = getThis();
 
@@ -649,7 +649,6 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 	ZVAL_UNDEF(&item);
 	ZVAL_UNDEF(&prepared);
 	ZVAL_UNDEF(&_3);
-	ZVAL_UNDEF(&_8);
 	ZVAL_UNDEF(&_1$$4);
 	ZVAL_UNDEF(&_6$$5);
 	ZVAL_UNDEF(&_7$$8);
@@ -729,11 +728,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&item);
-	zephir_read_property(&_8, this_ptr, ZEND_STRL("implicitFlush"), PH_NOISY_CC | PH_READONLY);
-	if (!ZEPHIR_IS_TRUE_IDENTICAL(&_8)) {
-		RETURN_CCTOR(&content);
-	}
-	RETURN_MM_NULL();
+	RETURN_CCTOR(&content);
 }
 
 /**
@@ -1000,7 +995,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, checkClasses)
 	ZVAL_STRING(&content, "");
 	if (zephir_array_isset(&collection, &type)) {
 		ZEPHIR_OBS_NVAR(&content);
-		zephir_array_fetch(&content, &collection, &type, PH_NOISY, "phalcon/Flash/AbstractFlash.zep", 448);
+		zephir_array_fetch(&content, &collection, &type, PH_NOISY, "phalcon/Flash/AbstractFlash.zep", 444);
 	}
 	if (1 != ZEPHIR_IS_EMPTY(&content)) {
 		if (Z_TYPE_P(&content) != IS_ARRAY) {
diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c
index ae10778d8f5..01368396a1d 100644
--- a/ext/phalcon/forms/form.zep.c
+++ b/ext/phalcon/forms/form.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
+#include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
 #include "kernel/array.h"
@@ -95,28 +95,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Forms_Form)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Forms_Form, getValidation)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "validation");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Forms_Form, getWhitelist)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "whitelist");
-}
-
 /**
  * Phalcon\Forms\Form constructor
  */
@@ -1212,6 +1190,30 @@ PHP_METHOD(Phalcon_Forms_Form, getValue)
 	RETURN_MM_NULL();
 }
 
+/**
+ * return ValidationInterface|null
+ */
+PHP_METHOD(Phalcon_Forms_Form, getValidation)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "validation");
+}
+
+/**
+ * return array
+ */
+PHP_METHOD(Phalcon_Forms_Form, getWhitelist)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "whitelist");
+}
+
 /**
  * Check if the form contains an element
  */
@@ -1412,7 +1414,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid)
 		zephir_check_call_status();
 	}
 	zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_8, 0, "phalcon/Forms/Form.zep", 698);
+	zephir_is_iterable(&_8, 0, "phalcon/Forms/Form.zep", 714);
 	if (Z_TYPE_P(&_8) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_8), _9)
 		{
@@ -1425,7 +1427,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid)
 			}
 			ZEPHIR_CALL_METHOD(&name, &element, "getname", NULL, 0);
 			zephir_check_call_status();
-			zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 685);
+			zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 701);
 			if (Z_TYPE_P(&validators) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _11$$10)
 				{
@@ -1477,7 +1479,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid)
 				}
 				ZEPHIR_CALL_METHOD(&name, &element, "getname", NULL, 0);
 				zephir_check_call_status();
-				zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 685);
+				zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 701);
 				if (Z_TYPE_P(&validators) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _15$$15)
 					{
@@ -1615,7 +1617,7 @@ PHP_METHOD(Phalcon_Forms_Form, label)
 		ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form");
 		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 748);
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 764);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -1692,7 +1694,7 @@ PHP_METHOD(Phalcon_Forms_Form, render)
 		ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form");
 		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 772);
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 788);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
diff --git a/ext/phalcon/forms/form.zep.h b/ext/phalcon/forms/form.zep.h
index ad501f307ea..b7fc1e55206 100644
--- a/ext/phalcon/forms/form.zep.h
+++ b/ext/phalcon/forms/form.zep.h
@@ -3,8 +3,6 @@ extern zend_class_entry *phalcon_forms_form_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Forms_Form);
 
-PHP_METHOD(Phalcon_Forms_Form, getValidation);
-PHP_METHOD(Phalcon_Forms_Form, getWhitelist);
 PHP_METHOD(Phalcon_Forms_Form, __construct);
 PHP_METHOD(Phalcon_Forms_Form, add);
 PHP_METHOD(Phalcon_Forms_Form, bind);
@@ -24,6 +22,8 @@ PHP_METHOD(Phalcon_Forms_Form, getTagFactory);
 PHP_METHOD(Phalcon_Forms_Form, getUserOption);
 PHP_METHOD(Phalcon_Forms_Form, getUserOptions);
 PHP_METHOD(Phalcon_Forms_Form, getValue);
+PHP_METHOD(Phalcon_Forms_Form, getValidation);
+PHP_METHOD(Phalcon_Forms_Form, getWhitelist);
 PHP_METHOD(Phalcon_Forms_Form, has);
 PHP_METHOD(Phalcon_Forms_Form, hasMessagesFor);
 PHP_METHOD(Phalcon_Forms_Form, isValid);
@@ -44,12 +44,6 @@ PHP_METHOD(Phalcon_Forms_Form, setUserOptions);
 PHP_METHOD(Phalcon_Forms_Form, valid);
 zend_object *zephir_init_properties_Phalcon_Forms_Form(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getvalidation, 0, 0, IS_NULL, 1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getwhitelist, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, entity)
 #if PHP_VERSION_ID >= 80000
@@ -85,7 +79,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
@@ -135,6 +129,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_getvalue, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_getvalidation, 0, 0, Phalcon\\Filter\\Validation\\ValidationInterface, 1)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getwhitelist, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_has, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -224,8 +224,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_zephir_init_properties_phalcon
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) {
-	PHP_ME(Phalcon_Forms_Form, getValidation, arginfo_phalcon_forms_form_getvalidation, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Forms_Form, getWhitelist, arginfo_phalcon_forms_form_getwhitelist, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, __construct, arginfo_phalcon_forms_form___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Forms_Form, add, arginfo_phalcon_forms_form_add, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, bind, arginfo_phalcon_forms_form_bind, ZEND_ACC_PUBLIC)
@@ -253,6 +251,8 @@ ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) {
 	PHP_ME(Phalcon_Forms_Form, getUserOption, arginfo_phalcon_forms_form_getuseroption, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, getUserOptions, arginfo_phalcon_forms_form_getuseroptions, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, getValue, arginfo_phalcon_forms_form_getvalue, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Forms_Form, getValidation, arginfo_phalcon_forms_form_getvalidation, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Forms_Form, getWhitelist, arginfo_phalcon_forms_form_getwhitelist, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, has, arginfo_phalcon_forms_form_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, hasMessagesFor, arginfo_phalcon_forms_form_hasmessagesfor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, isValid, arginfo_phalcon_forms_form_isvalid, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/html/link/abstractlink.zep.c b/ext/phalcon/html/link/abstractlink.zep.c
index 97d3cd71c25..2e0f93ee298 100644
--- a/ext/phalcon/html/link/abstractlink.zep.c
+++ b/ext/phalcon/html/link/abstractlink.zep.c
@@ -277,8 +277,8 @@ PHP_METHOD(Phalcon_Html_Link_AbstractLink, hrefIsTemplated)
 }
 
 /**
- * @param string $key
- * @param mixed  $value
+ * @param string       $key
+ * @param string|array $value
  *
  * @return mixed
  */
diff --git a/ext/phalcon/html/link/evolvablelink.zep.c b/ext/phalcon/html/link/evolvablelink.zep.c
index 178a16812f1..6ac755087f5 100644
--- a/ext/phalcon/html/link/evolvablelink.zep.c
+++ b/ext/phalcon/html/link/evolvablelink.zep.c
@@ -48,8 +48,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Link_EvolvableLink)
  * If the specified attribute is already present, it will be overwritten
  * with the new value.
  *
- * @param string $attribute The attribute to include.
- * @param string $value     The value of the attribute to set.
+ * @param string       $attribute The attribute to include.
+ * @param string|array $value     The value of the attribute to set.
  */
 PHP_METHOD(Phalcon_Html_Link_EvolvableLink, withAttribute)
 {
diff --git a/ext/phalcon/html/tagfactory.zep.c b/ext/phalcon/html/tagfactory.zep.c
index 48194544975..0140a13c8cf 100644
--- a/ext/phalcon/html/tagfactory.zep.c
+++ b/ext/phalcon/html/tagfactory.zep.c
@@ -41,47 +41,47 @@
  * @property EscaperInterface $escaper
  * @property array            $services
  *
- * @method a(string $href, string $text, array $attributes = [], bool $raw = false): string
- * @method base(string $href, array $attributes = []): string
- * @method body(array $attributes = []): string
- * @method button(string $text, array $attributes = [], bool $raw = false): string
- * @method close(string $tag, bool $raw = false): string
- * @method doctype(int $flag, string $delimiter): string
- * @method element(string $tag, string $text, array $attributes = [], bool $raw = false): string
- * @method form(array $attributes = []): string
- * @method img(string $src, array $attributes = []): string
- * @method inputCheckbox(string $name, string $value = null, array $attributes = []): string
- * @method inputColor(string $name, string $value = null, array $attributes = []): string
- * @method inputDate(string $name, string $value = null, array $attributes = []): string
- * @method inputDateTime(string $name, string $value = null, array $attributes = []): string
- * @method inputDateTimeLocal(string $name, string $value = null, array $attributes = []): string
- * @method inputEmail(string $name, string $value = null, array $attributes = []): string
- * @method inputFile(string $name, string $value = null, array $attributes = []): string
- * @method inputHidden(string $name, string $value = null, array $attributes = []): string
- * @method inputImage(string $name, string $value = null, array $attributes = []): string
- * @method inputInput(string $name, string $value = null, array $attributes = []): string
- * @method inputMonth(string $name, string $value = null, array $attributes = []): string
- * @method inputNumeric(string $name, string $value = null, array $attributes = []): string
- * @method inputPassword(string $name, string $value = null, array $attributes = []): string
- * @method inputRadio(string $name, string $value = null, array $attributes = []): string
- * @method inputRange(string $name, string $value = null, array $attributes = []): string
- * @method inputSearch(string $name, string $value = null, array $attributes = []): string
- * @method inputSelect(string $name, string $value = null, array $attributes = []): string
- * @method inputSubmit(string $name, string $value = null, array $attributes = []): string
- * @method inputTel(string $name, string $value = null, array $attributes = []): string
- * @method inputText(string $name, string $value = null, array $attributes = []): string
- * @method inputTextarea(string $name, string $value = null, array $attributes = []): string
- * @method inputTime(string $name, string $value = null, array $attributes = []): string
- * @method inputUrl(string $name, string $value = null, array $attributes = []): string
- * @method inputWeek(string $name, string $value = null, array $attributes = []): string
- * @method label(string $label, array $attributes = [], bool $raw = false): string
- * @method link(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method meta(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method ol(string $text, array $attributes = [], bool $raw = false): string
- * @method script(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method style(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method title(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method ul(string $text, array $attributes = [], bool $raw = false): string
+ * @method string a(string $href, string $text, array $attributes = [], bool $raw = false)
+ * @method string base(string $href, array $attributes = [])
+ * @method string body(array $attributes = [])
+ * @method string button(string $text, array $attributes = [], bool $raw = false)
+ * @method string close(string $tag, bool $raw = false)
+ * @method string doctype(int $flag, string $delimiter)
+ * @method string element(string $tag, string $text, array $attributes = [], bool $raw = false)
+ * @method string form(array $attributes = [])
+ * @method string img(string $src, array $attributes = [])
+ * @method string inputCheckbox(string $name, string $value = null, array $attributes = [])
+ * @method string inputColor(string $name, string $value = null, array $attributes = [])
+ * @method string inputDate(string $name, string $value = null, array $attributes = [])
+ * @method string inputDateTime(string $name, string $value = null, array $attributes = [])
+ * @method string inputDateTimeLocal(string $name, string $value = null, array $attributes = [])
+ * @method string inputEmail(string $name, string $value = null, array $attributes = [])
+ * @method string inputFile(string $name, string $value = null, array $attributes = [])
+ * @method string inputHidden(string $name, string $value = null, array $attributes = [])
+ * @method string inputImage(string $name, string $value = null, array $attributes = [])
+ * @method string inputInput(string $name, string $value = null, array $attributes = [])
+ * @method string inputMonth(string $name, string $value = null, array $attributes = [])
+ * @method string inputNumeric(string $name, string $value = null, array $attributes = [])
+ * @method string inputPassword(string $name, string $value = null, array $attributes = [])
+ * @method string inputRadio(string $name, string $value = null, array $attributes = [])
+ * @method string inputRange(string $name, string $value = null, array $attributes = [])
+ * @method string inputSearch(string $name, string $value = null, array $attributes = [])
+ * @method string inputSelect(string $name, string $value = null, array $attributes = [])
+ * @method string inputSubmit(string $name, string $value = null, array $attributes = [])
+ * @method string inputTel(string $name, string $value = null, array $attributes = [])
+ * @method string inputText(string $name, string $value = null, array $attributes = [])
+ * @method string inputTextarea(string $name, string $value = null, array $attributes = [])
+ * @method string inputTime(string $name, string $value = null, array $attributes = [])
+ * @method string inputUrl(string $name, string $value = null, array $attributes = [])
+ * @method string inputWeek(string $name, string $value = null, array $attributes = [])
+ * @method string label(string $label, array $attributes = [], bool $raw = false)
+ * @method string link(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string meta(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string ol(string $text, array $attributes = [], bool $raw = false)
+ * @method string script(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string style(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string title(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string ul(string $text, array $attributes = [], bool $raw = false)
  */
 ZEPHIR_INIT_CLASS(Phalcon_Html_TagFactory)
 {
diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c
index c7f2cb05c41..367946f646d 100644
--- a/ext/phalcon/logger/adapter/stream.zep.c
+++ b/ext/phalcon/logger/adapter/stream.zep.c
@@ -18,9 +18,9 @@
 #include "kernel/fcall.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
-#include "kernel/file.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/concat.h"
+#include "kernel/file.h"
 
 
 /**
@@ -46,7 +46,6 @@
  * $logger->close();
  *```
  *
- * @property resource|null $handler
  * @property string        $mode
  * @property string        $name
  * @property array         $options
@@ -55,12 +54,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Adapter, Stream, phalcon, logger_adapter_stream, phalcon_logger_adapter_abstractadapter_ce, phalcon_logger_adapter_stream_method_entry, 0);
 
-	/**
-	 * Stream handler resource
-	 *
-	 * @var resource|null
-	 */
-	zend_declare_property_null(phalcon_logger_adapter_stream_ce, SL("handler"), ZEND_ACC_PROTECTED);
 	/**
 	 * The file open mode. Defaults to 'ab'
 	 *
@@ -139,7 +132,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
 
 	if (1 == zephir_array_isset_string(&options, SL("mode"))) {
 		ZEPHIR_OBS_VAR(&mode);
-		zephir_array_fetch_string(&mode, &options, SL("mode"), PH_NOISY, "phalcon/Logger/Adapter/Stream.zep", 82);
+		zephir_array_fetch_string(&mode, &options, SL("mode"), PH_NOISY, "phalcon/Logger/Adapter/Stream.zep", 74);
 	} else {
 		ZEPHIR_INIT_NVAR(&mode);
 		ZVAL_STRING(&mode, "ab");
@@ -149,7 +142,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
 	ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 82, &mode, &_0);
 	zephir_check_call_status();
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 84);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 76);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name);
@@ -162,24 +155,11 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
  */
 PHP_METHOD(Phalcon_Logger_Adapter_Stream, close)
 {
-	zend_bool result;
-	zval __$null, _0, _1$$3;
 	zval *this_ptr = getThis();
 
-	ZVAL_NULL(&__$null);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-
 
 
-	result = 1;
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_RESOURCE) {
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-		result = zephir_fclose(&_1$$3);
-	}
-	zephir_update_property_zval(this_ptr, ZEND_STRL("handler"), &__$null);
-	RETURN_BOOL(result);
+	RETURN_BOOL(1);
 }
 
 /**
@@ -191,24 +171,21 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *item, item_sub, __$null, message, _0, _9, _10, _11, _1$$3, _2$$3, _3$$3, _4$$3, _5$$4, _6$$4, _7$$4, _8$$4;
+	zval *item, item_sub, handler, message, _0, _1, _6, _7, _8, _2$$3, _3$$3, _4$$3, _5$$3;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&item_sub);
-	ZVAL_NULL(&__$null);
+	ZVAL_UNDEF(&handler);
 	ZVAL_UNDEF(&message);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_9);
-	ZVAL_UNDEF(&_10);
-	ZVAL_UNDEF(&_11);
-	ZVAL_UNDEF(&_1$$3);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_8);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-	ZVAL_UNDEF(&_5$$4);
-	ZVAL_UNDEF(&_6$$4);
-	ZVAL_UNDEF(&_7$$4);
-	ZVAL_UNDEF(&_8$$4);
+	ZVAL_UNDEF(&_5$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -221,37 +198,34 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process)
 	zephir_fetch_params(1, 1, 0, &item);
 
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-	if (!(Z_TYPE_P(&_0) == IS_RESOURCE)) {
-		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY);
-		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "phpfopen", NULL, 0, &_2$$3, &_3$$3);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&handler, this_ptr, "phpfopen", NULL, 0, &_0, &_1);
+	zephir_check_call_status();
+	if (!(Z_TYPE_P(&handler) == IS_RESOURCE)) {
+		ZEPHIR_INIT_VAR(&_2$$3);
+		object_init_ex(&_2$$3, spl_ce_LogicException);
+		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_5$$3);
+		ZEPHIR_CONCAT_SVSVS(&_5$$3, "The file '", &_3$$3, "' cannot be opened with mode '", &_4$$3, "'");
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 408, &_5$$3);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("handler"), &_1$$3);
-		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-		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_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);
-			ZEPHIR_CONCAT_SVSVS(&_8$$4, "The file '", &_6$$4, "' cannot be opened with mode '", &_7$$4, "'");
-			ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 408, &_8$$4);
-			zephir_check_call_status();
-			zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 128);
-			ZEPHIR_MM_RESTORE();
-			return;
-		}
+		zephir_throw_exception_debug(&_2$$3, "phalcon/Logger/Adapter/Stream.zep", 109);
+		ZEPHIR_MM_RESTORE();
+		return;
 	}
-	ZEPHIR_CALL_METHOD(&_9, this_ptr, "getformatteditem", NULL, 0, item);
+	ZVAL_LONG(&_6, 2);
+	ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 127, &handler, &_6);
+	zephir_check_call_status();
+	ZEPHIR_CALL_METHOD(&_7, this_ptr, "getformatteditem", NULL, 0, item);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_10);
-	ZEPHIR_GET_CONSTANT(&_10, "PHP_EOL");
+	ZEPHIR_INIT_VAR(&_8);
+	ZEPHIR_GET_CONSTANT(&_8, "PHP_EOL");
 	ZEPHIR_INIT_VAR(&message);
-	ZEPHIR_CONCAT_VV(&message, &_9, &_10);
-	zephir_read_property(&_11, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-	zephir_fwrite(NULL, &_11, &message);
+	ZEPHIR_CONCAT_VV(&message, &_7, &_8);
+	zephir_fwrite(NULL, &handler, &message);
+	zephir_fclose(&handler);
 	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/phalcon/messages/messages.zep.h b/ext/phalcon/messages/messages.zep.h
index 63991220055..4c24cc42012 100644
--- a/ext/phalcon/messages/messages.zep.h
+++ b/ext/phalcon/messages/messages.zep.h
@@ -61,7 +61,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/micro.zep.h b/ext/phalcon/mvc/micro.zep.h
index 1f07723c876..34a1bb68cd8 100644
--- a/ext/phalcon/mvc/micro.zep.h
+++ b/ext/phalcon/mvc/micro.zep.h
@@ -144,7 +144,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c
index 0aa20619abb..f2408020770 100644
--- a/ext/phalcon/mvc/model.zep.c
+++ b/ext/phalcon/mvc/model.zep.c
@@ -13,11 +13,11 @@
 
 #include "kernel/main.h"
 #include "ext/json/php_json.h"
-#include "kernel/object.h"
+#include "kernel/operators.h"
 #include "kernel/fcall.h"
 #include "kernel/exception.h"
+#include "kernel/object.h"
 #include "kernel/memory.h"
-#include "kernel/operators.h"
 #include "kernel/concat.h"
 #include "kernel/string.h"
 #include "kernel/array.h"
@@ -156,17 +156,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Model, getTransaction)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "transaction");
-}
-
 /**
  * Phalcon\Mvc\Model constructor
  */
@@ -215,23 +204,23 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct)
 	}
 
 
-	if (Z_TYPE_P(container) != IS_OBJECT) {
+	if (Z_TYPE_P(container) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(container, phalcon_di_di_ce, "getdefault", &_0, 0);
 		zephir_check_call_status();
 	}
-	if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
+	if (Z_TYPE_P(container) == IS_NULL) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 183);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("container"), container);
-	if (Z_TYPE_P(modelsManager) != IS_OBJECT) {
+	if (Z_TYPE_P(modelsManager) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_2$$5);
 		ZVAL_STRING(&_2$$5, "modelsManager");
 		ZEPHIR_CALL_METHOD(&_1$$5, container, "getshared", NULL, 0, &_2$$5);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(modelsManager, &_1$$5);
-		if (UNEXPECTED(Z_TYPE_P(modelsManager) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 197);
+		if (Z_TYPE_P(modelsManager) == IS_NULL) {
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 196);
 			return;
 		}
 	}
@@ -312,7 +301,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call)
 	ZEPHIR_CONCAT_SVSVS(&_3, "The method '", &method, "' doesn't exist on model '", &modelName, "'");
 	ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 29, &_3);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 266);
+	zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 265);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -367,7 +356,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic)
 	ZEPHIR_CONCAT_SVSVS(&_2, "The method '", &method, "' doesn't exist on model '", &modelName, "'");
 	ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 29, &_2);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 292);
+	zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 291);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -433,7 +422,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __get)
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
 		if (zephir_array_isset(&_1$$3, &lowerProperty)) {
 			zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
-			zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 324);
+			zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 323);
 			RETURN_CTOR(&_3$$4);
 		}
 		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getrelated", NULL, 0, &lowerProperty);
@@ -698,7 +687,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 				if (ZEPHIR_IS_LONG(&_5$$7, 2) || ZEPHIR_IS_LONG(&_5$$7, 4)) {
 					ZEPHIR_INIT_VAR(&related);
 					array_init(&related);
-					zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 495);
+					zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 494);
 					if (Z_TYPE_P(value) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(value), _9$$10)
 						{
@@ -706,7 +695,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 							ZVAL_COPY(&item, _9$$10);
 							if (Z_TYPE_P(&item) == IS_OBJECT) {
 								if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) {
-									zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 490);
+									zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 489);
 								}
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -723,7 +712,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 							zephir_check_call_status();
 								if (Z_TYPE_P(&item) == IS_OBJECT) {
 									if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) {
-										zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 490);
+										zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 489);
 									}
 								}
 							ZEPHIR_CALL_METHOD(NULL, value, "next", NULL, 0);
@@ -771,7 +760,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 			ZEPHIR_CONCAT_SVS(&_18$$21, "Cannot access property '", &property, "' (not public).");
 			ZEPHIR_CALL_METHOD(NULL, &_17$$21, "__construct", NULL, 29, &_18$$21);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 524);
+			zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 523);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -829,7 +818,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&container) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 553);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 552);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
@@ -839,7 +828,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_2);
 	if (Z_TYPE_P(&manager) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 568);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 567);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager);
@@ -847,7 +836,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&properties);
 	if (zephir_array_isset_string_fetch(&properties, &data, SL("attributes"), 0)) {
-		zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 591);
+		zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 590);
 		if (Z_TYPE_P(&properties) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$6, _7$$6, _4$$6)
 			{
@@ -1122,7 +1111,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 	if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&dataMapped);
 		array_init(&dataMapped);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 751);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 750);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -1179,7 +1168,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 	}
 	ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 808);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 807);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -1204,7 +1193,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 						ZEPHIR_CONCAT_SVS(&_11$$16, "Column '", &attribute, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_10$$16, "__construct", &_12, 29, &_11$$16);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 782);
+						zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 781);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1261,7 +1250,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 							ZEPHIR_CONCAT_SVS(&_19$$26, "Column '", &attribute, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_18$$26, "__construct", &_12, 29, &_19$$26);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 782);
+							zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 781);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1430,7 +1419,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 	ZVAL_LONG(&_0, dirtyState);
 	ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0);
 	zephir_check_call_status();
-	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 898);
+	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 897);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1)
 		{
@@ -1443,7 +1432,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
 			if (UNEXPECTED(Z_TYPE_P(&key) != IS_STRING)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 888);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 887);
 				return;
 			}
 			zephir_update_property_zval_zval(&instance, &key, &value);
@@ -1462,7 +1451,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 			ZEPHIR_CALL_METHOD(&value, &data, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&key) != IS_STRING)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 888);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 887);
 					return;
 				}
 				zephir_update_property_zval_zval(&instance, &key, &value);
@@ -1575,7 +1564,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 	ZVAL_LONG(&_0, dirtyState);
 	ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0);
 	zephir_check_call_status();
-	zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1031);
+	zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1030);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1)
 		{
@@ -1614,7 +1603,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 							ZEPHIR_CONCAT_SVS(&_7$$9, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_6$$9, "__construct", &_8, 29, &_7$$9);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 958);
+							zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 957);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1628,7 +1617,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 						ZEPHIR_CONCAT_SVS(&_10$$11, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_10$$11);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 967);
+						zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 966);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1644,7 +1633,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 				_11$$3 = Z_TYPE_P(&value) != IS_NULL;
 			}
 			if (_11$$3) {
-				zephir_array_fetch_long(&_12$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 981);
+				zephir_array_fetch_long(&_12$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 980);
 				do {
 					if (ZEPHIR_IS_LONG(&_12$$13, 0) || ZEPHIR_IS_LONG(&_12$$13, 21) || ZEPHIR_IS_LONG(&_12$$13, 22) || ZEPHIR_IS_LONG(&_12$$13, 26)) {
 						ZVAL_LONG(&_13$$14, 10);
@@ -1667,7 +1656,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 				} while(0);
 
 			} else {
-				zephir_array_fetch_long(&_15$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1004);
+				zephir_array_fetch_long(&_15$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1003);
 				do {
 					if (ZEPHIR_IS_LONG(&_15$$18, 14) || ZEPHIR_IS_LONG(&_15$$18, 8) || ZEPHIR_IS_LONG(&_15$$18, 3) || ZEPHIR_IS_LONG(&_15$$18, 9) || ZEPHIR_IS_LONG(&_15$$18, 7) || ZEPHIR_IS_LONG(&_15$$18, 0) || ZEPHIR_IS_LONG(&_15$$18, 21) || ZEPHIR_IS_LONG(&_15$$18, 22) || ZEPHIR_IS_LONG(&_15$$18, 26)) {
 						ZEPHIR_INIT_NVAR(&castValue);
@@ -1680,7 +1669,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 
 			}
 			ZEPHIR_OBS_NVAR(&attributeName);
-			zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1023);
+			zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1022);
 			zephir_update_property_zval_zval(&instance, &attributeName, &castValue);
 			zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
@@ -1724,7 +1713,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 								ZEPHIR_CONCAT_SVS(&_18$$27, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_18$$27);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 958);
+								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 957);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -1738,7 +1727,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 							ZEPHIR_CONCAT_SVS(&_20$$29, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$29, "__construct", &_8, 29, &_20$$29);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 967);
+							zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 966);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1754,7 +1743,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 					_21$$21 = Z_TYPE_P(&value) != IS_NULL;
 				}
 				if (_21$$21) {
-					zephir_array_fetch_long(&_22$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 981);
+					zephir_array_fetch_long(&_22$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 980);
 					do {
 						if (ZEPHIR_IS_LONG(&_22$$31, 0) || ZEPHIR_IS_LONG(&_22$$31, 21) || ZEPHIR_IS_LONG(&_22$$31, 22) || ZEPHIR_IS_LONG(&_22$$31, 26)) {
 							ZVAL_LONG(&_23$$32, 10);
@@ -1777,7 +1766,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 					} while(0);
 
 				} else {
-					zephir_array_fetch_long(&_24$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1004);
+					zephir_array_fetch_long(&_24$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1003);
 					do {
 						if (ZEPHIR_IS_LONG(&_24$$36, 14) || ZEPHIR_IS_LONG(&_24$$36, 8) || ZEPHIR_IS_LONG(&_24$$36, 3) || ZEPHIR_IS_LONG(&_24$$36, 9) || ZEPHIR_IS_LONG(&_24$$36, 7) || ZEPHIR_IS_LONG(&_24$$36, 0) || ZEPHIR_IS_LONG(&_24$$36, 21) || ZEPHIR_IS_LONG(&_24$$36, 22) || ZEPHIR_IS_LONG(&_24$$36, 26)) {
 							ZEPHIR_INIT_NVAR(&castValue);
@@ -1790,7 +1779,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 
 				}
 				ZEPHIR_OBS_NVAR(&attributeName);
-				zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1023);
+				zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1022);
 				zephir_update_property_zval_zval(&instance, &attributeName, &castValue);
 				zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &data, "next", NULL, 0);
@@ -1872,7 +1861,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 	}
 	ZEPHIR_INIT_VAR(&hydrateArray);
 	array_init(&hydrateArray);
-	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1115);
+	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1114);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2, _3, _0)
 		{
@@ -1906,7 +1895,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 						ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_9, 29, &_8$$10);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1094);
+						zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1093);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1914,7 +1903,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 				}
 				if (Z_TYPE_P(&attribute) == IS_ARRAY) {
 					ZEPHIR_OBS_NVAR(&attributeName);
-					zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1104);
+					zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1103);
 				} else {
 					ZEPHIR_CPY_WRT(&attributeName, &attribute);
 				}
@@ -1958,7 +1947,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 							ZEPHIR_CONCAT_SVS(&_13$$19, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$19, "__construct", &_9, 29, &_13$$19);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1094);
+							zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1093);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1966,7 +1955,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 					}
 					if (Z_TYPE_P(&attribute) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&attributeName);
-						zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1104);
+						zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1103);
 					} else {
 						ZEPHIR_CPY_WRT(&attributeName, &attribute);
 					}
@@ -2021,7 +2010,7 @@ PHP_METHOD(Phalcon_Mvc_Model, collectRelatedToSave)
 	ZEPHIR_CPY_WRT(&related, &_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&dirtyRelated, &_1);
-	zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1156);
+	zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1155);
 	if (Z_TYPE_P(&related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&related), _4, _5, _2)
 		{
@@ -2329,10 +2318,10 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 		ZVAL_NULL(&columnMap);
 	}
 	if (UNEXPECTED(!(zephir_fast_count_int(&primaryKeys)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 1309);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 1308);
 		return;
 	}
-	zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1357);
+	zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1356);
 	if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _3)
 		{
@@ -2346,7 +2335,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 				ZEPHIR_CONCAT_SVS(&_6$$9, "Column '", &primaryKey, "' have not defined a bind data type");
 				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_7, 29, &_6$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1323);
+				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1322);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -2359,7 +2348,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_9$$11, "Column '", &primaryKey, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_7, 29, &_9$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1333);
+					zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1332);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -2374,17 +2363,17 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 				ZEPHIR_CONCAT_SVS(&_11$$13, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set");
 				ZEPHIR_CALL_METHOD(NULL, &_10$$13, "__construct", &_7, 29, &_11$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1346);
+				zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1345);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
 			ZEPHIR_CALL_METHOD(&_12$$8, &writeConnection, "escapeidentifier", &_13, 0, &primaryKey);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_14$$8);
 			ZEPHIR_CONCAT_VS(&_14$$8, &_12$$8, " = ?");
-			zephir_array_append(&conditions, &_14$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
-			zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1354);
+			zephir_array_append(&conditions, &_14$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
+			zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -2405,7 +2394,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_16$$15, "Column '", &primaryKey, "' have not defined a bind data type");
 					ZEPHIR_CALL_METHOD(NULL, &_15$$15, "__construct", &_7, 29, &_16$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1323);
+					zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1322);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -2418,7 +2407,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 						ZEPHIR_CONCAT_SVS(&_18$$17, "Column '", &primaryKey, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_17$$17, "__construct", &_7, 29, &_18$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1333);
+						zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1332);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -2433,17 +2422,17 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_20$$19, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set");
 					ZEPHIR_CALL_METHOD(NULL, &_19$$19, "__construct", &_7, 29, &_20$$19);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1346);
+					zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1345);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
 				ZEPHIR_CALL_METHOD(&_21$$14, &writeConnection, "escapeidentifier", &_22, 0, &primaryKey);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_23$$14);
 				ZEPHIR_CONCAT_VS(&_23$$14, &_21$$14, " = ?");
-				zephir_array_append(&conditions, &_23$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
-				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1354);
+				zephir_array_append(&conditions, &_23$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
+				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
 			ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -2741,7 +2730,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find)
 		ZEPHIR_INIT_VAR(&params);
 		array_init(&params);
 		if (Z_TYPE_P(parameters) != IS_NULL) {
-			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1618);
+			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1617);
 		}
 	} else {
 		ZEPHIR_CPY_WRT(&params, parameters);
@@ -2893,7 +2882,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst)
 		zephir_array_fast_append(&_1$$5, parameters);
 		ZEPHIR_CPY_WRT(&params, &_1$$5);
 	} else {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/Mvc/Model.zep", 1742);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/Mvc/Model.zep", 1741);
 		return;
 	}
 	ZVAL_LONG(&_3, 1);
@@ -3044,7 +3033,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&snapshot, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 1828);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 1827);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0);
@@ -3060,7 +3049,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 	ZEPHIR_INIT_VAR(&changed);
 	array_init(&changed);
 	ZEPHIR_INIT_VAR(&_1);
-	zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1886);
+	zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1885);
 	if (Z_TYPE_P(&allAttributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _4, _5, _2)
 		{
@@ -3073,17 +3062,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 			ZEPHIR_INIT_NVAR(&_1);
 			ZVAL_COPY(&_1, _2);
 			if (!(zephir_array_isset(&snapshot, &name))) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1861);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1860);
 				continue;
 			}
 			ZEPHIR_OBS_NVAR(&value);
 			if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1871);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1870);
 				continue;
 			}
-			zephir_array_fetch(&_6$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1879);
+			zephir_array_fetch(&_6$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1878);
 			if (!ZEPHIR_IS_IDENTICAL(&value, &_6$$6)) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1880);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1879);
 				continue;
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -3101,17 +3090,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 			ZEPHIR_CALL_METHOD(&_1, &allAttributes, "current", NULL, 0);
 			zephir_check_call_status();
 				if (!(zephir_array_isset(&snapshot, &name))) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1861);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1860);
 					continue;
 				}
 				ZEPHIR_OBS_NVAR(&value);
 				if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1871);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1870);
 					continue;
 				}
-				zephir_array_fetch(&_7$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1879);
+				zephir_array_fetch(&_7$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1878);
 				if (!ZEPHIR_IS_IDENTICAL(&value, &_7$$10)) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1880);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1879);
 					continue;
 				}
 			ZEPHIR_CALL_METHOD(NULL, &allAttributes, "next", NULL, 0);
@@ -3222,7 +3211,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 		ZEPHIR_INIT_VAR(&filtered);
 		array_init(&filtered);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1943);
+		zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1942);
 		if (Z_TYPE_P(&_1$$3) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3)
 			{
@@ -3231,7 +3220,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 				ZEPHIR_CALL_METHOD(&_4$$4, &message, "getfield", NULL, 0);
 				zephir_check_call_status();
 				if (ZEPHIR_IS_EQUAL(&_4$$4, filter)) {
-					zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1939);
+					zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1938);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -3248,7 +3237,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 					ZEPHIR_CALL_METHOD(&_5$$6, &message, "getfield", NULL, 0);
 					zephir_check_call_status();
 					if (ZEPHIR_IS_EQUAL(&_5$$6, filter)) {
-						zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1939);
+						zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1938);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &_1$$3, "next", NULL, 0);
 				zephir_check_call_status();
@@ -3302,7 +3291,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&metaData, &_1$$3);
 		if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/Mvc/Model.zep", 1977);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/Mvc/Model.zep", 1976);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("modelsMetaData"), &metaData);
@@ -3447,7 +3436,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getRelated)
 		ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 29, &_3$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2056);
+		zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2055);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -3610,21 +3599,21 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&oldSnapshot, &_0);
 	if (UNEXPECTED(!(ZEPHIR_GLOBAL(orm).update_snapshot_on_save))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly", "phalcon/Mvc/Model.zep", 2180);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly", "phalcon/Mvc/Model.zep", 2179);
 		return;
 	}
 	if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2186);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2185);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!ZEPHIR_IS_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/Mvc/Model.zep", 2195);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/Mvc/Model.zep", 2194);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&updated);
 	array_init(&updated);
-	zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2210);
+	zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2209);
 	if (Z_TYPE_P(&snapshot) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _3, _4, _1)
 		{
@@ -3638,11 +3627,11 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 			ZVAL_COPY(&value, _1);
 			_5$$6 = !(zephir_array_isset(&oldSnapshot, &name));
 			if (!(_5$$6)) {
-				zephir_array_fetch(&_6$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2205);
+				zephir_array_fetch(&_6$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2204);
 				_5$$6 = !ZEPHIR_IS_IDENTICAL(&value, &_6$$6);
 			}
 			if (_5$$6) {
-				zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2206);
+				zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2205);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -3660,11 +3649,11 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 			zephir_check_call_status();
 				_7$$8 = !(zephir_array_isset(&oldSnapshot, &name));
 				if (!(_7$$8)) {
-					zephir_array_fetch(&_8$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2205);
+					zephir_array_fetch(&_8$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2204);
 					_7$$8 = !ZEPHIR_IS_IDENTICAL(&value, &_8$$8);
 				}
 				if (_7$$8) {
-					zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2206);
+					zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2205);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &snapshot, "next", NULL, 0);
 			zephir_check_call_status();
@@ -4178,7 +4167,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!ZEPHIR_IS_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2465);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2464);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0);
@@ -4205,7 +4194,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 		ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "has", NULL, 0, &metaData, &readConnection);
 		zephir_check_call_status();
 		if (UNEXPECTED(!zephir_is_true(&_2$$6))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2490);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2489);
 			return;
 		}
 		zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("uniqueKey"), PH_NOISY_CC | PH_READONLY);
@@ -4214,14 +4203,14 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("uniqueParams"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&uniqueParams, &_1);
 	if (UNEXPECTED(Z_TYPE_P(&uniqueParams) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2501);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2500);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&fields);
 	array_init(&fields);
 	ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 2516);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 2515);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -4230,7 +4219,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 			ZEPHIR_INIT_NVAR(&_7$$9);
 			zephir_create_array(&_7$$9, 1, 0);
 			zephir_array_fast_append(&_7$$9, &attribute);
-			zephir_array_append(&fields, &_7$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2510);
+			zephir_array_append(&fields, &_7$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2509);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &_4, "rewind", NULL, 0);
@@ -4246,7 +4235,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 				ZEPHIR_INIT_NVAR(&_8$$10);
 				zephir_create_array(&_8$$10, 1, 0);
 				zephir_array_fast_append(&_8$$10, &attribute);
-				zephir_array_append(&fields, &_8$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2510);
+				zephir_array_append(&fields, &_8$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2509);
 			ZEPHIR_CALL_METHOD(NULL, &_4, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -4409,7 +4398,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 435, this_ptr, &_7$$11);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2667);
+			zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2666);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -4570,7 +4559,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 2787);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 2786);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
@@ -4580,7 +4569,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&manager, &_2$$3);
 		if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 2803);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 2802);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager);
@@ -4588,7 +4577,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&properties);
 		if (zephir_array_isset_string_fetch(&properties, &attributes, SL("attributes"), 0)) {
-			zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2826);
+			zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2825);
 			if (Z_TYPE_P(&properties) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$7, _7$$7, _4$$7)
 				{
@@ -4838,7 +4827,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 	if (Z_TYPE_P(columnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&snapshot);
 		array_init(&snapshot);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2944);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2943);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -4862,7 +4851,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 						ZEPHIR_CONCAT_SVS(&_5$$7, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_6, 29, &_5$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2924);
+						zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2923);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -4878,7 +4867,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_6, 29, &_8$$10);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2935);
+							zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2934);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -4912,7 +4901,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_10$$14, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_9$$14, "__construct", &_6, 29, &_10$$14);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2924);
+							zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2923);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -4928,7 +4917,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 								ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_6, 29, &_12$$17);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2935);
+								zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2934);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -5008,7 +4997,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 	if (Z_TYPE_P(columnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&snapshot);
 		array_init(&snapshot);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 3009);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 3008);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -5041,7 +5030,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 						ZEPHIR_CONCAT_SVS(&_8$$8, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_7$$8, "__construct", &_9, 29, &_8$$8);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2989);
+						zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2988);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -5057,7 +5046,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_11$$11, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", &_9, 29, &_11$$11);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 3000);
+							zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 2999);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5100,7 +5089,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_15$$16, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_14$$16, "__construct", &_9, 29, &_15$$16);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2989);
+							zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2988);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5116,7 +5105,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 								ZEPHIR_CONCAT_SVS(&_17$$19, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_16$$19, "__construct", &_9, 29, &_17$$19);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 3000);
+								zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 2999);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -5197,6 +5186,15 @@ PHP_METHOD(Phalcon_Mvc_Model, setTransaction)
 	RETURN_THISW();
 }
 
+PHP_METHOD(Phalcon_Mvc_Model, getTransaction)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "transaction");
+}
+
 /**
  * Enables/disables options in the ORM
  */
@@ -5496,7 +5494,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3281);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3285);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -5521,7 +5519,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
 						ZEPHIR_CONCAT_SVS(&_7$$7, "Column '", &attribute, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", &_8, 29, &_7$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3259);
+						zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3263);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -5572,7 +5570,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
 							ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &attribute, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_8, 29, &_12$$17);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3259);
+							zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3263);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5779,7 +5777,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 	ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	error = 0;
-	zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3492);
+	zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3496);
 	if (Z_TYPE_P(&belongsTo) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1)
 		{
@@ -5794,7 +5792,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 			action = 1;
 			if (zephir_array_isset_string(&foreignKey, SL("action"))) {
 				ZEPHIR_OBS_NVAR(&_3$$5);
-				zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3383);
+				zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3387);
 				action = zephir_get_intval(&_3$$5);
 			}
 			if (action != 1) {
@@ -5814,7 +5812,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 			ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&fields) == IS_ARRAY) {
-				zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3426);
+				zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3430);
 				if (Z_TYPE_P(&fields) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _8$$7, _9$$7, _6$$7)
 					{
@@ -5828,11 +5826,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 						ZVAL_COPY(&field, _6$$7);
 						ZEPHIR_OBS_NVAR(&value);
 						zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-						zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+						zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
 						ZEPHIR_INIT_NVAR(&_11$$8);
 						ZEPHIR_CONCAT_SVSV(&_11$$8, "[", &_10$$8, "] = ?", &position);
-						zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-						zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+						zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
+						zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
 						if (Z_TYPE_P(&value) == IS_NULL) {
 							numberNull++;
 						}
@@ -5852,11 +5850,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 						zephir_check_call_status();
 							ZEPHIR_OBS_NVAR(&value);
 							zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-							zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+							zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
 							ZEPHIR_INIT_NVAR(&_13$$10);
 							ZEPHIR_CONCAT_SVSV(&_13$$10, "[", &_12$$10, "] = ?", &position);
-							zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+							zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
+							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
 							if (Z_TYPE_P(&value) == IS_NULL) {
 								numberNull++;
 							}
@@ -5872,15 +5870,15 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC);
 				ZEPHIR_INIT_NVAR(&_14$$12);
 				ZEPHIR_CONCAT_SVS(&_14$$12, "[", &referencedFields, "] = ?0");
-				zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3430);
-				zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3431);
+				zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434);
+				zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435);
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					validateWithNulls = 1;
 				}
 			}
 			ZEPHIR_OBS_NVAR(&extraConditions);
 			if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) {
-				zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3442);
+				zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3446);
 			}
 			if (validateWithNulls) {
 				ZEPHIR_OBS_NVAR(&allowNulls);
@@ -5946,7 +5944,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				action = 1;
 				if (zephir_array_isset_string(&foreignKey, SL("action"))) {
 					ZEPHIR_OBS_NVAR(&_24$$24);
-					zephir_array_fetch_string(&_24$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3383);
+					zephir_array_fetch_string(&_24$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3387);
 					action = zephir_get_intval(&_24$$24);
 				}
 				if (action != 1) {
@@ -5966,7 +5964,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&fields) == IS_ARRAY) {
-					zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3426);
+					zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3430);
 					if (Z_TYPE_P(&fields) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _29$$26, _30$$26, _27$$26)
 						{
@@ -5980,11 +5978,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 							ZVAL_COPY(&field, _27$$26);
 							ZEPHIR_OBS_NVAR(&value);
 							zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-							zephir_array_fetch(&_31$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+							zephir_array_fetch(&_31$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
 							ZEPHIR_INIT_NVAR(&_32$$27);
 							ZEPHIR_CONCAT_SVSV(&_32$$27, "[", &_31$$27, "] = ?", &position);
-							zephir_array_append(&conditions, &_32$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+							zephir_array_append(&conditions, &_32$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
+							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
 							if (Z_TYPE_P(&value) == IS_NULL) {
 								numberNull++;
 							}
@@ -6004,11 +6002,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 							zephir_check_call_status();
 								ZEPHIR_OBS_NVAR(&value);
 								zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-								zephir_array_fetch(&_33$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+								zephir_array_fetch(&_33$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
 								ZEPHIR_INIT_NVAR(&_34$$29);
 								ZEPHIR_CONCAT_SVSV(&_34$$29, "[", &_33$$29, "] = ?", &position);
-								zephir_array_append(&conditions, &_34$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-								zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+								zephir_array_append(&conditions, &_34$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
+								zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
 								if (Z_TYPE_P(&value) == IS_NULL) {
 									numberNull++;
 								}
@@ -6024,15 +6022,15 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 					zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC);
 					ZEPHIR_INIT_NVAR(&_35$$31);
 					ZEPHIR_CONCAT_SVS(&_35$$31, "[", &referencedFields, "] = ?0");
-					zephir_array_append(&conditions, &_35$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3430);
-					zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3431);
+					zephir_array_append(&conditions, &_35$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434);
+					zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435);
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						validateWithNulls = 1;
 					}
 				}
 				ZEPHIR_OBS_NVAR(&extraConditions);
 				if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) {
-					zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3442);
+					zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3446);
 				}
 				if (validateWithNulls) {
 					ZEPHIR_OBS_NVAR(&allowNulls);
@@ -6128,7 +6126,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3568);
+	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3572);
 	if (Z_TYPE_P(&relations) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
 		{
@@ -6146,7 +6144,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 			}
 			if (_3$$3) {
 				ZEPHIR_OBS_NVAR(&_4$$5);
-				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3542);
+				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3546);
 				action = zephir_get_intval(&_4$$5);
 			}
 			if (action != 2) {
@@ -6185,7 +6183,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 				}
 				if (_7$$9) {
 					ZEPHIR_OBS_NVAR(&_8$$11);
-					zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3542);
+					zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3546);
 					action = zephir_get_intval(&_8$$11);
 				}
 				if (action != 2) {
@@ -6252,7 +6250,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 	ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	error = 0;
-	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3654);
+	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3658);
 	if (Z_TYPE_P(&relations) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
 		{
@@ -6270,7 +6268,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 			}
 			if (_3$$3) {
 				ZEPHIR_OBS_NVAR(&_4$$5);
-				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3613);
+				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3617);
 				action = zephir_get_intval(&_4$$5);
 			}
 			if (action != 1) {
@@ -6326,7 +6324,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 				}
 				if (_13$$9) {
 					ZEPHIR_OBS_NVAR(&_14$$11);
-					zephir_array_fetch_string(&_14$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3613);
+					zephir_array_fetch_string(&_14$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3617);
 					action = zephir_get_intval(&_14$$11);
 				}
 				if (action != 1) {
@@ -6503,7 +6501,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		ZEPHIR_INIT_NVAR(&columnMap);
 		ZVAL_NULL(&columnMap);
 	}
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3776);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3780);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1)
 		{
@@ -6518,7 +6516,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 					ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &field, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 29, &_4$$7);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3710);
+					zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3714);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -6534,9 +6532,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							_6$$11 = zephir_array_isset(&defaultValues, &field);
 						}
 						if (_6$$11) {
-							zephir_array_fetch(&_7$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3727);
+							zephir_array_fetch(&_7$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3731);
 							zephir_array_update_zval(&snapshot, &attributeField, &_7$$12, PH_COPY | PH_SEPARATE);
-							zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3728);
+							zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3732);
 							zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_8$$12, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(&_9$$12, connection, "supportsdefaultvalue", &_10, 0);
 							zephir_check_call_status();
@@ -6556,18 +6554,18 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							ZEPHIR_CONCAT_SVS(&_13$$15, "Column '", &field, "' have not defined a bind data type");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$15, "__construct", &_5, 29, &_13$$15);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3745);
+							zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3749);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3748);
-						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3749);
-						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3750);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3752);
+						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3753);
+						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
 					} else {
 						if (zephir_array_isset(&defaultValues, &field)) {
-							zephir_array_fetch(&_14$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3753);
+							zephir_array_fetch(&_14$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3757);
 							zephir_array_update_zval(&snapshot, &attributeField, &_14$$17, PH_COPY | PH_SEPARATE);
-							zephir_array_fetch(&_15$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3754);
+							zephir_array_fetch(&_15$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3758);
 							zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_15$$17, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(&_16$$17, connection, "supportsdefaultvalue", &_17, 0);
 							zephir_check_call_status();
@@ -6576,13 +6574,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							}
 							ZEPHIR_CALL_METHOD(&_18$$17, connection, "getdefaultvalue", &_19, 0);
 							zephir_check_call_status();
-							zephir_array_append(&values, &_18$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+							zephir_array_append(&values, &_18$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3764);
 						} else {
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3762);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
 							zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 						}
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
-						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3767);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3770);
+						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3771);
 					}
 				}
 			}
@@ -6607,7 +6605,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 						ZEPHIR_CONCAT_SVS(&_21$$22, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_20$$22, "__construct", &_5, 29, &_21$$22);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3710);
+						zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3714);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -6623,9 +6621,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								_22$$26 = zephir_array_isset(&defaultValues, &field);
 							}
 							if (_22$$26) {
-								zephir_array_fetch(&_23$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3727);
+								zephir_array_fetch(&_23$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3731);
 								zephir_array_update_zval(&snapshot, &attributeField, &_23$$27, PH_COPY | PH_SEPARATE);
-								zephir_array_fetch(&_24$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3728);
+								zephir_array_fetch(&_24$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3732);
 								zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_24$$27, PH_COPY | PH_SEPARATE);
 								ZEPHIR_CALL_METHOD(&_25$$27, connection, "supportsdefaultvalue", &_26, 0);
 								zephir_check_call_status();
@@ -6645,18 +6643,18 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								ZEPHIR_CONCAT_SVS(&_29$$30, "Column '", &field, "' have not defined a bind data type");
 								ZEPHIR_CALL_METHOD(NULL, &_28$$30, "__construct", &_5, 29, &_29$$30);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3745);
+								zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3749);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3748);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3749);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3750);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3752);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3753);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
 						} else {
 							if (zephir_array_isset(&defaultValues, &field)) {
-								zephir_array_fetch(&_30$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3753);
+								zephir_array_fetch(&_30$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3757);
 								zephir_array_update_zval(&snapshot, &attributeField, &_30$$32, PH_COPY | PH_SEPARATE);
-								zephir_array_fetch(&_31$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3754);
+								zephir_array_fetch(&_31$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3758);
 								zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_31$$32, PH_COPY | PH_SEPARATE);
 								ZEPHIR_CALL_METHOD(&_32$$32, connection, "supportsdefaultvalue", &_33, 0);
 								zephir_check_call_status();
@@ -6665,13 +6663,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								}
 								ZEPHIR_CALL_METHOD(&_34$$32, connection, "getdefaultvalue", &_35, 0);
 								zephir_check_call_status();
-								zephir_array_append(&values, &_34$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+								zephir_array_append(&values, &_34$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3764);
 							} else {
-								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3762);
+								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
 								zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 							}
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
-							zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3767);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3770);
+							zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3771);
 						}
 					}
 				}
@@ -6687,7 +6685,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		zephir_check_call_status();
 		useExplicitIdentity = zephir_get_boolval(&_36$$35);
 		if (useExplicitIdentity) {
-			zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3786);
+			zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3790);
 		}
 		if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
 			ZEPHIR_OBS_NVAR(&attributeField);
@@ -6698,7 +6696,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 				ZEPHIR_CONCAT_SVS(&_38$$38, "Identity column '", identityField, "' isn't part of the column map");
 				ZEPHIR_CALL_METHOD(NULL, &_37$$38, "__construct", &_5, 29, &_38$$38);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3796);
+				zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3800);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -6713,12 +6711,12 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 			}
 			if (_39$$40) {
 				if (useExplicitIdentity) {
-					zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3808);
-					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3808);
+					zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812);
+					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812);
 				}
 			} else {
 				if (!(useExplicitIdentity)) {
-					zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3816);
+					zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3820);
 				}
 				ZEPHIR_OBS_NVAR(&bindType);
 				if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0)))) {
@@ -6728,23 +6726,23 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 					ZEPHIR_CONCAT_SVS(&_41$$45, "Identity column '", identityField, "' isn\'t part of the table columns");
 					ZEPHIR_CALL_METHOD(NULL, &_40$$45, "__construct", &_5, 29, &_41$$45);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3825);
+					zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3829);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3828);
-				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3829);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3832);
+				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
 			}
 		} else {
 			if (useExplicitIdentity) {
-				zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
-				zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834);
+				zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3837);
+				zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3838);
 			}
 		}
 	}
 	if (Z_TYPE_P(table) == IS_ARRAY) {
-		zephir_array_fetch_long(&_42$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3843);
-		zephir_array_fetch_long(&_43$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3843);
+		zephir_array_fetch_long(&_42$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3847);
+		zephir_array_fetch_long(&_43$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3847);
 		ZEPHIR_INIT_VAR(&_44$$48);
 		ZEPHIR_CONCAT_VSV(&_44$$48, &_42$$48, ".", &_43$$48);
 		ZEPHIR_CPY_WRT(table, &_44$$48);
@@ -6790,7 +6788,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		zephir_update_property_zval(this_ptr, ZEND_STRL("uniqueParams"), &__$null);
 	}
 	if (zephir_is_true(&success)) {
-		zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3904);
+		zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3908);
 		if (Z_TYPE_P(&unsetDefaultValues) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&unsetDefaultValues), _51$$56, _52$$56, _49$$56)
 			{
@@ -6969,7 +6967,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_INIT_NVAR(&columnMap);
 		ZVAL_NULL(&columnMap);
 	}
-	zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4093);
+	zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4097);
 	if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _2)
 		{
@@ -6985,7 +6983,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_5$$10, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", &_6, 29, &_5$$10);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3969);
+						zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3973);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7002,16 +7000,16 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 					ZEPHIR_CONCAT_SVS(&_8$$13, "Column '", &field, "' have not defined a bind data type");
 					ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", &_6, 29, &_8$$13);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3983);
+					zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3987);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&value);
 				if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 					if (!(useDynamicUpdate)) {
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3995);
-						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3996);
-						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3997);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3999);
+						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4000);
+						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4001);
 					} else {
 						ZEPHIR_OBS_NVAR(&snapshotValue);
 						if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0))) {
@@ -7031,7 +7029,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 										ZEPHIR_CONCAT_SVS(&_10$$23, "Column '", &field, "' have not defined a data type");
 										ZEPHIR_CALL_METHOD(NULL, &_9$$23, "__construct", &_6, 29, &_10$$23);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 4022);
+										zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 4026);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -7079,17 +7077,17 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							}
 						}
 						if (changed) {
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4073);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4074);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4075);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
 						}
 					}
 					zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4083);
-					zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4084);
-					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4085);
+					zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4087);
+					zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4088);
+					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4089);
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -7114,7 +7112,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							ZEPHIR_CONCAT_SVS(&_20$$35, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$35, "__construct", &_6, 29, &_20$$35);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_19$$35, "phalcon/Mvc/Model.zep", 3969);
+							zephir_throw_exception_debug(&_19$$35, "phalcon/Mvc/Model.zep", 3973);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -7131,16 +7129,16 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_22$$38, "Column '", &field, "' have not defined a bind data type");
 						ZEPHIR_CALL_METHOD(NULL, &_21$$38, "__construct", &_6, 29, &_22$$38);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_21$$38, "phalcon/Mvc/Model.zep", 3983);
+						zephir_throw_exception_debug(&_21$$38, "phalcon/Mvc/Model.zep", 3987);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&value);
 					if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 						if (!(useDynamicUpdate)) {
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3995);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3996);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3997);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3999);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4000);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4001);
 						} else {
 							ZEPHIR_OBS_NVAR(&snapshotValue);
 							if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0))) {
@@ -7160,7 +7158,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 											ZEPHIR_CONCAT_SVS(&_24$$48, "Column '", &field, "' have not defined a data type");
 											ZEPHIR_CALL_METHOD(NULL, &_23$$48, "__construct", &_6, 29, &_24$$48);
 											zephir_check_call_status();
-											zephir_throw_exception_debug(&_23$$48, "phalcon/Mvc/Model.zep", 4022);
+											zephir_throw_exception_debug(&_23$$48, "phalcon/Mvc/Model.zep", 4026);
 											ZEPHIR_MM_RESTORE();
 											return;
 										}
@@ -7208,17 +7206,17 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 								}
 							}
 							if (changed) {
-								zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4073);
-								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4074);
-								zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4075);
+								zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
+								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
+								zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
 							}
 						}
 						zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 					} else {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4083);
-						zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4084);
-						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4085);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4087);
+						zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4088);
+						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4089);
 					}
 				}
 			ZEPHIR_CALL_METHOD(NULL, &nonPrimary, "next", NULL, 0);
@@ -7242,12 +7240,12 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr);
 		zephir_check_call_status();
 		if (UNEXPECTED(!(zephir_fast_count_int(&primaryKeys)))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 4117);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 4121);
 			return;
 		}
 		ZEPHIR_INIT_NVAR(&uniqueParams);
 		array_init(&uniqueParams);
-		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4144);
+		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4148);
 		if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _32$$59)
 			{
@@ -7262,7 +7260,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_35$$63, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_34$$63, "__construct", &_6, 29, &_35$$63);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_34$$63, "phalcon/Mvc/Model.zep", 4130);
+						zephir_throw_exception_debug(&_34$$63, "phalcon/Mvc/Model.zep", 4134);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7272,10 +7270,10 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 				ZEPHIR_OBS_NVAR(&value);
 				if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
+					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4142);
 				} else {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4141);
+					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4145);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -7298,7 +7296,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							ZEPHIR_CONCAT_SVS(&_37$$69, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_36$$69, "__construct", &_6, 29, &_37$$69);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_36$$69, "phalcon/Mvc/Model.zep", 4130);
+							zephir_throw_exception_debug(&_36$$69, "phalcon/Mvc/Model.zep", 4134);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -7308,10 +7306,10 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 					ZEPHIR_OBS_NVAR(&value);
 					if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
+						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4142);
 					} else {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4141);
+						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4145);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 				zephir_check_call_status();
@@ -7320,8 +7318,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_INIT_NVAR(&field);
 	}
 	if (Z_TYPE_P(table) == IS_ARRAY) {
-		zephir_array_fetch_long(&_38$$73, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4150);
-		zephir_array_fetch_long(&_39$$73, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4150);
+		zephir_array_fetch_long(&_38$$73, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4154);
+		zephir_array_fetch_long(&_39$$73, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4154);
 		ZEPHIR_INIT_VAR(&_40$$73);
 		ZEPHIR_CONCAT_VSV(&_40$$73, &_38$$73, ".", &_39$$73);
 		ZEPHIR_CPY_WRT(table, &_40$$73);
@@ -7457,7 +7455,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 		array_init(&uniqueParams);
 		ZEPHIR_INIT_NVAR(&uniqueTypes);
 		array_init(&uniqueTypes);
-		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4274);
+		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4278);
 		if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _1$$3)
 			{
@@ -7472,7 +7470,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 						ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 29, &_4$$9);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4233);
+						zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4237);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7490,9 +7488,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 					if (_6$$11) {
 						numberEmpty++;
 					}
-					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4254);
+					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4258);
 				} else {
-					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4256);
+					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
 					numberEmpty++;
 				}
 				ZEPHIR_OBS_NVAR(&type);
@@ -7503,16 +7501,16 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 					ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' isn't part of the table columns");
 					ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_5, 29, &_8$$14);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4263);
+					zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4267);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4266);
+				zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4270);
 				ZEPHIR_CALL_METHOD(&_9$$7, connection, "escapeidentifier", &_10, 0, &field);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_11$$7);
 				ZEPHIR_CONCAT_VS(&_11$$7, &_9$$7, " = ?");
-				zephir_array_append(&wherePk, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4267);
+				zephir_array_append(&wherePk, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4271);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -7534,7 +7532,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 							ZEPHIR_CONCAT_SVS(&_13$$17, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$17, "__construct", &_5, 29, &_13$$17);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4233);
+							zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4237);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -7552,9 +7550,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 						if (_14$$19) {
 							numberEmpty++;
 						}
-						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4254);
+						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4258);
 					} else {
-						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4256);
+						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
 						numberEmpty++;
 					}
 					ZEPHIR_OBS_NVAR(&type);
@@ -7565,16 +7563,16 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 						ZEPHIR_CONCAT_SVS(&_16$$22, "Column '", &field, "' isn't part of the table columns");
 						ZEPHIR_CALL_METHOD(NULL, &_15$$22, "__construct", &_5, 29, &_16$$22);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4263);
+						zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4267);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4266);
+					zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4270);
 					ZEPHIR_CALL_METHOD(&_17$$15, connection, "escapeidentifier", &_18, 0, &field);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_19$$15);
 					ZEPHIR_CONCAT_VS(&_19$$15, &_17$$15, " = ?");
-					zephir_array_append(&wherePk, &_19$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4267);
+					zephir_array_append(&wherePk, &_19$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4271);
 				ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -7625,7 +7623,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 	ZVAL_NULL(&_25);
 	ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_24, &_25, &uniqueParams, &uniqueTypes);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_26, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4328);
+	zephir_array_fetch_string(&_26, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4332);
 	if (zephir_is_true(&_26)) {
 		ZEPHIR_INIT_ZVAL_NREF(_27$$30);
 		ZVAL_LONG(&_27$$30, 0);
@@ -7838,7 +7836,7 @@ PHP_METHOD(Phalcon_Mvc_Model, groupResult)
 		ZEPHIR_INIT_VAR(&params);
 		array_init(&params);
 		if (Z_TYPE_P(parameters) != IS_NULL) {
-			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4433);
+			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4437);
 		}
 	} else {
 		ZEPHIR_CPY_WRT(&params, parameters);
@@ -7882,10 +7880,10 @@ PHP_METHOD(Phalcon_Mvc_Model, groupResult)
 	}
 	if (zephir_array_isset_string(&params, SL("bind"))) {
 		ZEPHIR_OBS_NVAR(&bindParams);
-		zephir_array_fetch_string(&bindParams, &params, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4476);
+		zephir_array_fetch_string(&bindParams, &params, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4480);
 		if (zephir_array_isset_string(&params, SL("bindTypes"))) {
 			ZEPHIR_OBS_NVAR(&bindTypes);
-			zephir_array_fetch_string(&bindTypes, &params, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4479);
+			zephir_array_fetch_string(&bindTypes, &params, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4483);
 		}
 	}
 	ZEPHIR_OBS_VAR(&cache);
@@ -7993,7 +7991,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder)
 		ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument");
 		ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 29, &_4$$7);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4558);
+		zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4562);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -8025,7 +8023,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder)
 				ZEPHIR_CONCAT_SVS(&_6$$13, "Cannot resolve attribute '", &extraMethod, "' in the model");
 				ZEPHIR_CALL_METHOD(NULL, &_5$$13, "__construct", NULL, 29, &_6$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4595);
+				zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4599);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -8246,7 +8244,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 			ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr);
 			zephir_check_call_status();
 			error = 0;
-			zephir_is_iterable(&notNull, 0, "phalcon/Mvc/Model.zep", 4832);
+			zephir_is_iterable(&notNull, 0, "phalcon/Mvc/Model.zep", 4836);
 			if (Z_TYPE_P(&notNull) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&notNull), _4$$11)
 				{
@@ -8262,7 +8260,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 								ZEPHIR_CONCAT_SVS(&_7$$19, "Column '", &field, "' isn't part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_6$$19, "__construct", &_8, 29, &_7$$19);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4756);
+								zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4760);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -8287,7 +8285,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 											if (_10$$27) {
 												_11$$27 = !(zephir_array_isset(&defaultValues, &field));
 												if (!(_11$$27)) {
-													zephir_array_fetch(&_12$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4786);
+													zephir_array_fetch(&_12$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4790);
 													_11$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_12$$27);
 												}
 												_10$$27 = _11$$27;
@@ -8350,7 +8348,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 									ZEPHIR_CONCAT_SVS(&_18$$39, "Column '", &field, "' isn't part of the column map");
 									ZEPHIR_CALL_METHOD(NULL, &_17$$39, "__construct", &_8, 29, &_18$$39);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4756);
+									zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4760);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -8375,7 +8373,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 												if (_20$$47) {
 													_21$$47 = !(zephir_array_isset(&defaultValues, &field));
 													if (!(_21$$47)) {
-														zephir_array_fetch(&_22$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4786);
+														zephir_array_fetch(&_22$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4790);
 														_21$$47 = !ZEPHIR_IS_IDENTICAL(&value, &_22$$47);
 													}
 													_20$$47 = _21$$47;
@@ -8579,7 +8577,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_1);
-	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5012);
+	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5016);
 	if (Z_TYPE_P(related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _4, _5, _2)
 		{
@@ -8606,7 +8604,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, &_8$$6);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4953);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4957);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -8621,7 +8619,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_11, 0, &_10$$7);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4965);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4969);
 						return;
 					}
 					zephir_read_property(&_12$$5, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
@@ -8634,7 +8632,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 					if (_13$$5) {
 						ZEPHIR_CALL_METHOD(&_15$$8, &record, "getmessages", NULL, 0);
 						zephir_check_call_status();
-						zephir_is_iterable(&_15$$8, 0, "phalcon/Mvc/Model.zep", 4998);
+						zephir_is_iterable(&_15$$8, 0, "phalcon/Mvc/Model.zep", 5002);
 						if (Z_TYPE_P(&_15$$8) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_15$$8), _16$$8)
 							{
@@ -8718,7 +8716,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 							}
 							ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_27, 0, &_26$$16);
 							zephir_check_call_status();
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4953);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4957);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -8733,7 +8731,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 							}
 							ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_29, 0, &_28$$17);
 							zephir_check_call_status();
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4965);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4969);
 							return;
 						}
 						zephir_read_property(&_30$$15, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
@@ -8746,7 +8744,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						if (_31$$15) {
 							ZEPHIR_CALL_METHOD(&_33$$18, &record, "getmessages", NULL, 0);
 							zephir_check_call_status();
-							zephir_is_iterable(&_33$$18, 0, "phalcon/Mvc/Model.zep", 4998);
+							zephir_is_iterable(&_33$$18, 0, "phalcon/Mvc/Model.zep", 5002);
 							if (Z_TYPE_P(&_33$$18) == IS_ARRAY) {
 								ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_33$$18), _34$$18)
 								{
@@ -9005,7 +9003,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5261);
+	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5265);
 	if (Z_TYPE_P(related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _1)
 		{
@@ -9038,7 +9036,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					}
 					ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, &_9$$6);
 					zephir_check_call_status();
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5074);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5078);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -9055,7 +9053,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					}
 					ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_12, 0, &_11$$7);
 					zephir_check_call_status();
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5084);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5088);
 					return;
 				}
 				if (Z_TYPE_P(&record) == IS_OBJECT) {
@@ -9080,7 +9078,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CONCAT_SVS(&_16$$10, "The column '", &columns, "' needs to be present in the model");
 					ZEPHIR_CALL_METHOD(NULL, &_15$$10, "__construct", &_17, 29, &_16$$10);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 5101);
+					zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 5105);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -9095,7 +9093,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0);
 					zephir_check_call_status();
 				}
-				zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5247);
+				zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5251);
 				if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _19$$4)
 					{
@@ -9110,7 +9108,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						if (!(zephir_is_true(&_21$$12))) {
 							ZEPHIR_CALL_METHOD(&_22$$14, &recordAfter, "getmessages", NULL, 0);
 							zephir_check_call_status();
-							zephir_is_iterable(&_22$$14, 0, "phalcon/Mvc/Model.zep", 5160);
+							zephir_is_iterable(&_22$$14, 0, "phalcon/Mvc/Model.zep", 5164);
 							if (Z_TYPE_P(&_22$$14) == IS_ARRAY) {
 								ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_22$$14), _23$$14)
 								{
@@ -9193,7 +9191,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_36$$19))) {
 								ZEPHIR_CALL_METHOD(&_37$$22, &intermediateModel, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_37$$22, 0, "phalcon/Mvc/Model.zep", 5241);
+								zephir_is_iterable(&_37$$22, 0, "phalcon/Mvc/Model.zep", 5245);
 								if (Z_TYPE_P(&_37$$22) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_37$$22), _38$$22)
 									{
@@ -9265,7 +9263,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_44$$27))) {
 								ZEPHIR_CALL_METHOD(&_45$$29, &recordAfter, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_45$$29, 0, "phalcon/Mvc/Model.zep", 5160);
+								zephir_is_iterable(&_45$$29, 0, "phalcon/Mvc/Model.zep", 5164);
 								if (Z_TYPE_P(&_45$$29) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_45$$29), _46$$29)
 									{
@@ -9348,7 +9346,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_58$$34))) {
 									ZEPHIR_CALL_METHOD(&_59$$37, &intermediateModel, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_59$$37, 0, "phalcon/Mvc/Model.zep", 5241);
+									zephir_is_iterable(&_59$$37, 0, "phalcon/Mvc/Model.zep", 5245);
 									if (Z_TYPE_P(&_59$$37) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_59$$37), _60$$37)
 										{
@@ -9419,7 +9417,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CONCAT_SVSVS(&_69$$43, "There are no defined relations for the model '", &className, "' using alias '", &name, "'");
 					ZEPHIR_CALL_METHOD(NULL, &_68$$43, "__construct", &_17, 29, &_69$$43);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5253);
+					zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5257);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -9459,7 +9457,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_75, 0, &_74$$47);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5074);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5078);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -9476,7 +9474,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_77, 0, &_76$$48);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5084);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5088);
 						return;
 					}
 					if (Z_TYPE_P(&record) == IS_OBJECT) {
@@ -9502,7 +9500,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CONCAT_SVS(&_82$$51, "The column '", &columns, "' needs to be present in the model");
 						ZEPHIR_CALL_METHOD(NULL, &_81$$51, "__construct", &_17, 29, &_82$$51);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 5101);
+						zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 5105);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -9517,7 +9515,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0);
 						zephir_check_call_status();
 					}
-					zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5247);
+					zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5251);
 					if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _84$$45)
 						{
@@ -9532,7 +9530,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_86$$53))) {
 								ZEPHIR_CALL_METHOD(&_87$$55, &recordAfter, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_87$$55, 0, "phalcon/Mvc/Model.zep", 5160);
+								zephir_is_iterable(&_87$$55, 0, "phalcon/Mvc/Model.zep", 5164);
 								if (Z_TYPE_P(&_87$$55) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_87$$55), _88$$55)
 									{
@@ -9615,7 +9613,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_100$$60))) {
 									ZEPHIR_CALL_METHOD(&_101$$63, &intermediateModel, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_101$$63, 0, "phalcon/Mvc/Model.zep", 5241);
+									zephir_is_iterable(&_101$$63, 0, "phalcon/Mvc/Model.zep", 5245);
 									if (Z_TYPE_P(&_101$$63) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_101$$63), _102$$63)
 										{
@@ -9687,7 +9685,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_108$$68))) {
 									ZEPHIR_CALL_METHOD(&_109$$70, &recordAfter, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_109$$70, 0, "phalcon/Mvc/Model.zep", 5160);
+									zephir_is_iterable(&_109$$70, 0, "phalcon/Mvc/Model.zep", 5164);
 									if (Z_TYPE_P(&_109$$70) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_109$$70), _110$$70)
 										{
@@ -9770,7 +9768,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 									if (!(zephir_is_true(&_122$$75))) {
 										ZEPHIR_CALL_METHOD(&_123$$78, &intermediateModel, "getmessages", NULL, 0);
 										zephir_check_call_status();
-										zephir_is_iterable(&_123$$78, 0, "phalcon/Mvc/Model.zep", 5241);
+										zephir_is_iterable(&_123$$78, 0, "phalcon/Mvc/Model.zep", 5245);
 										if (Z_TYPE_P(&_123$$78) == IS_ARRAY) {
 											ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_123$$78), _124$$78)
 											{
@@ -9841,7 +9839,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CONCAT_SVSVS(&_133$$84, "There are no defined relations for the model '", &className, "' using alias '", &name, "'");
 						ZEPHIR_CALL_METHOD(NULL, &_132$$84, "__construct", &_17, 29, &_133$$84);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5253);
+						zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5257);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -9909,7 +9907,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5294);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5298);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -10792,7 +10790,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5753);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5757);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -10871,7 +10869,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5788);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5792);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -11122,7 +11120,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_array_keys(&_0, columnMap);
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5924);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5928);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
diff --git a/ext/phalcon/mvc/model.zep.h b/ext/phalcon/mvc/model.zep.h
index de6640e64c8..3c03fe8b9d7 100644
--- a/ext/phalcon/mvc/model.zep.h
+++ b/ext/phalcon/mvc/model.zep.h
@@ -3,7 +3,6 @@ extern zend_class_entry *phalcon_mvc_model_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model);
 
-PHP_METHOD(Phalcon_Mvc_Model, getTransaction);
 PHP_METHOD(Phalcon_Mvc_Model, __construct);
 PHP_METHOD(Phalcon_Mvc_Model, __call);
 PHP_METHOD(Phalcon_Mvc_Model, __callStatic);
@@ -65,6 +64,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setReadConnectionService);
 PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData);
 PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData);
 PHP_METHOD(Phalcon_Mvc_Model, setTransaction);
+PHP_METHOD(Phalcon_Mvc_Model, getTransaction);
 PHP_METHOD(Phalcon_Mvc_Model, setup);
 PHP_METHOD(Phalcon_Mvc_Model, setWriteConnectionService);
 PHP_METHOD(Phalcon_Mvc_Model, skipOperation);
@@ -106,9 +106,6 @@ PHP_METHOD(Phalcon_Mvc_Model, validationHasFailed);
 PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap);
 zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, IS_NULL, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, data)
 	ZEND_ARG_OBJ_INFO(0, container, Phalcon\\Di\\DiInterface, 1)
@@ -363,6 +360,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_settransaction,
 	ZEND_ARG_OBJ_INFO(0, transaction, Phalcon\\Mvc\\Model\\TransactionInterface, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, Phalcon\\Mvc\\Model\\TransactionInterface, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_setup, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_ARRAY_INFO(0, options, 0)
@@ -552,7 +552,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_setsource, 0, 1
 	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_skipattributes, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_skipattributes, 0, 1, IS_VOID, 0)
+
 	ZEND_ARG_ARRAY_INFO(0, attributes, 0)
 ZEND_END_ARG_INFO()
 
@@ -587,7 +588,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_zephir_init_properties_phalcon_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) {
-	PHP_ME(Phalcon_Mvc_Model, getTransaction, arginfo_phalcon_mvc_model_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, __construct, arginfo_phalcon_mvc_model___construct, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Model, __call, arginfo_phalcon_mvc_model___call, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, __callStatic, arginfo_phalcon_mvc_model___callstatic, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -649,6 +649,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) {
 	PHP_ME(Phalcon_Mvc_Model, setOldSnapshotData, arginfo_phalcon_mvc_model_setoldsnapshotdata, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, setSnapshotData, arginfo_phalcon_mvc_model_setsnapshotdata, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, setTransaction, arginfo_phalcon_mvc_model_settransaction, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Model, getTransaction, arginfo_phalcon_mvc_model_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, setup, arginfo_phalcon_mvc_model_setup, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Phalcon_Mvc_Model, setWriteConnectionService, arginfo_phalcon_mvc_model_setwriteconnectionservice, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, skipOperation, arginfo_phalcon_mvc_model_skipoperation, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c
index d2d81091f56..7f0626066ac 100644
--- a/ext/phalcon/mvc/model/query.zep.c
+++ b/ext/phalcon/mvc/model/query.zep.c
@@ -202,24 +202,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Query)
 	return SUCCESS;
 }
 
-/**
- * TransactionInterface so that the query can wrap a transaction
- *
- *
- * around batch updates and intermediate selects within the transaction.
- * however if a model got a transaction set inside it will use the local
- * transaction instead of this one
- *
- */
-PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "transaction");
-}
-
 /**
  * Phalcon\Mvc\Model\Query constructor
  *
@@ -706,6 +688,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSql)
 
 /**
  * Gets the type of PHQL statement executed
+ *
+ * @return int
  */
 PHP_METHOD(Phalcon_Mvc_Model_Query, getType)
 {
@@ -719,6 +703,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getType)
 /**
  * Check if the query is programmed to get only the first row in the
  * resultset
+ *
+ * @return bool
  */
 PHP_METHOD(Phalcon_Mvc_Model_Query, getUniqueRow)
 {
@@ -729,6 +715,18 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getUniqueRow)
 	RETURN_MEMBER(getThis(), "uniqueRow");
 }
 
+/**
+ * @return TransactionInterface|null
+ */
+PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "transaction");
+}
+
 /**
  * Parses the intermediate code produced by Phalcon\Mvc\Model\Query\Lang
  * generating another intermediate representation that could be executed by
@@ -777,7 +775,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 			zephir_read_static_property_ce(&_2$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY);
 			if (zephir_array_isset_fetch(&irPhql, &_2$$5, &uniqueId, 0)) {
 				if (Z_TYPE_P(&irPhql) == IS_ARRAY) {
-					zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 567);
+					zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 579);
 					zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_3$$7);
 					RETURN_CCTOR(&irPhql);
 				}
@@ -814,7 +812,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 				ZEPHIR_CONCAT_SVSV(&_5$$13, "Unknown statement ", &type, ", when preparing: ", &phql);
 				ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 29, &_5$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 601);
+				zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 613);
 				ZEPHIR_MM_RESTORE();
 				return;
 			} while(0);
@@ -822,7 +820,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 		}
 	}
 	if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 607);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 619);
 		return;
 	}
 	if (Z_TYPE_P(&uniqueId) == IS_LONG) {
@@ -957,7 +955,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI)
 	ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 671);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 683);
 		return;
 	}
 	ZEPHIR_INIT_NVAR(&_0);
@@ -965,7 +963,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI)
 	ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 677);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 689);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager);
@@ -1169,13 +1167,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 
 
 	ZEPHIR_OBS_VAR(&models);
-	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 745);
+	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 757);
 	if (UNEXPECTED(zephir_array_isset_long(&models, 1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 750);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 762);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 753);
+	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 765);
 	ZEPHIR_OBS_VAR(&model);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) {
@@ -1307,7 +1305,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 
 
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 834);
+	zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 846);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_OBS_VAR(&model);
@@ -1336,16 +1334,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 		}
 	}
 	ZEPHIR_OBS_VAR(&values);
-	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 869);
+	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 881);
 	if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 878);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 890);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&insertValues);
 	array_init(&insertValues);
-	zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 949);
+	zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 961);
 	if (Z_TYPE_P(&values) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2)
 		{
@@ -1358,8 +1356,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _2);
 			ZEPHIR_OBS_NVAR(&exprValue);
-			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888);
-			zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890);
+			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 900);
+			zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 902);
 			do {
 				if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) {
 					ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue);
@@ -1388,7 +1386,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 						ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list");
 						ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 914);
+						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 926);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1404,7 +1402,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 			} while(0);
 
 			ZEPHIR_OBS_NVAR(&fieldName);
-			zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927);
+			zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 939);
 			_18$$8 = automaticFields;
 			if (_18$$8) {
 				_18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY;
@@ -1418,7 +1416,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 					ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 29, &_20$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 937);
+					zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 949);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -1441,8 +1439,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 			ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&exprValue);
-				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888);
-				zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890);
+				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 900);
+				zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 902);
 				do {
 					if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) {
 						ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue);
@@ -1471,7 +1469,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 							ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list");
 							ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 29, &_28$$21);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 914);
+							zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 926);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1487,7 +1485,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 				} while(0);
 
 				ZEPHIR_OBS_NVAR(&fieldName);
-				zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927);
+				zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 939);
 				_31$$17 = automaticFields;
 				if (_31$$17) {
 					_31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY;
@@ -1501,7 +1499,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 						ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 29, &_33$$24);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 937);
+						zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 949);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1678,8 +1676,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	ZEPHIR_INIT_VAR(&connectionTypes);
 	array_init(&connectionTypes);
 	ZEPHIR_OBS_VAR(&models);
-	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 986);
-	zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1014);
+	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 998);
+	zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1026);
 	if (Z_TYPE_P(&models) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1)
 		{
@@ -1699,7 +1697,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 				zephir_check_call_status();
 				zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE);
 				if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1021);
 					return;
 				}
 			}
@@ -1729,7 +1727,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					zephir_check_call_status();
 					zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE);
 					if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1021);
 						return;
 					}
 				}
@@ -1739,23 +1737,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	}
 	ZEPHIR_INIT_NVAR(&modelName);
 	ZEPHIR_OBS_VAR(&columns);
-	zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1014);
+	zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1026);
 	haveObjects = 0;
 	haveScalars = 0;
 	isComplex = 0;
 	numberObjects = 0;
 	ZEPHIR_CPY_WRT(&columns1, &columns);
-	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1042);
+	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1054);
 	if (Z_TYPE_P(&columns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10)
 		{
 			ZEPHIR_INIT_NVAR(&column);
 			ZVAL_COPY(&column, _10);
 			if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1038);
 				return;
 			}
-			zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029);
+			zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1041);
 			if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) {
 				if (!(zephir_array_isset_string(&column, SL("balias")))) {
 					isComplex = 1;
@@ -1778,10 +1776,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 			ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1038);
 					return;
 				}
-				zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029);
+				zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1041);
 				if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) {
 					if (!(zephir_array_isset_string(&column, SL("balias")))) {
 						isComplex = 1;
@@ -1819,7 +1817,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	array_init(&simpleColumnMap);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&metaData, &_0);
-	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1148);
+	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1160);
 	if (Z_TYPE_P(&columns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14)
 		{
@@ -1832,11 +1830,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 			ZEPHIR_INIT_NVAR(&column);
 			ZVAL_COPY(&column, _14);
 			ZEPHIR_OBS_NVAR(&sqlColumn);
-			zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065);
-			zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068);
+			zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1077);
+			zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1080);
 			if (ZEPHIR_IS_STRING(&_18$$28, "object")) {
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069);
+				zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1081);
 				ZEPHIR_OBS_NVAR(&instance);
 				zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 				if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) {
@@ -1854,7 +1852,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 						ZEPHIR_INIT_NVAR(&columnMap);
 						ZVAL_NULL(&columnMap);
 					}
-					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105);
+					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1117);
 					if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31)
 						{
@@ -1867,7 +1865,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							ZEPHIR_INIT_NVAR(&_26$$34);
 							ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute);
 							zephir_array_fast_append(&_25$$34, &_26$$34);
-							zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+							zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 						} ZEND_HASH_FOREACH_END();
 					} else {
 						ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -1887,7 +1885,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								ZEPHIR_INIT_NVAR(&_28$$35);
 								ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute);
 								zephir_array_fast_append(&_27$$35, &_28$$35);
-								zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+								zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 							zephir_check_call_status();
 						}
@@ -1905,7 +1903,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 						zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots"));
 					}
 				} else {
-					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122);
+					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1134);
 					if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37)
 						{
@@ -1915,7 +1913,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_create_array(&_34$$38, 2, 0);
 							zephir_array_fast_append(&_34$$38, &attribute);
 							zephir_array_fast_append(&_34$$38, &sqlColumn);
-							zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+							zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 						} ZEND_HASH_FOREACH_END();
 					} else {
 						ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -1932,7 +1930,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_35$$39, 2, 0);
 								zephir_array_fast_append(&_35$$39, &attribute);
 								zephir_array_fast_append(&_35$$39, &sqlColumn);
-								zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+								zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 							zephir_check_call_status();
 						}
@@ -1955,7 +1953,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					zephir_array_fast_append(&_37$$42, &aliasCopy);
 					ZEPHIR_CPY_WRT(&columnAlias, &_37$$42);
 				}
-				zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133);
+				zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145);
 			}
 			_38$$28 = !isComplex;
 			if (_38$$28) {
@@ -1984,11 +1982,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 			ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&sqlColumn);
-				zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065);
-				zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068);
+				zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1077);
+				zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1080);
 				if (ZEPHIR_IS_STRING(&_39$$46, "object")) {
 					ZEPHIR_OBS_NVAR(&modelName);
-					zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069);
+					zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1081);
 					ZEPHIR_OBS_NVAR(&instance);
 					zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 					if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) {
@@ -2006,7 +2004,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							ZEPHIR_INIT_NVAR(&columnMap);
 							ZVAL_NULL(&columnMap);
 						}
-						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105);
+						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1117);
 						if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49)
 							{
@@ -2019,7 +2017,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								ZEPHIR_INIT_NVAR(&_47$$52);
 								ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute);
 								zephir_array_fast_append(&_46$$52, &_47$$52);
-								zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+								zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 							} ZEND_HASH_FOREACH_END();
 						} else {
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -2039,7 +2037,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 									ZEPHIR_INIT_NVAR(&_49$$53);
 									ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute);
 									zephir_array_fast_append(&_48$$53, &_49$$53);
-									zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+									zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 								ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 								zephir_check_call_status();
 							}
@@ -2057,7 +2055,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots"));
 						}
 					} else {
-						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122);
+						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1134);
 						if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55)
 							{
@@ -2067,7 +2065,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_55$$56, 2, 0);
 								zephir_array_fast_append(&_55$$56, &attribute);
 								zephir_array_fast_append(&_55$$56, &sqlColumn);
-								zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+								zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 							} ZEND_HASH_FOREACH_END();
 						} else {
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -2084,7 +2082,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 									zephir_create_array(&_56$$57, 2, 0);
 									zephir_array_fast_append(&_56$$57, &attribute);
 									zephir_array_fast_append(&_56$$57, &sqlColumn);
-									zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+									zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 								ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 								zephir_check_call_status();
 							}
@@ -2106,7 +2104,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 						zephir_array_fast_append(&_58$$60, &aliasCopy);
 						ZEPHIR_CPY_WRT(&columnAlias, &_58$$60);
 					}
-					zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133);
+					zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145);
 				}
 				_59$$46 = !isComplex;
 				if (_59$$46) {
@@ -2131,7 +2129,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	ZEPHIR_INIT_VAR(&bindCounts);
 	array_init(&bindCounts);
 	zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE);
-	zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1169);
+	zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1181);
 	if (Z_TYPE_P(&bindParams) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60)
 		{
@@ -2189,7 +2187,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	ZEPHIR_INIT_NVAR(&wildcard);
 	ZEPHIR_INIT_VAR(&processedTypes);
 	array_init(&processedTypes);
-	zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1182);
+	zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1194);
 	if (Z_TYPE_P(&bindTypes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66)
 		{
@@ -2294,7 +2292,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					array_init(&simpleColumnMap);
 					ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject);
 					zephir_check_call_status();
-					zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1270);
+					zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1282);
 					if (Z_TYPE_P(&_74$$90) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90)
 						{
@@ -2304,7 +2302,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_create_array(&_77$$91, 2, 0);
 							zephir_array_fast_append(&_77$$91, &attribute);
 							ZEPHIR_OBS_NVAR(&_78$$91);
-							zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268);
+							zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280);
 							zephir_array_fast_append(&_77$$91, &_78$$91);
 							zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE);
 						} ZEND_HASH_FOREACH_END();
@@ -2323,7 +2321,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_79$$92, 2, 0);
 								zephir_array_fast_append(&_79$$92, &attribute);
 								ZEPHIR_OBS_NVAR(&_80$$92);
-								zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268);
+								zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280);
 								zephir_array_fast_append(&_79$$92, &_80$$92);
 								zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0);
@@ -2333,7 +2331,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					ZEPHIR_INIT_NVAR(&attribute);
 				} else {
 					array_init(&simpleColumnMap);
-					zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1279);
+					zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1291);
 					if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93)
 						{
@@ -2349,7 +2347,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_create_array(&_85$$94, 2, 0);
 							zephir_array_fast_append(&_85$$94, &attribute);
 							ZEPHIR_OBS_NVAR(&_86$$94);
-							zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277);
+							zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1289);
 							zephir_array_fast_append(&_85$$94, &_86$$94);
 							zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE);
 						} ZEND_HASH_FOREACH_END();
@@ -2370,7 +2368,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_87$$95, 2, 0);
 								zephir_array_fast_append(&_87$$95, &attribute);
 								ZEPHIR_OBS_NVAR(&_88$$95);
-								zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277);
+								zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1289);
 								zephir_array_fast_append(&_87$$95, &_88$$95);
 								zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0);
@@ -2400,7 +2398,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found");
 					ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 29, &_92$$98);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1295);
+					zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1307);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -2415,7 +2413,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface");
 					ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 29, &_96$$99);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1301);
+					zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1313);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -2526,13 +2524,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 
 
 	ZEPHIR_OBS_VAR(&models);
-	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1349);
+	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1361);
 	if (UNEXPECTED(zephir_array_isset_long(&models, 1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1354);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1366);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1357);
+	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1369);
 	ZEPHIR_OBS_VAR(&model);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) {
@@ -2545,14 +2543,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 	ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&fields);
-	zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1376);
+	zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1388);
 	ZEPHIR_OBS_VAR(&values);
-	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1377);
+	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1389);
 	ZEPHIR_INIT_VAR(&updateValues);
 	array_init(&updateValues);
 	ZEPHIR_CPY_WRT(&selectBindParams, &bindParams);
 	ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes);
-	zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1449);
+	zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1461);
 	if (Z_TYPE_P(&fields) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2)
 		{
@@ -2565,17 +2563,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 			ZEPHIR_INIT_NVAR(&field);
 			ZVAL_COPY(&field, _2);
 			ZEPHIR_OBS_NVAR(&value);
-			zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392);
+			zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1404);
 			ZEPHIR_OBS_NVAR(&exprValue);
-			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393);
+			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1405);
 			if (zephir_array_isset_string(&field, SL("balias"))) {
 				ZEPHIR_OBS_NVAR(&fieldName);
-				zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396);
+				zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1408);
 			} else {
 				ZEPHIR_OBS_NVAR(&fieldName);
-				zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398);
+				zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1410);
 			}
-			zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401);
+			zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1413);
 			do {
 				if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) {
 					ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue);
@@ -2604,7 +2602,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 						ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list");
 						ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 29, &_13$$11);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1424);
+						zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1436);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -2613,7 +2611,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&_6$$5, 277)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1445);
 					return;
 				}
 				ZEPHIR_INIT_NVAR(&updateValue);
@@ -2641,17 +2639,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 			ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&value);
-				zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392);
+				zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1404);
 				ZEPHIR_OBS_NVAR(&exprValue);
-				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393);
+				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1405);
 				if (zephir_array_isset_string(&field, SL("balias"))) {
 					ZEPHIR_OBS_NVAR(&fieldName);
-					zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396);
+					zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1408);
 				} else {
 					ZEPHIR_OBS_NVAR(&fieldName);
-					zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398);
+					zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1410);
 				}
-				zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401);
+				zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1413);
 				do {
 					if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) {
 						ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue);
@@ -2680,7 +2678,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 							ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list");
 							ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 29, &_25$$20);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1424);
+							zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1436);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -2689,7 +2687,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 						break;
 					}
 					if (ZEPHIR_IS_LONG(&_18$$14, 277)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1445);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&updateValue);
@@ -2782,7 +2780,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument)
 	ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param);
 
 
-	zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1511);
+	zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1523);
 	if (ZEPHIR_IS_LONG(&_0, 352)) {
 		zephir_create_array(return_value, 1, 0);
 		add_assoc_stringl_ex(return_value, SL("type"), SL("all"));
@@ -2841,8 +2839,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 
 	ZEPHIR_INIT_VAR(&whenClauses);
 	array_init(&whenClauses);
-	zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1529);
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1544);
+	zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1541);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1556);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -2852,24 +2850,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 				ZEPHIR_INIT_NVAR(&_3$$4);
 				zephir_create_array(&_3$$4, 3, 0);
 				add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when"));
-				zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533);
+				zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1545);
 				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_5$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE);
-				zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534);
+				zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
 				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_7$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535);
+				zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1547);
 			} else {
 				ZEPHIR_INIT_NVAR(&_8$$5);
 				zephir_create_array(&_8$$5, 2, 0);
 				add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else"));
-				zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539);
+				zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1551);
 				ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 460, &_10$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540);
+				zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1552);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -2887,24 +2885,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 					ZEPHIR_INIT_NVAR(&_11$$7);
 					zephir_create_array(&_11$$7, 3, 0);
 					add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when"));
-					zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533);
+					zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1545);
 					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_13$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE);
-					zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534);
+					zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
 					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_14$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535);
+					zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1547);
 				} else {
 					ZEPHIR_INIT_NVAR(&_15$$8);
 					zephir_create_array(&_15$$8, 2, 0);
 					add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else"));
-					zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539);
+					zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1551);
 					ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 460, &_17$$8);
 					zephir_check_call_status();
 					zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540);
+					zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1552);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0);
 			zephir_check_call_status();
@@ -2913,7 +2911,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 	ZEPHIR_INIT_NVAR(&whenExpr);
 	zephir_create_array(return_value, 3, 0);
 	add_assoc_stringl_ex(return_value, SL("type"), SL("case"));
-	zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
+	zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1558);
 	ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 460, &_19);
 	zephir_check_call_status();
 	zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE);
@@ -3264,7 +3262,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_18$$25, 2, 0);
 				add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal"));
 				ZEPHIR_OBS_VAR(&_19$$25);
-				zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1762);
+				zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1774);
 				zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CPY_WRT(&exprReturn, &_18$$25);
 				break;
@@ -3287,9 +3285,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 260)) {
 				ZEPHIR_OBS_VAR(&value);
-				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1783);
+				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1795);
 				if (quoting) {
-					if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1790)) {
+					if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1802)) {
 						ZEPHIR_INIT_VAR(&escapedValue);
 						phalcon_orm_singlequotes(&escapedValue, &value);
 					} else {
@@ -3312,7 +3310,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_23$$33, 2, 0);
 				add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder"));
 				ZEPHIR_INIT_VAR(&_24$$33);
-				zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1811);
+				zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1823);
 				ZEPHIR_INIT_VAR(&_26$$33);
 				ZVAL_STRING(&_26$$33, "?");
 				ZEPHIR_INIT_VAR(&_27$$33);
@@ -3326,7 +3324,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				ZEPHIR_INIT_VAR(&_28$$34);
 				zephir_create_array(&_28$$34, 2, 0);
 				add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder"));
-				zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1820);
+				zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1832);
 				ZEPHIR_INIT_VAR(&_30$$34);
 				ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34);
 				zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE);
@@ -3335,14 +3333,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 277)) {
 				ZEPHIR_OBS_NVAR(&value);
-				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1825);
-				if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1827)) {
+				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1837);
+				if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1839)) {
 					ZEPHIR_INIT_VAR(&valueParts);
 					zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX);
 					ZEPHIR_OBS_VAR(&name);
-					zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1829);
+					zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1841);
 					ZEPHIR_OBS_VAR(&bindType);
-					zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1830);
+					zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1842);
 					do {
 						if (ZEPHIR_IS_STRING(&bindType, "str")) {
 							ZEPHIR_INIT_VAR(&_31$$37);
@@ -3432,7 +3430,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 								ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name);
 								ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 29, &_51$$44);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1900);
+								zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1912);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -3443,7 +3441,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 								ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name);
 								ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 29, &_53$$45);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1906);
+								zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1918);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -3454,7 +3452,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 								ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name);
 								ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 29, &_55$$46);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1912);
+								zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1924);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -3475,7 +3473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 						ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType);
 						ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 29, &_59$$47);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1927);
+						zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1939);
 						ZEPHIR_MM_RESTORE();
 						return;
 					} while(0);
@@ -3657,7 +3655,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_79$$66, 2, 0);
 				add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal"));
 				ZEPHIR_OBS_VAR(&_80$$66);
-				zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2103);
+				zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2115);
 				zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CPY_WRT(&exprReturn, &_79$$66);
 				break;
@@ -3689,7 +3687,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType);
 			ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 29, &_85$$70);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2126);
+			zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2138);
 			ZEPHIR_MM_RESTORE();
 			return;
 		} while(0);
@@ -3704,7 +3702,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 	if (zephir_array_isset_long(&expr, 0)) {
 		ZEPHIR_INIT_VAR(&listItems);
 		array_init(&listItems);
-		zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2149);
+		zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2161);
 		if (Z_TYPE_P(&expr) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72)
 			{
@@ -3712,7 +3710,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				ZVAL_COPY(&exprListItem, _86$$72);
 				ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 460, &exprListItem);
 				zephir_check_call_status();
-				zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146);
+				zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0);
@@ -3727,7 +3725,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 460, &exprListItem);
 					zephir_check_call_status();
-					zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146);
+					zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158);
 				ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -3738,7 +3736,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 		zephir_array_fast_append(return_value, &listItems);
 		RETURN_MM();
 	}
-	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2155);
+	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2167);
 	return;
 }
 
@@ -3790,7 +3788,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 		if (zephir_array_isset_long(&arguments, 0)) {
 			ZEPHIR_INIT_VAR(&functionArgs);
 			array_init(&functionArgs);
-			zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2181);
+			zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2193);
 			if (Z_TYPE_P(&arguments) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6)
 				{
@@ -3798,7 +3796,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 					ZVAL_COPY(&argument, _0$$6);
 					ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 464, &argument);
 					zephir_check_call_status();
-					zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179);
+					zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191);
 				} ZEND_HASH_FOREACH_END();
 			} else {
 				ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0);
@@ -3813,7 +3811,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 					zephir_check_call_status();
 						ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 464, &argument);
 						zephir_check_call_status();
-						zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179);
+						zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191);
 					ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
 					zephir_check_call_status();
 				}
@@ -3831,7 +3829,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 			zephir_create_array(return_value, 4, 0);
 			add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall"));
 			ZEPHIR_OBS_VAR(&_7$$10);
-			zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2191);
+			zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2203);
 			zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE);
 			zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE);
 			ZEPHIR_INIT_VAR(&_8$$10);
@@ -3842,7 +3840,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 			zephir_create_array(return_value, 3, 0);
 			add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall"));
 			ZEPHIR_OBS_VAR(&_9$$11);
-			zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2198);
+			zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2210);
 			zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE);
 			zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE);
 			RETURN_MM();
@@ -3851,7 +3849,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 	zephir_create_array(return_value, 2, 0);
 	add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall"));
 	ZEPHIR_OBS_VAR(&_10);
-	zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2207);
+	zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2219);
 	zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE);
 	RETURN_MM();
 }
@@ -3892,7 +3890,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 	if (zephir_array_isset_long(&group, 0)) {
 		ZEPHIR_INIT_VAR(&groupParts);
 		array_init(&groupParts);
-		zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2227);
+		zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2239);
 		if (Z_TYPE_P(&group) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3)
 			{
@@ -3900,7 +3898,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 				ZVAL_COPY(&groupItem, _0$$3);
 				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 460, &groupItem);
 				zephir_check_call_status();
-				zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225);
+				zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0);
@@ -3915,7 +3913,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 460, &groupItem);
 					zephir_check_call_status();
-					zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225);
+					zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237);
 				ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -4014,10 +4012,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin)
 
 	ZEPHIR_OBS_VAR(&qualified);
 	if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) {
-		zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2263);
+		zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2275);
 		if (ZEPHIR_IS_LONG(&_0$$3, 355)) {
 			ZEPHIR_OBS_VAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2264);
+			zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2276);
 			ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -4032,7 +4030,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin)
 			RETURN_MM();
 		}
 	}
-	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2279);
+	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2291);
 	return;
 }
 
@@ -4067,7 +4065,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType)
 
 	ZEPHIR_OBS_VAR(&type);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2290);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2302);
 		return;
 	}
 	do {
@@ -4095,7 +4093,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType)
 	ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1);
 	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_2);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2312);
+	zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2324);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -4269,7 +4267,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_OBS_VAR(&tables);
-	zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2348);
+	zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2360);
 	if (!(zephir_array_isset_long(&tables, 0))) {
 		ZEPHIR_INIT_VAR(&selectTables);
 		zephir_create_array(&selectTables, 1, 0);
@@ -4278,7 +4276,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 		ZEPHIR_CPY_WRT(&selectTables, &tables);
 	}
 	ZEPHIR_OBS_VAR(&joins);
-	zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2356);
+	zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2368);
 	if (!(zephir_array_isset_long(&joins, 0))) {
 		ZEPHIR_INIT_VAR(&selectJoins);
 		zephir_create_array(&selectJoins, 1, 0);
@@ -4286,7 +4284,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	} else {
 		ZEPHIR_CPY_WRT(&selectJoins, &joins);
 	}
-	zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2507);
+	zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2519);
 	if (Z_TYPE_P(&selectJoins) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1)
 		{
@@ -4295,13 +4293,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem);
 			zephir_check_call_status();
 			ZEPHIR_OBS_NVAR(&source);
-			zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370);
+			zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2382);
 			ZEPHIR_OBS_NVAR(&schema);
-			zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371);
+			zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2383);
 			ZEPHIR_OBS_NVAR(&model);
-			zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372);
+			zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2384);
 			ZEPHIR_OBS_NVAR(&realModelName);
-			zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373);
+			zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
 			ZEPHIR_INIT_NVAR(&completeSource);
 			zephir_create_array(&completeSource, 2, 0);
 			zephir_array_fast_append(&completeSource, &source);
@@ -4311,7 +4309,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			ZEPHIR_OBS_NVAR(&aliasExpr);
 			if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) {
 				ZEPHIR_OBS_NVAR(&alias);
-				zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
+				zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2397);
 				if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) {
 					ZEPHIR_INIT_NVAR(&_5$$9);
 					object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce);
@@ -4320,11 +4318,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 29, &_7$$9);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2393);
+					zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2405);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399);
+				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2411);
 				zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE);
@@ -4343,7 +4341,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11);
 					ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_11$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2452);
+					zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2464);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -4373,13 +4371,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&source);
-				zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370);
+				zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2382);
 				ZEPHIR_OBS_NVAR(&schema);
-				zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371);
+				zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2383);
 				ZEPHIR_OBS_NVAR(&model);
-				zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372);
+				zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2384);
 				ZEPHIR_OBS_NVAR(&realModelName);
-				zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373);
+				zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
 				ZEPHIR_INIT_NVAR(&_12$$12);
 				zephir_create_array(&_12$$12, 2, 0);
 				zephir_array_fast_append(&_12$$12, &source);
@@ -4390,7 +4388,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				ZEPHIR_OBS_NVAR(&aliasExpr);
 				if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) {
 					ZEPHIR_OBS_NVAR(&alias);
-					zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
+					zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2397);
 					if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) {
 						ZEPHIR_INIT_NVAR(&_13$$14);
 						object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce);
@@ -4399,11 +4397,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14);
 						ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_15$$14);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2393);
+						zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2405);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2411);
 					zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE);
@@ -4422,7 +4420,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16);
 						ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 29, &_18$$16);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2452);
+						zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2464);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -4448,7 +4446,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances);
-	zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2527);
+	zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2539);
 	if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19)
 		{
@@ -4495,7 +4493,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
 		ZEPHIR_INIT_VAR(&_26$$21);
-		zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2539);
+		zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2551);
 		if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21)
 			{
@@ -4508,11 +4506,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				ZEPHIR_INIT_NVAR(&_26$$21);
 				ZVAL_COPY(&_26$$21, _27$$21);
 				ZEPHIR_OBS_NVAR(&joinType);
-				zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529);
+				zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2541);
 				ZEPHIR_OBS_NVAR(&joinSource);
-				zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530);
+				zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2542);
 				ZEPHIR_OBS_NVAR(&preCondition);
-				zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531);
+				zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2543);
 				ZEPHIR_INIT_NVAR(&_31$$22);
 				zephir_create_array(&_31$$22, 3, 0);
 				zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE);
@@ -4521,7 +4519,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				zephir_create_array(&_32$$22, 1, 0);
 				zephir_array_fast_append(&_32$$22, &preCondition);
 				zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536);
+				zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2548);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0);
@@ -4537,11 +4535,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&joinType);
-					zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529);
+					zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2541);
 					ZEPHIR_OBS_NVAR(&joinSource);
-					zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530);
+					zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2542);
 					ZEPHIR_OBS_NVAR(&preCondition);
-					zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531);
+					zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2543);
 					ZEPHIR_INIT_NVAR(&_33$$23);
 					zephir_create_array(&_33$$23, 3, 0);
 					zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE);
@@ -4550,7 +4548,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					zephir_create_array(&_34$$23, 1, 0);
 					zephir_array_fast_append(&_34$$23, &preCondition);
 					zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536);
+					zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2548);
 				ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -4561,15 +4559,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	}
 	ZEPHIR_INIT_NVAR(&fromModels);
 	array_init(&fromModels);
-	zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2554);
+	zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2566);
 	if (Z_TYPE_P(&selectTables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35)
 		{
 			ZEPHIR_INIT_NVAR(&tableItem);
 			ZVAL_COPY(&tableItem, _35);
-			zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548);
+			zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2560);
 			ZEPHIR_OBS_NVAR(&_38$$24);
-			zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548);
+			zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560);
 			zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -4583,9 +4581,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			}
 			ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548);
+				zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2560);
 				ZEPHIR_OBS_NVAR(&_40$$25);
-				zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548);
+				zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560);
 				zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0);
 			zephir_check_call_status();
@@ -4593,7 +4591,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	}
 	ZEPHIR_INIT_NVAR(&tableItem);
 	ZEPHIR_INIT_VAR(&_41);
-	zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2674);
+	zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2686);
 	if (Z_TYPE_P(&fromModels) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42)
 		{
@@ -4605,7 +4603,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			}
 			ZEPHIR_INIT_NVAR(&_41);
 			ZVAL_COPY(&_41, _42);
-			zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672);
+			zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2684);
 			if (Z_TYPE_P(&joinModels) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26)
 				{
@@ -4618,13 +4616,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_INIT_NVAR(&joinModel);
 					ZVAL_COPY(&joinModel, _46$$26);
 					ZEPHIR_OBS_NVAR(&joinSource);
-					zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+					zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 					ZEPHIR_OBS_NVAR(&joinType);
-					zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+					zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 					ZEPHIR_OBS_NVAR(&preCondition);
 					if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 						ZEPHIR_OBS_NVAR(&modelNameAlias);
-						zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+						zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 						ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias);
 						zephir_check_call_status();
 						if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -4639,17 +4637,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31);
 									ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 29, &_54$$31);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2599);
+									zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2611);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
 								ZEPHIR_OBS_NVAR(&relation);
-								zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+								zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 							}
 						}
 						if (Z_TYPE_P(&relation) == IS_OBJECT) {
 							ZEPHIR_OBS_NVAR(&modelAlias);
-							zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+							zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 							ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0);
 							zephir_check_call_status();
 							if (!(zephir_is_true(&_55$$32))) {
@@ -4660,13 +4658,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								zephir_check_call_status();
 							}
 							if (zephir_array_isset_long(&sqlJoin, 0)) {
-								zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+								zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 								if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35)
 									{
 										ZEPHIR_INIT_NVAR(&sqlJoinItem);
 										ZVAL_COPY(&sqlJoinItem, _58$$35);
-										zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+										zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 									} ZEND_HASH_FOREACH_END();
 								} else {
 									ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -4679,14 +4677,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										}
 										ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 										zephir_check_call_status();
-											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 										ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 										zephir_check_call_status();
 									}
 								}
 								ZEPHIR_INIT_NVAR(&sqlJoinItem);
 							} else {
-								zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+								zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 							}
 						} else {
 							ZEPHIR_INIT_NVAR(&_60$$39);
@@ -4696,7 +4694,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							ZEPHIR_INIT_NVAR(&_61$$39);
 							array_init(&_61$$39);
 							zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+							zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 						}
 					} else {
 						ZEPHIR_INIT_NVAR(&_62$$40);
@@ -4707,7 +4705,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						zephir_create_array(&_63$$40, 1, 0);
 						zephir_array_fast_append(&_63$$40, &preCondition);
 						zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+						zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 					}
 				} ZEND_HASH_FOREACH_END();
 			} else {
@@ -4724,13 +4722,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0);
 					zephir_check_call_status();
 						ZEPHIR_OBS_NVAR(&joinSource);
-						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 						ZEPHIR_OBS_NVAR(&joinType);
-						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 						ZEPHIR_OBS_NVAR(&preCondition);
 						if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 							ZEPHIR_OBS_NVAR(&modelNameAlias);
-							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias);
 							zephir_check_call_status();
 							if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -4745,17 +4743,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45);
 										ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 29, &_68$$45);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2599);
+										zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2611);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
 									ZEPHIR_OBS_NVAR(&relation);
-									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 								}
 							}
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
 								ZEPHIR_OBS_NVAR(&modelAlias);
-								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 								ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0);
 								zephir_check_call_status();
 								if (!(zephir_is_true(&_69$$46))) {
@@ -4766,13 +4764,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									zephir_check_call_status();
 								}
 								if (zephir_array_isset_long(&sqlJoin, 0)) {
-									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 									if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49)
 										{
 											ZEPHIR_INIT_NVAR(&sqlJoinItem);
 											ZVAL_COPY(&sqlJoinItem, _70$$49);
-											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 										} ZEND_HASH_FOREACH_END();
 									} else {
 										ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -4785,14 +4783,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 											}
 											ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 											zephir_check_call_status();
-												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 											ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 											zephir_check_call_status();
 										}
 									}
 									ZEPHIR_INIT_NVAR(&sqlJoinItem);
 								} else {
-									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 								}
 							} else {
 								ZEPHIR_INIT_NVAR(&_72$$53);
@@ -4802,7 +4800,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								ZEPHIR_INIT_NVAR(&_73$$53);
 								array_init(&_73$$53);
 								zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+								zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 							}
 						} else {
 							ZEPHIR_INIT_NVAR(&_74$$54);
@@ -4813,7 +4811,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							zephir_create_array(&_75$$54, 1, 0);
 							zephir_array_fast_append(&_75$$54, &preCondition);
 							zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+							zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 						}
 					ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0);
 					zephir_check_call_status();
@@ -4835,7 +4833,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672);
+				zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2684);
 				if (Z_TYPE_P(&joinModels) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55)
 					{
@@ -4848,13 +4846,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_INIT_NVAR(&joinModel);
 						ZVAL_COPY(&joinModel, _76$$55);
 						ZEPHIR_OBS_NVAR(&joinSource);
-						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 						ZEPHIR_OBS_NVAR(&joinType);
-						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 						ZEPHIR_OBS_NVAR(&preCondition);
 						if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 							ZEPHIR_OBS_NVAR(&modelNameAlias);
-							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias);
 							zephir_check_call_status();
 							if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -4869,17 +4867,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60);
 										ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 29, &_84$$60);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2599);
+										zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2611);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
 									ZEPHIR_OBS_NVAR(&relation);
-									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 								}
 							}
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
 								ZEPHIR_OBS_NVAR(&modelAlias);
-								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 								ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0);
 								zephir_check_call_status();
 								if (!(zephir_is_true(&_85$$61))) {
@@ -4890,13 +4888,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									zephir_check_call_status();
 								}
 								if (zephir_array_isset_long(&sqlJoin, 0)) {
-									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 									if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64)
 										{
 											ZEPHIR_INIT_NVAR(&sqlJoinItem);
 											ZVAL_COPY(&sqlJoinItem, _86$$64);
-											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 										} ZEND_HASH_FOREACH_END();
 									} else {
 										ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -4909,14 +4907,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 											}
 											ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 											zephir_check_call_status();
-												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 											ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 											zephir_check_call_status();
 										}
 									}
 									ZEPHIR_INIT_NVAR(&sqlJoinItem);
 								} else {
-									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 								}
 							} else {
 								ZEPHIR_INIT_NVAR(&_88$$68);
@@ -4926,7 +4924,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								ZEPHIR_INIT_NVAR(&_89$$68);
 								array_init(&_89$$68);
 								zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+								zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 							}
 						} else {
 							ZEPHIR_INIT_NVAR(&_90$$69);
@@ -4937,7 +4935,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							zephir_create_array(&_91$$69, 1, 0);
 							zephir_array_fast_append(&_91$$69, &preCondition);
 							zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+							zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 						}
 					} ZEND_HASH_FOREACH_END();
 				} else {
@@ -4954,13 +4952,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0);
 						zephir_check_call_status();
 							ZEPHIR_OBS_NVAR(&joinSource);
-							zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+							zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 							ZEPHIR_OBS_NVAR(&joinType);
-							zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+							zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 							ZEPHIR_OBS_NVAR(&preCondition);
 							if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 								ZEPHIR_OBS_NVAR(&modelNameAlias);
-								zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+								zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 								ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias);
 								zephir_check_call_status();
 								if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -4975,17 +4973,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 											ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74);
 											ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 29, &_96$$74);
 											zephir_check_call_status();
-											zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2599);
+											zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2611);
 											ZEPHIR_MM_RESTORE();
 											return;
 										}
 										ZEPHIR_OBS_NVAR(&relation);
-										zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+										zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 									}
 								}
 								if (Z_TYPE_P(&relation) == IS_OBJECT) {
 									ZEPHIR_OBS_NVAR(&modelAlias);
-									zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+									zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 									ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0);
 									zephir_check_call_status();
 									if (!(zephir_is_true(&_97$$75))) {
@@ -4996,13 +4994,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										zephir_check_call_status();
 									}
 									if (zephir_array_isset_long(&sqlJoin, 0)) {
-										zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+										zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 										if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 											ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78)
 											{
 												ZEPHIR_INIT_NVAR(&sqlJoinItem);
 												ZVAL_COPY(&sqlJoinItem, _98$$78);
-												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 											} ZEND_HASH_FOREACH_END();
 										} else {
 											ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -5015,14 +5013,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 												}
 												ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 												zephir_check_call_status();
-													zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+													zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 												ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 												zephir_check_call_status();
 											}
 										}
 										ZEPHIR_INIT_NVAR(&sqlJoinItem);
 									} else {
-										zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+										zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 									}
 								} else {
 									ZEPHIR_INIT_NVAR(&_100$$82);
@@ -5032,7 +5030,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									ZEPHIR_INIT_NVAR(&_101$$82);
 									array_init(&_101$$82);
 									zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE);
-									zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+									zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 								}
 							} else {
 								ZEPHIR_INIT_NVAR(&_102$$83);
@@ -5043,7 +5041,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								zephir_create_array(&_103$$83, 1, 0);
 								zephir_array_fast_append(&_103$$83, &preCondition);
 								zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+								zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 							}
 						ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0);
 						zephir_check_call_status();
@@ -5173,7 +5171,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 	ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&fields) == IS_ARRAY) {
-		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2791);
+		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2803);
 		if (Z_TYPE_P(&fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3)
 			{
@@ -5193,12 +5191,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 					ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 29, &_7$$5);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2758);
+					zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2770);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&intermediateField);
-				zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764);
+				zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2776);
 				ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition);
 				zephir_create_array(&sqlEqualsJoinCondition, 4, 0);
 				add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op"));
@@ -5241,12 +5239,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 						ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7);
 						ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 29, &_15$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2758);
+						zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2770);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&intermediateField);
-					zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764);
+					zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2776);
 					ZEPHIR_INIT_NVAR(&_16$$6);
 					zephir_create_array(&_16$$6, 4, 0);
 					add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op"));
@@ -5398,13 +5396,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 	}
 	ZEPHIR_INIT_VAR(&orderParts);
 	array_init(&orderParts);
-	zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2900);
+	zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2912);
 	if (Z_TYPE_P(&orderColumns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0)
 		{
 			ZEPHIR_INIT_NVAR(&orderItem);
 			ZVAL_COPY(&orderItem, _0);
-			zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882);
+			zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2894);
 			ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_2$$5);
 			zephir_check_call_status();
 			if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) {
@@ -5430,7 +5428,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 				zephir_array_fast_append(&_7$$9, &orderPartExpr);
 				ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9);
 			}
-			zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897);
+			zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2909);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0);
@@ -5443,7 +5441,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 			}
 			ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882);
+				zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2894);
 				ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_8$$10);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&orderSort);
@@ -5471,7 +5469,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 					zephir_array_fast_append(&_13$$14, &orderPartExpr);
 					ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14);
 				}
-				zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897);
+				zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2909);
 			ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -5559,13 +5557,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 
 
 	ZEPHIR_OBS_VAR(&columnName);
-	zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2914);
+	zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2926);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&nestingLevel, &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset(&_0, &nestingLevel)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2922);
+		zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2934);
 		ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3);
 	} else {
 		ZEPHIR_INIT_NVAR(&sqlColumnAliases);
@@ -5575,7 +5573,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 	if (_3) {
 		_4 = !(zephir_array_isset_string(&expr, SL("domain")));
 		if (!(_4)) {
-			zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2927);
+			zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2939);
 			_4 = ZEPHIR_IS_EMPTY(&_5);
 		}
 		_3 = _4;
@@ -5601,7 +5599,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 			ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7);
 			ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 29, &_10$$7);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2948);
+			zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2960);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -5617,7 +5615,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 				ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9);
 				ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 29, &_14$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2967);
+				zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2979);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -5637,7 +5635,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 				ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12);
 				ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 29, &_17$$12);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2979);
+				zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2991);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -5649,7 +5647,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 		ZEPHIR_INIT_VAR(&hasModel);
 		ZVAL_BOOL(&hasModel, 0);
 		zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3013);
+		zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3025);
 		if (Z_TYPE_P(&_18$$14) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14)
 			{
@@ -5667,7 +5665,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 						ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17);
 						ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 29, &_25$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3002);
+						zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3014);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -5697,7 +5695,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 							ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20);
 							ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 29, &_30$$20);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3002);
+							zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3014);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5716,14 +5714,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 			ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21);
 			ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 29, &_33$$21);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3016);
+			zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3028);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&models, &_34$$14);
 		if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3027);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3039);
 			return;
 		}
 		ZEPHIR_INIT_VAR(&className);
@@ -5737,7 +5735,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 			ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23);
 			ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 29, &_37$$23);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3038);
+			zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3050);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -5758,7 +5756,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 				ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27);
 				ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 29, &_40$$27);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3057);
+				zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3069);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -5844,7 +5842,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection)
 		ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3101);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3113);
 			return;
 		}
 		RETURN_CCTOR(&connection);
@@ -5916,10 +5914,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords)
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE);
 	ZEPHIR_OBS_VAR(&_4);
-	zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3131);
+	zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3143);
 	zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE);
 	ZEPHIR_OBS_NVAR(&_4);
-	zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3133);
+	zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3145);
 	zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE);
 	ZEPHIR_OBS_VAR(&whereConditions);
 	if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) {
@@ -6008,7 +6006,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 
 	ZEPHIR_OBS_VAR(&columnType);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3173);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3185);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&sqlColumns);
@@ -6017,7 +6015,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 	zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0);
 	if (ZEPHIR_IS_LONG(&columnType, 352)) {
 		zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3203);
+		zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3215);
 		if (Z_TYPE_P(&_0$$4) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4)
 			{
@@ -6039,10 +6037,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 				zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE);
 				if (Z_TYPE_P(&eager) != IS_NULL) {
 					zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-					zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197);
+					zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3209);
 					zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE);
 				}
-				zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200);
+				zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3212);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0);
@@ -6068,10 +6066,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 					ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7);
 					if (Z_TYPE_P(&eager) != IS_NULL) {
 						zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-						zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197);
+						zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3209);
 						zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE);
 					}
-					zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200);
+					zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3212);
 				ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -6081,14 +6079,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		RETURN_CTOR(&sqlColumns);
 	}
 	if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3207);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3219);
 		return;
 	}
 	if (ZEPHIR_IS_LONG(&columnType, 353)) {
 		zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10);
 		ZEPHIR_OBS_VAR(&columnDomain);
-		zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3219);
+		zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3231);
 		ZEPHIR_OBS_NVAR(&source);
 		if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) {
 			ZEPHIR_INIT_VAR(&_12$$11);
@@ -6098,7 +6096,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 			ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11);
 			ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3224);
+			zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3236);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -6108,7 +6106,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10);
 		ZEPHIR_OBS_NVAR(&modelName);
-		zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3238);
+		zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3250);
 		if (Z_TYPE_P(&preparedAlias) != IS_STRING) {
 			if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) {
 				ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 73, &modelName);
@@ -6126,10 +6124,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10);
 		if (Z_TYPE_P(&eager) != IS_NULL) {
 			zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-			zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3265);
+			zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3277);
 			zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE);
 		}
-		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3268);
+		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3280);
 		RETURN_CTOR(&sqlColumns);
 	}
 	if (ZEPHIR_IS_LONG(&columnType, 354)) {
@@ -6138,7 +6136,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar"));
 		ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16);
 		ZEPHIR_OBS_VAR(&columnData);
-		zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3282);
+		zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3294);
 		ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 460, &columnData);
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&balias);
@@ -6148,11 +6146,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		}
 		if (Z_TYPE_P(&eager) != IS_NULL) {
 			zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-			zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3295);
+			zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3307);
 			zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE);
 		}
 		zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE);
-		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3299);
+		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3311);
 		RETURN_CTOR(&sqlColumns);
 	}
 	ZEPHIR_INIT_VAR(&_19);
@@ -6161,7 +6159,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 	ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType);
 	ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 29, &_20);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3304);
+	zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3316);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -6276,7 +6274,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 	} else {
 		ZEPHIR_INIT_VAR(&sqlJoinPartialConditions);
 		array_init(&sqlJoinPartialConditions);
-		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3394);
+		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3406);
 		if (Z_TYPE_P(&fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4)
 			{
@@ -6297,7 +6295,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6);
 					ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 29, &_11$$6);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3366);
+					zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3378);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -6321,7 +6319,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 461, &_16$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391);
+				zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3403);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0);
@@ -6345,7 +6343,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 						ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8);
 						ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 29, &_19$$8);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3366);
+						zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3378);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -6369,7 +6367,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 461, &_23$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391);
+					zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3403);
 				ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -6419,7 +6417,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getTable)
 
 	ZEPHIR_OBS_VAR(&modelName);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3416);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3428);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName);
@@ -6507,7 +6505,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection)
 		ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3454);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3466);
 			return;
 		}
 		RETURN_CCTOR(&connection);
@@ -6569,12 +6567,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 	ZEPHIR_CPY_WRT(&ast, &_0);
 	ZEPHIR_OBS_VAR(&delete);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3476);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3488);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&tables);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3480);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3492);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&models);
@@ -6598,16 +6596,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3540);
+	zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3552);
 	if (Z_TYPE_P(&deleteTables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _1);
 			ZEPHIR_OBS_NVAR(&qualifiedName);
-			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504);
+			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3516);
 			ZEPHIR_OBS_NVAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505);
+			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3517);
 			ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -6631,17 +6629,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 			ZEPHIR_OBS_NVAR(&alias);
 			if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 				zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522);
-				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523);
+				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3534);
+				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3535);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 			} else {
 				zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529);
+				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3541);
 				zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 			}
-			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533);
+			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3545);
 			zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -6656,9 +6654,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 			ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&qualifiedName);
-				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504);
+				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3516);
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505);
+				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3517);
 				ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName);
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -6681,17 +6679,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 				ZEPHIR_OBS_NVAR(&alias);
 				if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 					zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522);
-					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3534);
+					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3535);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529);
+					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3541);
 					zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 				}
-				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533);
+				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3545);
 				zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0);
 			zephir_check_call_status();
@@ -6779,23 +6777,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&ast, &_0);
 	if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3574);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3586);
 		return;
 	}
 	if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3578);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3590);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&qualifiedName);
-	zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3581);
+	zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3593);
 	if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3585);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3597);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3589);
+	zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3601);
 	ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -6812,8 +6810,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 	notQuoting = 0;
 	ZEPHIR_INIT_VAR(&exprValues);
 	array_init(&exprValues);
-	zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3602);
-	zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3610);
+	zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3614);
+	zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3622);
 	if (Z_TYPE_P(&_2) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3)
 		{
@@ -6822,7 +6820,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 			ZEPHIR_INIT_NVAR(&_5$$7);
 			zephir_create_array(&_5$$7, 2, 0);
 			ZEPHIR_OBS_NVAR(&_6$$7);
-			zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605);
+			zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3617);
 			zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE);
 			if (notQuoting) {
 				ZVAL_BOOL(&_8$$7, 1);
@@ -6832,7 +6830,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 			ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 460, &exprValue, &_8$$7);
 			zephir_check_call_status();
 			zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE);
-			zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607);
+			zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3619);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0);
@@ -6848,7 +6846,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 				ZEPHIR_INIT_NVAR(&_10$$8);
 				zephir_create_array(&_10$$8, 2, 0);
 				ZEPHIR_OBS_NVAR(&_11$$8);
-				zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605);
+				zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3617);
 				zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE);
 				if (notQuoting) {
 					ZVAL_BOOL(&_13$$8, 1);
@@ -6858,7 +6856,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 				ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 460, &exprValue, &_13$$8);
 				zephir_check_call_status();
 				zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607);
+				zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3619);
 			ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -6874,14 +6872,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 	if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) {
 		ZEPHIR_INIT_VAR(&sqlFields);
 		array_init(&sqlFields);
-		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3634);
+		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3646);
 		if (Z_TYPE_P(&fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9)
 			{
 				ZEPHIR_INIT_NVAR(&field);
 				ZVAL_COPY(&field, _14$$9);
 				ZEPHIR_OBS_NVAR(&name);
-				zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621);
+				zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3633);
 				ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name);
 				zephir_check_call_status();
 				if (UNEXPECTED(!zephir_is_true(&_16$$10))) {
@@ -6892,11 +6890,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 					ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11);
 					ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 29, &_20$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3627);
+					zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3639);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631);
+				zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3643);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0);
@@ -6910,7 +6908,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 				ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&name);
-					zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621);
+					zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3633);
 					ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name);
 					zephir_check_call_status();
 					if (UNEXPECTED(!zephir_is_true(&_22$$12))) {
@@ -6921,11 +6919,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 						ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13);
 						ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 29, &_26$$13);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3627);
+						zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3639);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631);
+					zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3643);
 				ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -7131,12 +7129,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	}
 	ZEPHIR_OBS_VAR(&tables);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3670);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3682);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&columns);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3674);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3686);
 		return;
 	}
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel")));
@@ -7177,26 +7175,26 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&metaData, &_1);
 	if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3741);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3753);
 		return;
 	}
 	if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3747);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3759);
 		return;
 	}
 	number = 0;
 	ZEPHIR_INIT_VAR(&automaticJoins);
 	array_init(&automaticJoins);
-	zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3877);
+	zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3889);
 	if (Z_TYPE_P(&selectedModels) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2)
 		{
 			ZEPHIR_INIT_NVAR(&selectedModel);
 			ZVAL_COPY(&selectedModel, _2);
 			ZEPHIR_OBS_NVAR(&qualifiedName);
-			zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755);
+			zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3767);
 			ZEPHIR_OBS_NVAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756);
+			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3768);
 			ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0);
@@ -7221,7 +7219,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 29, &_7$$17);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3781);
+					zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3793);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -7230,7 +7228,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 				if (Z_TYPE_P(&completeSource) == IS_ARRAY) {
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3805);
 				} else {
 					ZEPHIR_INIT_NVAR(&_9$$19);
 					zephir_create_array(&_9$$19, 3, 0);
@@ -7257,7 +7255,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				} else {
 					ZEPHIR_CPY_WRT(&withs, &with);
 				}
-				zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869);
+				zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3881);
 				if (Z_TYPE_P(&withs) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21)
 					{
@@ -7269,7 +7267,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24);
 						ZEPHIR_CPY_WRT(&joinAlias, &_13$$24);
 						ZEPHIR_OBS_NVAR(&relationModel);
-						zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+						zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 						ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel);
 						zephir_check_call_status();
 						if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -7292,7 +7290,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27);
 								ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_19$$27);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3839);
+								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3851);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -7312,7 +7310,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 						zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 						zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+						zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 						ZEPHIR_INIT_NVAR(&_22$$24);
 						zephir_create_array(&_22$$24, 3, 0);
 						add_assoc_long_ex(&_22$$24, SL("type"), 360);
@@ -7326,7 +7324,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						add_assoc_long_ex(&_23$$24, SL("type"), 355);
 						zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 						zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+						zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 						number++;
 					} ZEND_HASH_FOREACH_END();
 				} else {
@@ -7346,7 +7344,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28);
 							ZEPHIR_CPY_WRT(&joinAlias, &_25$$28);
 							ZEPHIR_OBS_NVAR(&relationModel);
-							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel);
 							zephir_check_call_status();
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -7369,7 +7367,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31);
 									ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 29, &_31$$31);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3839);
+									zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3851);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -7389,7 +7387,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+							zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 							ZEPHIR_INIT_NVAR(&_34$$28);
 							zephir_create_array(&_34$$28, 3, 0);
 							add_assoc_long_ex(&_34$$28, SL("type"), 360);
@@ -7403,7 +7401,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							add_assoc_long_ex(&_35$$28, SL("type"), 355);
 							zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+							zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 							number++;
 						ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0);
 						zephir_check_call_status();
@@ -7411,8 +7409,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				}
 				ZEPHIR_INIT_NVAR(&withItem);
 			}
-			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871);
-			zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872);
+			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3883);
+			zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884);
 			zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -7427,9 +7425,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 			ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&qualifiedName);
-				zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755);
+				zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3767);
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756);
+				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3768);
 				ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName);
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0);
@@ -7455,7 +7453,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36);
 						ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 29, &_40$$36);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3781);
+						zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3793);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7464,7 +7462,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 					if (Z_TYPE_P(&completeSource) == IS_ARRAY) {
-						zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793);
+						zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3805);
 					} else {
 						ZEPHIR_INIT_NVAR(&_41$$38);
 						zephir_create_array(&_41$$38, 3, 0);
@@ -7492,7 +7490,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					} else {
 						ZEPHIR_CPY_WRT(&withs, &with);
 					}
-					zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869);
+					zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3881);
 					if (Z_TYPE_P(&withs) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40)
 						{
@@ -7504,7 +7502,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43);
 							ZEPHIR_CPY_WRT(&joinAlias, &_46$$43);
 							ZEPHIR_OBS_NVAR(&relationModel);
-							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel);
 							zephir_check_call_status();
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -7527,7 +7525,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46);
 									ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 29, &_52$$46);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3839);
+									zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3851);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -7547,7 +7545,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+							zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 							ZEPHIR_INIT_NVAR(&_55$$43);
 							zephir_create_array(&_55$$43, 3, 0);
 							add_assoc_long_ex(&_55$$43, SL("type"), 360);
@@ -7561,7 +7559,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							add_assoc_long_ex(&_56$$43, SL("type"), 355);
 							zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+							zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 							number++;
 						} ZEND_HASH_FOREACH_END();
 					} else {
@@ -7581,7 +7579,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47);
 								ZEPHIR_CPY_WRT(&joinAlias, &_58$$47);
 								ZEPHIR_OBS_NVAR(&relationModel);
-								zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+								zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 								ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel);
 								zephir_check_call_status();
 								if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -7604,7 +7602,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 										ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50);
 										ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 29, &_64$$50);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3839);
+										zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3851);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -7624,7 +7622,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 								zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 								zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+								zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 								ZEPHIR_INIT_NVAR(&_67$$47);
 								zephir_create_array(&_67$$47, 3, 0);
 								add_assoc_long_ex(&_67$$47, SL("type"), 360);
@@ -7638,7 +7636,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								add_assoc_long_ex(&_68$$47, SL("type"), 355);
 								zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 								zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+								zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 								number++;
 							ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0);
 							zephir_check_call_status();
@@ -7646,8 +7644,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					}
 					ZEPHIR_INIT_NVAR(&withItem);
 				}
-				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871);
-				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872);
+				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3883);
+				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884);
 				zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0);
 			zephir_check_call_status();
@@ -7708,7 +7706,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins);
 				zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE);
 			} else {
-				zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3908);
+				zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3920);
 				zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE);
 			}
 		}
@@ -7727,7 +7725,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	position = 0;
 	ZEPHIR_INIT_VAR(&sqlColumnAliases);
 	array_init(&sqlColumnAliases);
-	zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3959);
+	zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3971);
 	if (Z_TYPE_P(&selectColumns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82)
 		{
@@ -7735,7 +7733,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 			ZVAL_COPY(&column, _82);
 			ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 476, &column);
 			zephir_check_call_status();
-			zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3957);
+			zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3969);
 			if (Z_TYPE_P(&_84$$60) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60)
 				{
@@ -7752,7 +7750,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 							zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 						} else {
-							zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+							zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 							if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) {
 								ZEPHIR_INIT_NVAR(&_89$$66);
 								ZVAL_LONG(&_89$$66, position);
@@ -7760,7 +7758,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66);
 								zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+								zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 							}
 						}
 					}
@@ -7788,7 +7786,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 								zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+								zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 								if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) {
 									ZEPHIR_INIT_NVAR(&_92$$73);
 									ZVAL_LONG(&_92$$73, position);
@@ -7796,7 +7794,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73);
 									zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 								}
 							}
 						}
@@ -7820,7 +7818,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 			zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 476, &column);
 				zephir_check_call_status();
-				zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3957);
+				zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3969);
 				if (Z_TYPE_P(&_94$$75) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75)
 					{
@@ -7837,7 +7835,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 								zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+								zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 								if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) {
 									ZEPHIR_INIT_NVAR(&_98$$81);
 									ZVAL_LONG(&_98$$81, position);
@@ -7845,7 +7843,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81);
 									zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 								}
 							}
 						}
@@ -7873,7 +7871,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 									zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+									zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 									if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) {
 										ZEPHIR_INIT_NVAR(&_101$$88);
 										ZVAL_LONG(&_101$$88, position);
@@ -7881,7 +7879,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 										ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88);
 										zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE);
 									} else {
-										zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+										zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 									}
 								}
 							}
@@ -8031,17 +8029,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 	ZEPHIR_CPY_WRT(&ast, &_0);
 	ZEPHIR_OBS_VAR(&update);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4036);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4048);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&tables);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4040);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4052);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&values);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4044);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4056);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&models);
@@ -8065,16 +8063,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4110);
+	zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4122);
 	if (Z_TYPE_P(&updateTables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _1);
 			ZEPHIR_OBS_NVAR(&qualifiedName);
-			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068);
+			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4080);
 			ZEPHIR_OBS_NVAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069);
+			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4081);
 			ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -8098,17 +8096,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			ZEPHIR_OBS_NVAR(&alias);
 			if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 				zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092);
-				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093);
+				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4104);
+				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4105);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 			} else {
 				zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099);
+				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4111);
 				zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 			}
-			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103);
+			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4115);
 			zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -8123,9 +8121,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&qualifiedName);
-				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068);
+				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4080);
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069);
+				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4081);
 				ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName);
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -8148,17 +8146,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 				ZEPHIR_OBS_NVAR(&alias);
 				if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 					zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092);
-					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4104);
+					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4105);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099);
+					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4111);
 					zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 				}
-				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103);
+				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4115);
 				zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0);
 			zephir_check_call_status();
@@ -8181,13 +8179,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 		ZEPHIR_CPY_WRT(&updateValues, &values);
 	}
 	notQuoting = 0;
-	zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4134);
+	zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4146);
 	if (Z_TYPE_P(&updateValues) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9)
 		{
 			ZEPHIR_INIT_NVAR(&updateValue);
 			ZVAL_COPY(&updateValue, _9);
-			zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126);
+			zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4138);
 			if (notQuoting) {
 				ZVAL_BOOL(&_13$$20, 1);
 			} else {
@@ -8195,13 +8193,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			}
 			ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 460, &_12$$20, &_13$$20);
 			zephir_check_call_status();
-			zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126);
+			zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138);
 			ZEPHIR_OBS_NVAR(&exprColumn);
-			zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127);
+			zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4139);
 			ZEPHIR_INIT_NVAR(&_15$$20);
 			zephir_create_array(&_15$$20, 2, 0);
 			ZEPHIR_OBS_NVAR(&_16$$20);
-			zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129);
+			zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4141);
 			zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE);
 			if (notQuoting) {
 				ZVAL_BOOL(&_18$$20, 1);
@@ -8211,7 +8209,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 460, &exprColumn, &_18$$20);
 			zephir_check_call_status();
 			zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE);
-			zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131);
+			zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4143);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0);
@@ -8224,7 +8222,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			}
 			ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126);
+				zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4138);
 				if (notQuoting) {
 					ZVAL_BOOL(&_21$$21, 1);
 				} else {
@@ -8232,13 +8230,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 				}
 				ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 460, &_20$$21, &_21$$21);
 				zephir_check_call_status();
-				zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126);
+				zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138);
 				ZEPHIR_OBS_NVAR(&exprColumn);
-				zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127);
+				zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4139);
 				ZEPHIR_INIT_NVAR(&_22$$21);
 				zephir_create_array(&_22$$21, 2, 0);
 				ZEPHIR_OBS_NVAR(&_23$$21);
-				zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129);
+				zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4141);
 				zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE);
 				if (notQuoting) {
 					ZVAL_BOOL(&_25$$21, 1);
@@ -8248,7 +8246,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 				ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 460, &exprColumn, &_25$$21);
 				zephir_check_call_status();
 				zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131);
+				zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4143);
 			ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0);
 			zephir_check_call_status();
 		}
diff --git a/ext/phalcon/mvc/model/query.zep.h b/ext/phalcon/mvc/model/query.zep.h
index 4167f048a75..2c2e1724d8b 100644
--- a/ext/phalcon/mvc/model/query.zep.h
+++ b/ext/phalcon/mvc/model/query.zep.h
@@ -3,7 +3,6 @@ extern zend_class_entry *phalcon_mvc_model_query_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Query);
 
-PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction);
 PHP_METHOD(Phalcon_Mvc_Model_Query, __construct);
 PHP_METHOD(Phalcon_Mvc_Model_Query, cache);
 PHP_METHOD(Phalcon_Mvc_Model_Query, clean);
@@ -18,6 +17,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleResult);
 PHP_METHOD(Phalcon_Mvc_Model_Query, getSql);
 PHP_METHOD(Phalcon_Mvc_Model_Query, getType);
 PHP_METHOD(Phalcon_Mvc_Model_Query, getUniqueRow);
+PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction);
 PHP_METHOD(Phalcon_Mvc_Model_Query, parse);
 PHP_METHOD(Phalcon_Mvc_Model_Query, setBindParams);
 PHP_METHOD(Phalcon_Mvc_Model_Query, setBindTypes);
@@ -55,9 +55,6 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect);
 PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate);
 zend_object *zephir_init_properties_Phalcon_Mvc_Model_Query(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_query_gettransaction, 0, 0, IS_NULL, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_query___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, phql, IS_STRING, 1)
 	ZEND_ARG_OBJ_INFO(0, container, Phalcon\\Di\\DiInterface, 1)
@@ -128,6 +125,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_query_getuniquerow, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_query_gettransaction, 0, 0, Phalcon\\Mvc\\Model\\TransactionInterface, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_query_parse, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -325,7 +325,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_query_zephir_init_properties_ph
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_model_query_method_entry) {
-	PHP_ME(Phalcon_Mvc_Model_Query, getTransaction, arginfo_phalcon_mvc_model_query_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, __construct, arginfo_phalcon_mvc_model_query___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Model_Query, cache, arginfo_phalcon_mvc_model_query_cache, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, clean, arginfo_phalcon_mvc_model_query_clean, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -340,6 +339,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_query_method_entry) {
 	PHP_ME(Phalcon_Mvc_Model_Query, getSql, arginfo_phalcon_mvc_model_query_getsql, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, getType, arginfo_phalcon_mvc_model_query_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, getUniqueRow, arginfo_phalcon_mvc_model_query_getuniquerow, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Model_Query, getTransaction, arginfo_phalcon_mvc_model_query_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, parse, arginfo_phalcon_mvc_model_query_parse, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, setBindParams, arginfo_phalcon_mvc_model_query_setbindparams, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, setBindTypes, arginfo_phalcon_mvc_model_query_setbindtypes, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/mvc/model/resultset.zep.h b/ext/phalcon/mvc/model/resultset.zep.h
index 25e514c9c8e..cf912c1c505 100644
--- a/ext/phalcon/mvc/model/resultset.zep.h
+++ b/ext/phalcon/mvc/model/resultset.zep.h
@@ -78,7 +78,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.h b/ext/phalcon/mvc/model/resultset/complex.zep.h
index 6954f9507e5..7c88947f648 100644
--- a/ext/phalcon/mvc/model/resultset/complex.zep.h
+++ b/ext/phalcon/mvc/model/resultset/complex.zep.h
@@ -20,7 +20,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/mvc/model/row.zep.h b/ext/phalcon/mvc/model/row.zep.h
index 226a0668038..ae5b4249926 100644
--- a/ext/phalcon/mvc/model/row.zep.h
+++ b/ext/phalcon/mvc/model/row.zep.h
@@ -19,7 +19,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c
index 8f2bde78b79..d43e0503b44 100644
--- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c
+++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c
@@ -3479,57 +3479,63 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest)
 	if (ZEPHIR_IS_LONG(&type, 265)) {
 		ZEPHIR_OBS_VAR(&name);
 		zephir_array_fetch_string(&name, &test, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2123);
-		if (ZEPHIR_IS_STRING(&name, "empty")) {
-			ZEPHIR_CONCAT_SVS(return_value, "empty(", &left, ")");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "even")) {
-			ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) == 0)");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "odd")) {
-			ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) != 0)");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "numeric")) {
-			ZEPHIR_CONCAT_SVS(return_value, "is_numeric(", &left, ")");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "scalar")) {
-			ZEPHIR_CONCAT_SVS(return_value, "is_scalar(", &left, ")");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "iterable")) {
-			ZEPHIR_CONCAT_SVSVS(return_value, "(is_array(", &left, ") || (", &left, ") instanceof Traversable)");
-			RETURN_MM();
-		}
-	}
-	if (ZEPHIR_IS_LONG(&type, 350)) {
-		ZEPHIR_OBS_VAR(&testName);
-		zephir_array_fetch_string(&testName, &test, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2173);
-		ZEPHIR_OBS_NVAR(&name);
-		if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) {
-			if (ZEPHIR_IS_STRING(&name, "divisibleby")) {
-				zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2177);
-				ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 505, &_1$$12);
-				zephir_check_call_status();
-				ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)");
+		do {
+			if (ZEPHIR_IS_STRING(&name, "empty")) {
+				ZEPHIR_CONCAT_SVS(return_value, "empty(", &left, ")");
 				RETURN_MM();
 			}
-			if (ZEPHIR_IS_STRING(&name, "sameas")) {
-				zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2184);
-				ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 505, &_3$$13);
-				zephir_check_call_status();
-				ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")");
+			if (ZEPHIR_IS_STRING(&name, "even")) {
+				ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) == 0)");
 				RETURN_MM();
 			}
-			if (ZEPHIR_IS_STRING(&name, "type")) {
-				zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2191);
-				ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 505, &_5$$14);
-				zephir_check_call_status();
-				ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")");
+			if (ZEPHIR_IS_STRING(&name, "odd")) {
+				ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) != 0)");
+				RETURN_MM();
+			}
+			if (ZEPHIR_IS_STRING(&name, "numeric")) {
+				ZEPHIR_CONCAT_SVS(return_value, "is_numeric(", &left, ")");
+				RETURN_MM();
+			}
+			if (ZEPHIR_IS_STRING(&name, "scalar")) {
+				ZEPHIR_CONCAT_SVS(return_value, "is_scalar(", &left, ")");
 				RETURN_MM();
 			}
+			if (ZEPHIR_IS_STRING(&name, "iterable")) {
+				ZEPHIR_CONCAT_SVSVS(return_value, "(is_array(", &left, ") || (", &left, ") instanceof Traversable)");
+				RETURN_MM();
+			}
+		} while(0);
+
+	}
+	if (ZEPHIR_IS_LONG(&type, 350)) {
+		ZEPHIR_OBS_VAR(&testName);
+		zephir_array_fetch_string(&testName, &test, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2146);
+		ZEPHIR_OBS_NVAR(&name);
+		if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) {
+			do {
+				if (ZEPHIR_IS_STRING(&name, "divisibleby")) {
+					zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2151);
+					ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 505, &_1$$12);
+					zephir_check_call_status();
+					ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)");
+					RETURN_MM();
+				}
+				if (ZEPHIR_IS_STRING(&name, "sameas")) {
+					zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2153);
+					ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 505, &_3$$13);
+					zephir_check_call_status();
+					ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")");
+					RETURN_MM();
+				}
+				if (ZEPHIR_IS_STRING(&name, "type")) {
+					zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2155);
+					ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 505, &_5$$14);
+					zephir_check_call_status();
+					ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")");
+					RETURN_MM();
+				}
+			} while(0);
+
 		}
 	}
 	ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 505, &test);
@@ -3733,7 +3739,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 		ZEPHIR_OBS_VAR(&autoescape);
 		if (zephir_array_isset_string_fetch(&autoescape, &options, SL("autoescape"), 0)) {
 			if (UNEXPECTED(((Z_TYPE_P(&autoescape) == IS_TRUE || Z_TYPE_P(&autoescape) == IS_FALSE) != 1))) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "'autoescape' must be bool", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2260);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "'autoescape' must be bool", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2224);
 				return;
 			}
 			zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &autoescape);
@@ -3743,7 +3749,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 	ZEPHIR_LAST_CALL_STATUS = phvolt_parse_view(&intermediate, &viewCode, &currentPath);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&intermediate) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Invalid intermediate representation", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2273);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Invalid intermediate representation", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2237);
 		return;
 	}
 	if (extendsMode) {
@@ -3766,7 +3772,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 		ZEPHIR_CPY_WRT(&blocks, &_2$$7);
 		zephir_read_property(&_2$$7, this_ptr, ZEND_STRL("extendedBlocks"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&extendedBlocks, &_2$$7);
-		zephir_is_iterable(&extendedBlocks, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2345);
+		zephir_is_iterable(&extendedBlocks, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2309);
 		if (Z_TYPE_P(&extendedBlocks) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&extendedBlocks), _5$$7, _6$$7, _3$$7)
 			{
@@ -3781,7 +3787,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 				if (Z_TYPE_P(&name) == IS_STRING) {
 					if (zephir_array_isset(&blocks, &name)) {
 						ZEPHIR_OBS_NVAR(&localBlock);
-						zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2305);
+						zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2269);
 						zephir_update_property_zval(this_ptr, ZEND_STRL("currentBlock"), &name);
 						if (Z_TYPE_P(&localBlock) == IS_NULL) {
 							ZEPHIR_INIT_NVAR(&localBlock);
@@ -3804,7 +3810,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 					}
 				} else {
 					if (extendsMode) {
-						zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2338);
+						zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2302);
 					} else {
 						zephir_concat_self(&finalCompilation, &block);
 					}
@@ -3826,7 +3832,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 					if (Z_TYPE_P(&name) == IS_STRING) {
 						if (zephir_array_isset(&blocks, &name)) {
 							ZEPHIR_OBS_NVAR(&localBlock);
-							zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2305);
+							zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2269);
 							zephir_update_property_zval(this_ptr, ZEND_STRL("currentBlock"), &name);
 							if (Z_TYPE_P(&localBlock) == IS_NULL) {
 								ZEPHIR_INIT_NVAR(&localBlock);
@@ -3849,7 +3855,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 						}
 					} else {
 						if (extendsMode) {
-							zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2338);
+							zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2302);
 						} else {
 							zephir_concat_self(&finalCompilation, &block);
 						}
@@ -3906,7 +3912,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath)
 		ZEPHIR_CALL_METHOD(&viewsDirs, &view, "getviewsdir", NULL, 0);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&viewsDirs) == IS_ARRAY) {
-			zephir_is_iterable(&viewsDirs, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2379);
+			zephir_is_iterable(&viewsDirs, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2343);
 			if (Z_TYPE_P(&viewsDirs) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&viewsDirs), _1$$4)
 				{
@@ -3956,11 +3962,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath)
  */
 PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 {
-	zend_bool _14, _21, _22;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval left;
-	zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _23, _24, _25, _26, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _15$$29, _16$$29, _17$$29, _18$$29, _19$$29, _20$$29;
+	zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _20, _21, _22, _23, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _14$$24, _15$$24, _16$$24, _17$$24, _18$$24, _19$$24;
 	zval filter, _4$$7, _5$$7, _7$$9, _9$$14;
 	zval *this_ptr = getThis();
 
@@ -3981,10 +3986,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZVAL_UNDEF(&arguments);
 	ZVAL_UNDEF(&definition);
 	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_20);
+	ZVAL_UNDEF(&_21);
+	ZVAL_UNDEF(&_22);
 	ZVAL_UNDEF(&_23);
-	ZVAL_UNDEF(&_24);
-	ZVAL_UNDEF(&_25);
-	ZVAL_UNDEF(&_26);
 	ZVAL_UNDEF(&_0$$5);
 	ZVAL_UNDEF(&_1$$5);
 	ZVAL_UNDEF(&_2$$5);
@@ -3994,12 +3999,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZVAL_UNDEF(&_11$$11);
 	ZVAL_UNDEF(&_12$$11);
 	ZVAL_UNDEF(&_13$$11);
-	ZVAL_UNDEF(&_15$$29);
-	ZVAL_UNDEF(&_16$$29);
-	ZVAL_UNDEF(&_17$$29);
-	ZVAL_UNDEF(&_18$$29);
-	ZVAL_UNDEF(&_19$$29);
-	ZVAL_UNDEF(&_20$$29);
+	ZVAL_UNDEF(&_14$$24);
+	ZVAL_UNDEF(&_15$$24);
+	ZVAL_UNDEF(&_16$$24);
+	ZVAL_UNDEF(&_17$$24);
+	ZVAL_UNDEF(&_18$$24);
+	ZVAL_UNDEF(&_19$$24);
 	ZVAL_UNDEF(&left);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
@@ -4019,28 +4024,28 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZEPHIR_INIT_VAR(&code);
 	ZVAL_NULL(&code);
 	ZEPHIR_OBS_VAR(&type);
-	zephir_array_fetch_string(&type, &filter, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2397);
+	zephir_array_fetch_string(&type, &filter, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2361);
 	if (ZEPHIR_IS_LONG(&type, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &filter, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2403);
+		zephir_array_fetch_string(&name, &filter, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2367);
 	} else {
 		if (UNEXPECTED(!ZEPHIR_IS_LONG(&type, 350))) {
 			ZEPHIR_INIT_VAR(&_0$$5);
 			object_init_ex(&_0$$5, phalcon_mvc_view_engine_volt_exception_ce);
-			zephir_array_fetch_string(&_1$$5, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2410);
-			zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2411);
+			zephir_array_fetch_string(&_1$$5, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2374);
+			zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2375);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5);
 			ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 506, &_3$$5);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2411);
+			zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2375);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZEPHIR_OBS_VAR(&functionName);
-		zephir_array_fetch_string(&functionName, &filter, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2414);
+		zephir_array_fetch_string(&functionName, &filter, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2378);
 		ZEPHIR_OBS_NVAR(&name);
-		zephir_array_fetch_string(&name, &functionName, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2415);
+		zephir_array_fetch_string(&name, &functionName, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2379);
 	}
 	ZEPHIR_INIT_VAR(&funcArguments);
 	ZVAL_NULL(&funcArguments);
@@ -4050,9 +4055,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	if (zephir_array_isset_string_fetch(&funcArguments, &filter, SL("arguments"), 0)) {
 		if (!ZEPHIR_IS_STRING(&name, "default")) {
 			ZEPHIR_OBS_VAR(&file);
-			zephir_array_fetch_string(&file, &filter, SL("file"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2429);
+			zephir_array_fetch_string(&file, &filter, SL("file"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2393);
 			ZEPHIR_OBS_VAR(&line);
-			zephir_array_fetch_string(&line, &filter, SL("line"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2430);
+			zephir_array_fetch_string(&line, &filter, SL("line"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2394);
 			ZEPHIR_INIT_VAR(&_4$$7);
 			zephir_create_array(&_4$$7, 3, 0);
 			ZEPHIR_INIT_VAR(&_5$$7);
@@ -4111,147 +4116,138 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 		}
 		ZEPHIR_INIT_VAR(&_10$$11);
 		object_init_ex(&_10$$11, phalcon_mvc_view_engine_volt_exception_ce);
-		zephir_array_fetch_string(&_11$$11, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2504);
-		zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2505);
+		zephir_array_fetch_string(&_11$$11, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2468);
+		zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2469);
 		ZEPHIR_INIT_VAR(&_13$$11);
 		ZEPHIR_CONCAT_SVSVSV(&_13$$11, "Invalid definition for user filter '", &name, "' in ", &_11$$11, " on line ", &_12$$11);
 		ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 506, &_13$$11);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2505);
+		zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2469);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	if (ZEPHIR_IS_STRING(&name, "length")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->length(", &arguments, ")");
-		RETURN_MM();
-	}
-	_14 = ZEPHIR_IS_STRING(&name, "e");
-	if (!(_14)) {
-		_14 = ZEPHIR_IS_STRING(&name, "escape");
-	}
-	if (_14) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->html(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "escape_css")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->css(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "escape_js")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->js(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "escape_attr")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->attributes(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "trim")) {
-		ZEPHIR_CONCAT_SVS(return_value, "trim(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "left_trim")) {
-		ZEPHIR_CONCAT_SVS(return_value, "ltrim(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "right_trim")) {
-		ZEPHIR_CONCAT_SVS(return_value, "rtrim(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "striptags")) {
-		ZEPHIR_CONCAT_SVS(return_value, "strip_tags(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "url_encode")) {
-		ZEPHIR_CONCAT_SVS(return_value, "urlencode(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "slashes")) {
-		ZEPHIR_CONCAT_SVS(return_value, "addslashes(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "stripslashes")) {
-		ZEPHIR_CONCAT_SVS(return_value, "stripslashes(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "nl2br")) {
-		ZEPHIR_CONCAT_SVS(return_value, "nl2br(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "keys")) {
-		ZEPHIR_CONCAT_SVS(return_value, "array_keys(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "join")) {
-		zephir_array_fetch_long(&_15$$29, &funcArguments, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_16$$29, &_15$$29, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_17$$29, &_16$$29, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_long(&_18$$29, &funcArguments, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_19$$29, &_18$$29, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_20$$29, &_19$$29, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		ZEPHIR_CONCAT_SVSVS(return_value, "join('", &_17$$29, "', ", &_20$$29, ")");
-		RETURN_MM();
-	}
-	_21 = ZEPHIR_IS_STRING(&name, "lower");
-	if (!(_21)) {
-		_21 = ZEPHIR_IS_STRING(&name, "lowercase");
-	}
-	if (_21) {
-		ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")");
-		RETURN_MM();
-	}
-	_22 = ZEPHIR_IS_STRING(&name, "upper");
-	if (!(_22)) {
-		_22 = ZEPHIR_IS_STRING(&name, "uppercase");
-	}
-	if (_22) {
-		ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "capitalize")) {
-		ZEPHIR_CONCAT_SVS(return_value, "ucwords(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "sort")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->sort(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "json_encode")) {
-		ZEPHIR_CONCAT_SVS(return_value, "json_encode(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "json_decode")) {
-		ZEPHIR_CONCAT_SVS(return_value, "json_decode(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "format")) {
-		ZEPHIR_CONCAT_SVS(return_value, "sprintf(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "abs")) {
-		ZEPHIR_CONCAT_SVS(return_value, "abs(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "slice")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->slice(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "default")) {
-		ZEPHIR_CONCAT_SVSVSVS(return_value, "(empty(", &left, ") ? (", &arguments, ") : (", &left, "))");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "convert_encoding")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->convertEncoding(", &arguments, ")");
-		RETURN_MM();
-	}
+	do {
+		if (ZEPHIR_IS_STRING(&name, "abs")) {
+			ZEPHIR_CONCAT_SVS(return_value, "abs(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "capitalize")) {
+			ZEPHIR_CONCAT_SVS(return_value, "ucwords(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "convert_encoding")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->convertEncoding(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "default")) {
+			ZEPHIR_CONCAT_SVSVSVS(return_value, "(empty(", &left, ") ? (", &arguments, ") : (", &left, "))");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "e") || ZEPHIR_IS_STRING(&name, "escape")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->html(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "escape_attr")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->attributes(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "escape_css")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->css(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "escape_js")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->js(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "format")) {
+			ZEPHIR_CONCAT_SVS(return_value, "sprintf(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "join")) {
+			zephir_array_fetch_long(&_14$$24, &funcArguments, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2495);
+			zephir_array_fetch_string(&_15$$24, &_14$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2495);
+			zephir_array_fetch_string(&_16$$24, &_15$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
+			zephir_array_fetch_long(&_17$$24, &funcArguments, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
+			zephir_array_fetch_string(&_18$$24, &_17$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
+			zephir_array_fetch_string(&_19$$24, &_18$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
+			ZEPHIR_CONCAT_SVSVS(return_value, "join('", &_16$$24, "', ", &_19$$24, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "json_encode")) {
+			ZEPHIR_CONCAT_SVS(return_value, "json_encode(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "json_decode")) {
+			ZEPHIR_CONCAT_SVS(return_value, "json_decode(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "keys")) {
+			ZEPHIR_CONCAT_SVS(return_value, "array_keys(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "left_trim")) {
+			ZEPHIR_CONCAT_SVS(return_value, "ltrim(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "length")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->length(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "lower") || ZEPHIR_IS_STRING(&name, "lowercase")) {
+			ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "right_trim")) {
+			ZEPHIR_CONCAT_SVS(return_value, "rtrim(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "nl2br")) {
+			ZEPHIR_CONCAT_SVS(return_value, "nl2br(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "slashes")) {
+			ZEPHIR_CONCAT_SVS(return_value, "addslashes(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "slice")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->slice(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "sort")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->sort(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "stripslashes")) {
+			ZEPHIR_CONCAT_SVS(return_value, "stripslashes(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "striptags")) {
+			ZEPHIR_CONCAT_SVS(return_value, "strip_tags(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "trim")) {
+			ZEPHIR_CONCAT_SVS(return_value, "trim(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "upper") || ZEPHIR_IS_STRING(&name, "uppercase")) {
+			ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "url_encode")) {
+			ZEPHIR_CONCAT_SVS(return_value, "urlencode(", &arguments, ")");
+			RETURN_MM();
+		}
+	} while(0);
+
+	ZEPHIR_INIT_VAR(&_20);
+	object_init_ex(&_20, phalcon_mvc_view_engine_volt_exception_ce);
+	zephir_array_fetch_string(&_21, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2535);
+	zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2536);
 	ZEPHIR_INIT_VAR(&_23);
-	object_init_ex(&_23, phalcon_mvc_view_engine_volt_exception_ce);
-	zephir_array_fetch_string(&_24, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2698);
-	zephir_array_fetch_string(&_25, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2699);
-	ZEPHIR_INIT_VAR(&_26);
-	ZEPHIR_CONCAT_SVSVSV(&_26, "Unknown filter \"", &name, "\" in ", &_24, " on line ", &_25);
-	ZEPHIR_CALL_METHOD(NULL, &_23, "__construct", NULL, 506, &_26);
+	ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22);
+	ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 506, &_23);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_23, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2699);
+	zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2536);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -4403,26 +4399,26 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 	ZVAL_NULL(&compilation);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extensions, &_0);
-	zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2985);
+	zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2822);
 	if (Z_TYPE_P(&statements) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&statements), _2)
 		{
 			ZEPHIR_INIT_NVAR(&statement);
 			ZVAL_COPY(&statement, _2);
 			if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2739);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2576);
 				return;
 			}
 			if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) {
 				ZEPHIR_INIT_NVAR(&_4$$7);
 				object_init_ex(&_4$$7, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
-				zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
+				zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
+				zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
 				ZEPHIR_INIT_NVAR(&_7$$7);
 				ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7);
 				ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 506, &_7$$7, &statement);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2749);
+				zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2586);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -4440,10 +4436,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 			}
 			ZEPHIR_OBS_NVAR(&type);
-			zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2775);
+			zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2612);
 			do {
 				if (ZEPHIR_IS_LONG(&type, 357)) {
-					zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2783);
+					zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620);
 					zephir_concat_self(&compilation, &_12$$10);
 					break;
 				}
@@ -4513,7 +4509,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				if (ZEPHIR_IS_LONG(&type, 307)) {
 					ZEPHIR_OBS_NVAR(&blockName);
-					zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2830);
+					zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2667);
 					ZEPHIR_OBS_NVAR(&blockStatements);
 					zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0);
 					zephir_read_property(&_32$$19, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY);
@@ -4524,7 +4520,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 							array_init(&blocks);
 						}
 						if (Z_TYPE_P(&compilation) != IS_NULL) {
-							zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2845);
+							zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2682);
 							ZEPHIR_INIT_NVAR(&compilation);
 							ZVAL_NULL(&compilation);
 						}
@@ -4546,8 +4542,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				if (ZEPHIR_IS_LONG(&type, 310)) {
 					ZEPHIR_OBS_NVAR(&path);
-					zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2870);
-					zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2874);
+					zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2707);
+					zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711);
 					ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_36$$25);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&extended);
@@ -4643,13 +4639,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				ZEPHIR_INIT_NVAR(&_56$$37);
 				object_init_ex(&_56$$37, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2976);
-				zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+				zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2813);
+				zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
 				ZEPHIR_INIT_NVAR(&_59$$37);
 				ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37);
 				ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 506, &_59$$37);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+				zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
 				ZEPHIR_MM_RESTORE();
 				return;
 			} while(0);
@@ -4667,19 +4663,19 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 			ZEPHIR_CALL_METHOD(&statement, &statements, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2739);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2576);
 					return;
 				}
 				if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) {
 					ZEPHIR_INIT_NVAR(&_60$$40);
 					object_init_ex(&_60$$40, phalcon_mvc_view_engine_volt_exception_ce);
-					zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
-					zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
+					zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
+					zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
 					ZEPHIR_INIT_NVAR(&_63$$40);
 					ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40);
 					ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 506, &_63$$40, &statement);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2749);
+					zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2586);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -4697,10 +4693,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 				}
 				ZEPHIR_OBS_NVAR(&type);
-				zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2775);
+				zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2612);
 				do {
 					if (ZEPHIR_IS_LONG(&type, 357)) {
-						zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2783);
+						zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620);
 						zephir_concat_self(&compilation, &_66$$43);
 						break;
 					}
@@ -4770,7 +4766,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					if (ZEPHIR_IS_LONG(&type, 307)) {
 						ZEPHIR_OBS_NVAR(&blockName);
-						zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2830);
+						zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2667);
 						ZEPHIR_OBS_NVAR(&blockStatements);
 						zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0);
 						zephir_read_property(&_79$$52, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY);
@@ -4781,7 +4777,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 								array_init(&blocks);
 							}
 							if (Z_TYPE_P(&compilation) != IS_NULL) {
-								zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2845);
+								zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2682);
 								ZEPHIR_INIT_NVAR(&compilation);
 								ZVAL_NULL(&compilation);
 							}
@@ -4803,8 +4799,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					if (ZEPHIR_IS_LONG(&type, 310)) {
 						ZEPHIR_OBS_NVAR(&path);
-						zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2870);
-						zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2874);
+						zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2707);
+						zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711);
 						ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_82$$58);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&extended);
@@ -4900,13 +4896,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					ZEPHIR_INIT_NVAR(&_94$$70);
 					object_init_ex(&_94$$70, phalcon_mvc_view_engine_volt_exception_ce);
-					zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2976);
-					zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+					zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2813);
+					zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
 					ZEPHIR_INIT_NVAR(&_97$$70);
 					ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70);
 					ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 506, &_97$$70);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+					zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
 					ZEPHIR_MM_RESTORE();
 					return;
 				} while(0);
@@ -4964,7 +4960,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends)
 	}
 	isStatementList = 1;
 	if (!(zephir_array_isset_string(statements, SL("type")))) {
-		zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 3034);
+		zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2871);
 		if (Z_TYPE_P(statements) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(statements), _0$$4)
 			{
@@ -5040,7 +5036,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory)
 				RETURN_MM_BOOL((ZEPHIR_IS_STRING_IDENTICAL(&leftValue, "tag")));
 			} else {
 				ZEPHIR_OBS_VAR(&_0$$6);
-				zephir_array_fetch_string(&_0$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 3071);
+				zephir_array_fetch_string(&_0$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2908);
 				if (Z_TYPE_P(&_0$$6) == IS_ARRAY) {
 					ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 508, &left);
 					zephir_check_call_status();
diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h
index 8104c8a302c..a8b9cbf0bdd 100644
--- a/ext/phalcon/storage/serializer/none.zep.h
+++ b/ext/phalcon/storage/serializer/none.zep.h
@@ -9,7 +9,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize);
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h
index ce6bc2f91f0..e08b0daf6d9 100644
--- a/ext/phalcon/storage/serializer/php.zep.h
+++ b/ext/phalcon/storage/serializer/php.zep.h
@@ -23,7 +23,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1)
 #endif
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
diff --git a/ext/phalcon/support/collection.zep.h b/ext/phalcon/support/collection.zep.h
index b597fbecd35..7d53f828a2f 100644
--- a/ext/phalcon/support/collection.zep.h
+++ b/ext/phalcon/support/collection.zep.h
@@ -107,7 +107,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/support/registry.zep.h b/ext/phalcon/support/registry.zep.h
index 0f24b23d6b7..36411810765 100644
--- a/ext/phalcon/support/registry.zep.h
+++ b/ext/phalcon/support/registry.zep.h
@@ -91,7 +91,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.h b/ext/phalcon/translate/adapter/abstractadapter.zep.h
index 7814b8790a8..089b550c641 100644
--- a/ext/phalcon/translate/adapter/abstractadapter.zep.h
+++ b/ext/phalcon/translate/adapter/abstractadapter.zep.h
@@ -37,7 +37,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, translateKey)
 ZEND_END_ARG_INFO()
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
index c7f03f18ba0..29f432b79c8 100644
--- a/ext/php_phalcon.h
+++ b/ext/php_phalcon.h
@@ -14,7 +14,7 @@
 #define PHP_PHALCON_VERSION     "5.0.0RC4"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
+#define PHP_PHALCON_ZEPVERSION  "0.16.3-5099f34"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

From 50153b2ab2901e0757fc8947d65311aa4587502c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 12:14:39 +0100
Subject: [PATCH 43/76] #16096 - Skip test declared classes

---
 tests/unit/MassMockCest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/MassMockCest.php b/tests/unit/MassMockCest.php
index e744b17967d..9baa19d1d57 100644
--- a/tests/unit/MassMockCest.php
+++ b/tests/unit/MassMockCest.php
@@ -22,7 +22,7 @@ class MassMockCest extends TestCase
     public function testSegFaults(): void
     {
         $classes = array_filter(get_declared_classes(), function ($var) {
-            return preg_match('/^Phalcon/', $var) === 1;
+            return preg_match('/^Phalcon/', $var) === 1 && preg_match('/^Phalcon\\\\Test/', $var) === 0;
         });
         sort($classes);
 

From fbacba029099360c079598e0274ade54584d398e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 12:28:27 +0100
Subject: [PATCH 44/76] #16096 - Add unset()

---
 tests/unit/MassMockCest.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/unit/MassMockCest.php b/tests/unit/MassMockCest.php
index 9baa19d1d57..2bfddeb5794 100644
--- a/tests/unit/MassMockCest.php
+++ b/tests/unit/MassMockCest.php
@@ -35,10 +35,16 @@ public function testSegFaults(): void
                 continue;
             }
 
-            printf($class . PHP_EOL);
-            ob_flush();
+            /**
+             * Enable this for debug in case of segmentation faults.
+             */
+            //printf($class . PHP_EOL);
+            //ob_flush();
+
             $mockBuilder = $this->getMockBuilder($class)->disableOriginalConstructor();
             $this->assertInstanceOf(MockObject::class, $mockBuilder->getMock());
+
+            unset($mockBuilder);
         }
     }
 }

From a63d39c3c88a03b5a60ac5a3ddff081c5b874ba7 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 12:53:01 +0100
Subject: [PATCH 45/76] #16096 - Add unset()

---
 tests/unit/MassMockCest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/MassMockCest.php b/tests/unit/MassMockCest.php
index 2bfddeb5794..c98c66710dc 100644
--- a/tests/unit/MassMockCest.php
+++ b/tests/unit/MassMockCest.php
@@ -44,7 +44,7 @@ public function testSegFaults(): void
             $mockBuilder = $this->getMockBuilder($class)->disableOriginalConstructor();
             $this->assertInstanceOf(MockObject::class, $mockBuilder->getMock());
 
-            unset($mockBuilder);
+            unset($reflector, $mockBuilder);
         }
     }
 }

From 89bdba1a8335b10f11ba5f84597aecb9a044d99d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 13:06:18 +0100
Subject: [PATCH 46/76] #16096 - Replace `getMockBuilder()` to `createMock()`

---
 tests/unit/MassMockCest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/MassMockCest.php b/tests/unit/MassMockCest.php
index c98c66710dc..b622ce59c48 100644
--- a/tests/unit/MassMockCest.php
+++ b/tests/unit/MassMockCest.php
@@ -41,8 +41,8 @@ public function testSegFaults(): void
             //printf($class . PHP_EOL);
             //ob_flush();
 
-            $mockBuilder = $this->getMockBuilder($class)->disableOriginalConstructor();
-            $this->assertInstanceOf(MockObject::class, $mockBuilder->getMock());
+            $mockBuilder = $this->createMock($class);
+            $this->assertInstanceOf(MockObject::class, $this->createMock($class));
 
             unset($reflector, $mockBuilder);
         }

From 7a9f53cd4ef019aca6a7d609680872a38e8f6a3b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 13:22:57 +0100
Subject: [PATCH 47/76] #16096 - Mark test as skipped

---
 tests/unit/MassMockCest.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/unit/MassMockCest.php b/tests/unit/MassMockCest.php
index b622ce59c48..8548fe08526 100644
--- a/tests/unit/MassMockCest.php
+++ b/tests/unit/MassMockCest.php
@@ -21,6 +21,8 @@ class MassMockCest extends TestCase
 {
     public function testSegFaults(): void
     {
+        $this->markTestSkipped('Skip during CI execution.');
+
         $classes = array_filter(get_declared_classes(), function ($var) {
             return preg_match('/^Phalcon/', $var) === 1 && preg_match('/^Phalcon\\\\Test/', $var) === 0;
         });
@@ -35,11 +37,8 @@ public function testSegFaults(): void
                 continue;
             }
 
-            /**
-             * Enable this for debug in case of segmentation faults.
-             */
-            //printf($class . PHP_EOL);
-            //ob_flush();
+            printf($class . PHP_EOL);
+            ob_flush();
 
             $mockBuilder = $this->createMock($class);
             $this->assertInstanceOf(MockObject::class, $this->createMock($class));

From 00f9f4d2d832e376bfd64b0c07d47c81be1a2db4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 17 Sep 2022 13:44:16 +0100
Subject: [PATCH 48/76] #16096 - Move MassMockTest outside unit/ directory

---
 tests/{unit/MassMockCest.php => MassMockTest.php} | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 rename tests/{unit/MassMockCest.php => MassMockTest.php} (81%)

diff --git a/tests/unit/MassMockCest.php b/tests/MassMockTest.php
similarity index 81%
rename from tests/unit/MassMockCest.php
rename to tests/MassMockTest.php
index 8548fe08526..2c0280c78f2 100644
--- a/tests/unit/MassMockCest.php
+++ b/tests/MassMockTest.php
@@ -11,18 +11,21 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Test\Unit;
+namespace Phalcon\Tests;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
-class MassMockCest extends TestCase
+/**
+ * This test is executed manually.
+ * Its main purpose to check if there
+ * are no segmentation faults.
+ */
+class MassMockTest extends TestCase
 {
     public function testSegFaults(): void
     {
-        $this->markTestSkipped('Skip during CI execution.');
-
         $classes = array_filter(get_declared_classes(), function ($var) {
             return preg_match('/^Phalcon/', $var) === 1 && preg_match('/^Phalcon\\\\Test/', $var) === 0;
         });
@@ -41,7 +44,7 @@ public function testSegFaults(): void
             ob_flush();
 
             $mockBuilder = $this->createMock($class);
-            $this->assertInstanceOf(MockObject::class, $this->createMock($class));
+            $this->assertInstanceOf(MockObject::class, $mockBuilder);
 
             unset($reflector, $mockBuilder);
         }

From 641f527f98f89d68c1004c7499f2019e833f340b Mon Sep 17 00:00:00 2001
From: Arhell <arhell333@gmail.com>
Date: Mon, 19 Sep 2022 00:37:32 +0300
Subject: [PATCH 49/76] update backers

---
 BACKERS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BACKERS.md b/BACKERS.md
index 04c00a4c1f5..86cf4b5809d 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -112,7 +112,6 @@ Thanks for the support
 <a href="https://github.com/emagus"><img src="https://avatars.githubusercontent.com/u/5857789?v=4" title="maGus Informática" width="60" height="60"></a>
 <a href="https://github.com/tztztztz"><img src="https://avatars.githubusercontent.com/u/7032308?v=4" title="Tomasz Zadora" width="60" height="60"></a>
 <a href="https://github.com/ruudboon"><img src="https://avatars3.githubusercontent.com/u/7444246?s=460&v=4" title="Ruud Boon" width="60" height="60"></a>
-<a href="https://github.com/tacxticx88"><img src="https://avatars3.githubusercontent.com/u/12997062?s=460&u=5af0fbe438391ac46fb19befe0c20a4b1374e187&v=4" title="Clément" width="60" height="60"></a>
 <a href="https://github.com/Montana"><img src="https://avatars3.githubusercontent.com/u/20936398?s=460&v=4" title="Montana Mendy" width="60" height="60"></a>
 <a href="https://github.com/fvromera"><img src="https://avatars.githubusercontent.com/u/32909196?s=460&u=a4a6d765c836be52ab247354399d0ed1a49224fa&v=4" title="fvromera" width="60" height="60"></a>
 <a href="https://github.com/ak1113"><img src="https://avatars0.githubusercontent.com/u/38716832?s=460&v=4" title="Akira Kato" width="60" height="60"></a>
@@ -120,6 +119,7 @@ Thanks for the support
 <a href="https://github.com/postype"><img src="https://avatars.githubusercontent.com/u/54393235?s=200&v=4" title="https://www.postype.com/" width="60" height="60"></a>
 <a href="https://github.com/RaulRaf95"><img src="https://avatars.githubusercontent.com/u/63474503?v=4" title="RaulRaf95" width="60" height="60"></a>
 <a href="https://github.com/iogates"><img src="https://avatars.githubusercontent.com/u/86652317?s=200&v=4" title="iogates" width="60" height="60"></a>
+<a href="https://github.com/super-dmitriy"><img src="https://avatars.githubusercontent.com/u/5605919?v=4" title="Dmitriy" width="60" height="60"></a>
 
 [//]: github-sponsors
 

From 2e6248279dd8fb07808ace1548e118ea0095b39a Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sun, 18 Sep 2022 21:49:53 -0400
Subject: [PATCH 50/76] [#16102] - refactoring getters and setters

---
 phalcon/Acl/Adapter/AbstractAdapter.zep       |  48 ++++--
 phalcon/Acl/Adapter/Memory.zep                |  32 +++-
 phalcon/Acl/Component.zep                     |  19 ++-
 phalcon/Acl/Role.zep                          |  23 ++-
 phalcon/Assets/Asset.zep                      |  57 ++++++-
 phalcon/Assets/Collection.zep                 | 112 +++++++++++--
 phalcon/Assets/Inline.zep                     |  48 +++++-
 phalcon/Db/Adapter/AbstractAdapter.zep        |  20 ++-
 phalcon/Db/Column.zep                         |  92 +++++++++--
 phalcon/Db/Index.zep                          |  34 +++-
 phalcon/Db/Profiler/Item.zep                  | 100 ++++++++++-
 phalcon/Db/RawValue.zep                       |  12 +-
 phalcon/Db/Reference.zep                      |  80 ++++++++-
 phalcon/Domain/Payload/Payload.zep            |  60 ++++++-
 phalcon/Encryption/Security.zep               |  10 +-
 phalcon/Events/Event.zep                      |  24 ++-
 phalcon/Filter/Validation.zep                 |  19 ++-
 .../Validation/AbstractValidatorComposite.zep |  10 +-
 .../Validator/File/AbstractFile.zep           |  72 +++++++-
 phalcon/Flash/AbstractFlash.zep               |  48 +++++-
 phalcon/Html/Breadcrumbs.zep                  |  23 ++-
 phalcon/Html/Escaper.zep                      |  20 ++-
 phalcon/Http/Request.zep                      |  26 ++-
 phalcon/Http/Request/File.zep                 |  30 +++-
 phalcon/Logger/Adapter/Stream.zep             |  12 +-
 .../Logger/Formatter/AbstractFormatter.zep    |  25 ++-
 phalcon/Logger/Formatter/Line.zep             |  26 ++-
 phalcon/Logger/Item.zep                       |  58 ++++++-
 phalcon/Messages/Message.zep                  |  50 +++++-
 phalcon/Mvc/Micro/LazyLoader.zep              |  24 ++-
 phalcon/Mvc/Model/Binder.zep                  |  24 ++-
 phalcon/Mvc/Router.zep                        | 156 +++++++++++++-----
 phalcon/Mvc/Router/Route.zep                  |  10 +-
 phalcon/Mvc/View.zep                          |  30 +++-
 phalcon/Mvc/View/Simple.zep                   |  12 +-
 phalcon/Storage/Adapter/AbstractAdapter.zep   |  12 +-
 phalcon/Support/Debug/Dump.zep                |  12 +-
 phalcon/Translate/Adapter/Gettext.zep         |  40 ++++-
 38 files changed, 1323 insertions(+), 187 deletions(-)

diff --git a/phalcon/Acl/Adapter/AbstractAdapter.zep b/phalcon/Acl/Adapter/AbstractAdapter.zep
index c3a79c984ee..52ced9bf3a0 100644
--- a/phalcon/Acl/Adapter/AbstractAdapter.zep
+++ b/phalcon/Acl/Adapter/AbstractAdapter.zep
@@ -19,13 +19,6 @@ use Phalcon\Events\EventsAwareInterface;
  */
 abstract class AbstractAdapter extends AbstractEventsAware implements AdapterInterface, EventsAwareInterface
 {
-    /**
-     * Active access which the list is checking if some role can access it
-     *
-     * @var string|null
-     */
-    protected activeAccess { get };
-
     /**
      * Access Granted
      *
@@ -34,19 +27,26 @@ abstract class AbstractAdapter extends AbstractEventsAware implements AdapterInt
     protected accessGranted = false;
 
     /**
-     * Role which the list is checking if it's allowed to certain
-     * component/access
+     * Active access which the list is checking if some role can access it
      *
      * @var string|null
      */
-    protected activeRole { get };
+    protected activeAccess = null;
 
     /**
      * Component which the list is checking if some role can access it
      *
      * @var string|null
      */
-    protected activeComponent { get };
+    protected activeComponent = null;
+
+    /**
+     * Role which the list is checking if it's allowed to certain
+     * component/access
+     *
+     * @var string|null
+     */
+    protected activeRole = null;
 
     /**
      * Default access
@@ -55,6 +55,32 @@ abstract class AbstractAdapter extends AbstractEventsAware implements AdapterInt
      */
     protected defaultAccess = Enum::DENY;
 
+
+    /**
+     * Active access which the list is checking if some role can access it
+     */
+    public function getActiveAccess() -> string | null
+    {
+        return this->activeAccess;
+    }
+
+    /**
+     * Component which the list is checking if some role can access it
+     */
+    public function getActiveComponent() -> string | null
+    {
+        return this->activeComponent;
+    }
+
+    /**
+     * Role which the list is checking if it's allowed to certain
+     * component/access
+     */
+    public function getActiveRole() -> string | null
+    {
+        return this->activeRole;
+    }
+
     /**
      * Returns the default ACL access level
      */
diff --git a/phalcon/Acl/Adapter/Memory.zep b/phalcon/Acl/Adapter/Memory.zep
index 08d5c776ff8..efd9a05e03d 100644
--- a/phalcon/Acl/Adapter/Memory.zep
+++ b/phalcon/Acl/Adapter/Memory.zep
@@ -104,21 +104,21 @@ class Memory extends AbstractAdapter
      *
      * @var mixed
      */
-    protected activeFunction { get };
+    protected activeFunction;
 
     /**
      * Returns number of additional arguments(excluding role and resource) for active function
      *
      * @var int
      */
-    protected activeFunctionCustomArgumentsCount = 0 { get };
+    protected activeFunctionCustomArgumentsCount = 0;
 
     /**
      * Returns latest key used to acquire access
      *
      * @var string|null
      */
-    protected activeKey { get };
+    protected activeKey = null;
 
     /**
      * Components
@@ -507,6 +507,32 @@ class Memory extends AbstractAdapter
         }
      }
 
+    /**
+     * Returns latest function used to acquire access
+     *
+     * @return mixed
+     */
+    public function getActiveFunction() -> var
+    {
+        return this->activeFunction;
+    }
+
+    /**
+     * Returns number of additional arguments(excluding role and resource) for active function
+     */
+    public function getActiveFunctionCustomArgumentsCount() -> int
+    {
+        return this->activeFunctionCustomArgumentsCount;
+    }
+
+    /**
+     * Returns latest key used to acquire access
+     */
+    public function getActiveKey() -> string | null
+    {
+        return this->activeKey;
+    }
+
     /**
      * Return an array with every component registered in the list
      */
diff --git a/phalcon/Acl/Component.zep b/phalcon/Acl/Component.zep
index 3dc2339a00e..e6f1a43edce 100644
--- a/phalcon/Acl/Component.zep
+++ b/phalcon/Acl/Component.zep
@@ -20,14 +20,14 @@ class Component implements ComponentInterface
      *
      * @var string
      */
-    private description { get };
+    private description;
 
     /**
      * Component name
      *
      * @var string
      */
-    private name { get, __toString };
+    private name;
 
     /**
      * Phalcon\Acl\Component constructor
@@ -41,4 +41,19 @@ class Component implements ComponentInterface
         let this->name = name,
             this->description = description;
     }
+
+    public function __toString() -> string
+    {
+        return this->name;
+    }
+
+    public function getDescription() -> string
+    {
+        return this->description;
+    }
+
+    public function getName() -> string
+    {
+        return this->name;
+    }
 }
diff --git a/phalcon/Acl/Role.zep b/phalcon/Acl/Role.zep
index e2a1bf5b762..079a39263c6 100644
--- a/phalcon/Acl/Role.zep
+++ b/phalcon/Acl/Role.zep
@@ -16,18 +16,18 @@ namespace Phalcon\Acl;
 class Role implements RoleInterface
 {
     /**
-     * Role name
+     * Role description
      *
      * @var string
      */
-    private name { get, __toString };
+    private description;
 
     /**
-     * Role description
+     * Role name
      *
      * @var string
      */
-    private description { get };
+    private name;
 
     /**
      * Phalcon\Acl\Role constructor
@@ -41,4 +41,19 @@ class Role implements RoleInterface
         let this->name = name,
             this->description = description;
     }
+
+    public function __toString() -> string
+    {
+        return this->name;
+    }
+
+    public function getDescription() -> string
+    {
+        return this->description;
+    }
+
+    public function getName() -> string
+    {
+        return this->name;
+    }
 }
diff --git a/phalcon/Assets/Asset.zep b/phalcon/Assets/Asset.zep
index 368af9badd2..0e37fcb5115 100644
--- a/phalcon/Assets/Asset.zep
+++ b/phalcon/Assets/Asset.zep
@@ -44,7 +44,7 @@ class Asset implements AssetInterface
     /**
      * @var bool
      */
-    protected filter { get };
+    protected filter;
 
     /**
      * @var bool
@@ -54,34 +54,34 @@ class Asset implements AssetInterface
     /**
      * @var string
      */
-    protected path { get };
+    protected path;
 
     /**
      * @var string
      */
-    protected sourcePath { get };
+    protected sourcePath;
 
     /**
      * @var string
      */
-    protected targetPath { get };
+    protected targetPath;
 
     /**
      * @var string
      */
-    protected targetUri { get };
+    protected targetUri;
 
     /**
      * @var string
      */
-    protected type { get };
+    protected type;
 
     /**
      * Version of resource
      *
      * @var string|null
      */
-    protected version { get };
+    protected version;
 
     /**
      * Asset constructor.
@@ -175,6 +175,16 @@ class Asset implements AssetInterface
         return content;
     }
 
+    public function getFilter() -> bool
+    {
+        return this->filter;
+    }
+
+    public function getPath() -> string
+    {
+        return this->path;
+    }
+
     /**
      * Returns the complete location where the asset is located
      *
@@ -257,6 +267,39 @@ class Asset implements AssetInterface
         return target;
     }
 
+    public function getSourcePath() -> string
+    {
+        return this->sourcePath;
+    }
+
+    public function getTargetPath() -> string
+    {
+        return this->targetPath;
+    }
+
+    public function getTargetUri() -> string
+    {
+        return this->targetUri;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType() -> string
+    {
+        return this->type;
+    }
+
+    /**
+     * Version of resource
+     *
+     * @return string|null
+     */
+    public function getVersion() -> string | null
+    {
+        return this->version;
+    }
+
     /**
      * Checks if the asset is using auto version
      *
diff --git a/phalcon/Assets/Collection.zep b/phalcon/Assets/Collection.zep
index a45691c1f5a..05dbbede056 100644
--- a/phalcon/Assets/Collection.zep
+++ b/phalcon/Assets/Collection.zep
@@ -36,12 +36,12 @@ class Collection implements Countable, IteratorAggregate
     /**
      * @var array
      */
-    protected assets = [] { get };
+    protected assets = [];
 
     /**
      * @var array
      */
-    protected attributes = [] { get };
+    protected attributes = [];
 
     /**
      * Should version be determined from file modification time
@@ -53,52 +53,52 @@ class Collection implements Countable, IteratorAggregate
     /**
      * @var array
      */
-    protected codes = [] { get };
+    protected codes = [];
 
     /**
      * @var array
      */
-    protected filters = [] { get };
+    protected filters = [];
 
     /**
      * @var bool
      */
-    protected join = true { get };
+    protected isLocal = true;
 
     /**
      * @var bool
      */
-    protected isLocal = true;
+    protected join = true;
 
     /**
      * @var string
      */
-    protected prefix = "" { get };
+    protected prefix = "";
 
     /**
      * @var string
      */
-    protected sourcePath = "" { get };
+    protected sourcePath = "";
 
     /**
      * @var bool
      */
-    protected targetIsLocal = true { get };
+    protected targetIsLocal = true;
 
     /**
      * @var string
      */
-    protected targetPath = "" { get };
+    protected targetPath = "";
 
     /**
      * @var string
      */
-    protected targetUri = "" { get };
+    protected targetUri = "";
 
     /**
      * @var string
      */
-    protected version = "" { get };
+    protected version = "";
 
     /**
      * Adds an asset to the collection
@@ -236,6 +236,38 @@ class Collection implements Countable, IteratorAggregate
         return count(this->assets);
     }
 
+    /**
+     * @return array
+     */
+    public function getAssets() -> array
+    {
+        return this->assets;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAttributes() -> array
+    {
+        return this->attributes;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCodes() -> array
+    {
+        return this->codes;
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilters() -> array
+    {
+        return this->filters;
+    }
+
     /**
      * Returns the generator of the class
      *
@@ -246,6 +278,22 @@ class Collection implements Countable, IteratorAggregate
         return new ArrayIterator(this->assets);
     }
 
+    /**
+     * @return bool
+     */
+    public function getJoin() -> bool
+    {
+        return this->join;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() -> string
+    {
+        return this->prefix;
+    }
+
     /**
      * Returns the complete location where the joined/filtered collection must
      * be written
@@ -274,6 +322,46 @@ class Collection implements Countable, IteratorAggregate
         return completePath;
     }
 
+    /**
+     * @return string
+     */
+    public function getSourcePath() -> string
+    {
+        return this->sourcePath;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getTargetIsLocal() -> bool
+    {
+        return this->targetIsLocal;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTargetPath() -> string
+    {
+        return this->targetPath;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTargetUri() -> string
+    {
+        return this->targetUri;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion() -> string
+    {
+        return this->version;
+    }
+
     /**
      * Checks this the asset is added to the collection.
      *
diff --git a/phalcon/Assets/Inline.zep b/phalcon/Assets/Inline.zep
index 8ca5ed6ad14..8b585452a7e 100644
--- a/phalcon/Assets/Inline.zep
+++ b/phalcon/Assets/Inline.zep
@@ -20,33 +20,33 @@ namespace Phalcon\Assets;
 class $Inline implements AssetInterface
 {
     /**
-     * @var array | null
+     * @var array
      */
-    protected attributes { get };
+    protected attributes;
 
     /**
      * @var string
      */
-    protected content { get };
+    protected content;
 
     /**
      * @var bool
      */
-    protected filter { get };
+    protected filter;
 
     /**
      * @var string
      */
-    protected type { get };
+    protected type;
 
     /**
      * Phalcon\Assets\Inline constructor
      */
     public function __construct(string type, string content, bool filter = true, array attributes = [])
     {
-        let this->type = type,
-            this->content = content,
-            this->filter = filter,
+        let this->type       = type,
+            this->content    = content,
+            this->filter     = filter,
             this->attributes = attributes;
     }
 
@@ -62,6 +62,38 @@ class $Inline implements AssetInterface
         return hash("sha256", key);
     }
 
+    /**
+     * @return array
+     */
+    public function getAttributes() -> array
+    {
+        return this->attributes;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent() -> string
+    {
+        return this->content;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getFilter() -> bool
+    {
+        return this->filter;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType() -> string
+    {
+        return this->type;
+    }
+
     /**
      * Sets extra HTML attributes
      */
diff --git a/phalcon/Db/Adapter/AbstractAdapter.zep b/phalcon/Db/Adapter/AbstractAdapter.zep
index f967d7b3275..6d695b40a0e 100644
--- a/phalcon/Db/Adapter/AbstractAdapter.zep
+++ b/phalcon/Db/Adapter/AbstractAdapter.zep
@@ -60,7 +60,7 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
      *
      * @var string
      */
-    protected dialectType { get };
+    protected dialectType;
 
     /**
      * Event Manager
@@ -116,7 +116,7 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
      *
      * @var string
      */
-    protected type { get };
+    protected type;
 
     /**
      * Phalcon\Db\Adapter constructor
@@ -732,6 +732,14 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
         return this->dialect;
     }
 
+    /**
+     * Name of the dialect used
+     */
+    public function getDialectType() -> string
+    {
+        return this->dialectType;
+    }
+
     /**
      * Returns the internal event manager
      */
@@ -780,6 +788,14 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
         return this->sqlVariables;
     }
 
+    /**
+     * Type of database system the adapter is used for
+     */
+    public function getType() -> string
+    {
+        return this->type;
+    }
+
     /**
      * Inserts data into a table using custom RDBMS SQL syntax
      *
diff --git a/phalcon/Db/Column.zep b/phalcon/Db/Column.zep
index eb5e76d7db8..3e72116f015 100644
--- a/phalcon/Db/Column.zep
+++ b/phalcon/Db/Column.zep
@@ -237,12 +237,19 @@ class Column implements ColumnInterface
      */
     protected bindType = 2;
 
+    /**
+     * Column's comment
+     *
+     * @var string|null
+     */
+     protected comment = null;
+
     /**
      * Default column value
      *
      * @var mixed|null
      */
-    protected _default = null { get };
+    protected _default = null;
 
     /**
      * Position is first
@@ -263,14 +270,7 @@ class Column implements ColumnInterface
      *
      * @var string
      */
-    protected name { get };
-
-    /**
-     * Column's comment
-     *
-     * @var string|null
-     */
-     protected comment = null { get };
+    protected name;
 
     /**
      * Column not nullable?
@@ -293,35 +293,35 @@ class Column implements ColumnInterface
      *
      * @var int
      */
-    protected scale = 0 { get };
+    protected scale = 0;
 
     /**
      * Integer column size
      *
      * @var int|string
      */
-    protected size = 0 { get };
+    protected size = 0;
 
     /**
      * Column data type
      *
      * @var int
      */
-    protected type { get };
+    protected type;
 
     /**
      * Column data type reference
      *
      * @var int
      */
-    protected typeReference = -1 { get };
+    protected typeReference = -1;
 
     /**
      * Column data type values
      *
      * @var array|string
      */
-    protected typeValues { get };
+    protected typeValues;
 
     /**
      * Integer column unsigned?
@@ -489,6 +489,70 @@ class Column implements ColumnInterface
         return this->bindType;
     }
 
+    /**
+     * Column's comment
+     */
+     public function getComment() -> string | null
+     {
+        return this->comment;
+     }
+
+    /**
+     * Default column value
+     */
+    public function getDefault() -> var
+    {
+        return this->_default;
+    }
+
+    /**
+     * Column's name
+     */
+    public function getName() -> string
+    {
+        return this->name;
+    }
+
+    /**
+     * Integer column number scale
+     */
+    public function getScale() -> int
+    {
+        return this->scale;
+    }
+
+    /**
+     * Integer column size
+     */
+    public function getSize() -> int | string
+    {
+        return this->size;
+    }
+
+    /**
+     * Column data type
+     */
+    public function getType() -> int
+    {
+        return this->type;
+    }
+
+    /**
+     * Column data type reference
+     */
+    public function getTypeReference() -> int
+    {
+        return this->typeReference;
+    }
+
+    /**
+     * Column data type values
+     */
+    public function getTypeValues() -> array | string
+    {
+        return this->typeValues;
+    }
+
     /**
      * Check whether column has default value
      */
diff --git a/phalcon/Db/Index.zep b/phalcon/Db/Index.zep
index 22c3810d14e..02d39882dc6 100644
--- a/phalcon/Db/Index.zep
+++ b/phalcon/Db/Index.zep
@@ -46,29 +46,53 @@ class Index implements IndexInterface
      *
      * @var array
      */
-    protected columns { get };
+    protected columns;
 
     /**
      * Index name
      *
      * @var string
      */
-    protected name { get };
+    protected name;
 
     /**
      * Index type
      *
      * @var string
      */
-    protected type { get };
+    protected type;
 
     /**
      * Phalcon\Db\Index constructor
      */
     public function __construct(string! name, array! columns, string type = "")
     {
-        let this->name = name;
+        let this->name    = name;
         let this->columns = columns;
-        let this->type = type;
+        let this->type    = type;
+    }
+
+    /**
+     * Index columns
+     */
+    public function getColumns() -> array
+    {
+        return this->columns;
+    }
+
+    /**
+     * Index name
+     */
+    public function getName() -> string
+    {
+        return this->name;
+    }
+
+    /**
+     * Index type
+     */
+    public function getType() -> string
+    {
+        return this->type;
     }
 }
diff --git a/phalcon/Db/Profiler/Item.zep b/phalcon/Db/Profiler/Item.zep
index ca0d60dcd9f..4c3e74b28eb 100644
--- a/phalcon/Db/Profiler/Item.zep
+++ b/phalcon/Db/Profiler/Item.zep
@@ -20,35 +20,75 @@ class Item
      *
      * @var double
      */
-    protected finalTime { set, get };
+    protected finalTime;
 
     /**
      * Timestamp when the profile started
      *
      * @var double
      */
-    protected initialTime { set, get };
+    protected initialTime;
 
     /**
      * SQL bind types related to the profile
      *
      * @var array
      */
-    protected sqlBindTypes { set, get };
+    protected sqlBindTypes;
 
     /**
      * SQL statement related to the profile
      *
      * @var string
      */
-    protected sqlStatement { set, get };
+    protected sqlStatement;
 
     /**
      * SQL variables related to the profile
      *
      * @var array
      */
-    protected sqlVariables { set, get };
+    protected sqlVariables;
+
+    /**
+     * Return the timestamp when the profile ended
+     */
+    public function getFinalTime() -> double
+    {
+        return this->finalTime;
+    }
+
+    /**
+     * Return the timestamp when the profile started
+     */
+    public function getInitialTime() -> double
+    {
+        return this->initialTime;
+    }
+
+    /**
+     * Return the SQL bind types related to the profile
+     */
+    public function getSqlBindTypes() -> array
+    {
+        return this->sqlBindTypes;
+    }
+
+    /**
+     * Return the SQL statement related to the profile
+     */
+    public function getSqlStatement() -> string
+    {
+        return this->sqlStatement;
+    }
+
+    /**
+     * Return the SQL variables related to the profile
+     */
+    public function getSqlVariables() -> array
+    {
+        return this->sqlVariables;
+    }
 
     /**
      * Returns the total time in seconds spent by the profile
@@ -57,4 +97,54 @@ class Item
     {
         return this->finalTime - this->initialTime;
     }
+
+    /**
+     * Return the timestamp when the profile ended
+     */
+    public function setFinalTime(double finalTime) -> <Item>
+    {
+        let this->finalTime = finalTime;
+
+        return this;
+    }
+
+    /**
+     * Return the timestamp when the profile started
+     */
+    public function setInitialTime(double initialTime) -> <Item>
+    {
+        let this->initialTime = initialTime;
+
+        return this;
+    }
+
+    /**
+     * Return the SQL bind types related to the profile
+     */
+    public function setSqlBindTypes(array sqlBindTypes) -> <Item>
+    {
+        let this->sqlBindTypes = sqlBindTypes;
+
+        return this;
+    }
+
+    /**
+     * Return the SQL statement related to the profile
+     */
+    public function setSqlStatement(string sqlStatement) -> <Item>
+    {
+        let this->sqlStatement = sqlStatement;
+
+        return this;
+    }
+
+    /**
+     * Return the SQL variables related to the profile
+     */
+    public function setSqlVariables(array sqlVariables) -> <Item>
+    {
+        let this->sqlVariables = sqlVariables;
+
+        return this;
+    }
 }
diff --git a/phalcon/Db/RawValue.zep b/phalcon/Db/RawValue.zep
index f8e1449801c..b0740283081 100644
--- a/phalcon/Db/RawValue.zep
+++ b/phalcon/Db/RawValue.zep
@@ -31,7 +31,7 @@ class RawValue
      *
      * @var string
      */
-    protected value { get, __toString };
+    protected value;
 
     /**
      * Phalcon\Db\RawValue constructor
@@ -46,4 +46,14 @@ class RawValue
             let this->value = (string) value;
         }
     }
+
+    public function __toString() -> string
+    {
+        return this->value;
+    }
+
+    public function getValue() -> string
+    {
+        return this->value;
+    }
 }
diff --git a/phalcon/Db/Reference.zep b/phalcon/Db/Reference.zep
index cae50456a51..d3060659d96 100644
--- a/phalcon/Db/Reference.zep
+++ b/phalcon/Db/Reference.zep
@@ -38,56 +38,56 @@ class Reference implements ReferenceInterface
      *
      * @var array
      */
-    protected columns { get };
+    protected columns;
 
     /**
      * Constraint name
      *
      * @var string
      */
-    protected name { get };
+    protected name;
 
     /**
      * Referenced Columns
      *
      * @var array
      */
-    protected referencedColumns { get };
+    protected referencedColumns;
 
     /**
      * Referenced Schema
      *
      * @var string
      */
-    protected referencedSchema { get };
+    protected referencedSchema;
 
     /**
      * Referenced Table
      *
      * @var string
      */
-    protected referencedTable { get };
+    protected referencedTable;
 
     /**
      * Schema name
      *
      * @var string
      */
-    protected schemaName { get };
+    protected schemaName;
 
     /**
      * ON DELETE
      *
      * @var string
      */
-    protected onDelete { get };
+    protected onDelete;
 
     /**
      * ON UPDATE
      *
      * @var string
      */
-    protected onUpdate { get };
+    protected onUpdate;
 
     /**
      * Phalcon\Db\Reference constructor
@@ -141,4 +141,68 @@ class Reference implements ReferenceInterface
             );
         }
     }
+
+    /**
+     * Local reference columns
+     */
+    public function getColumns() -> array
+    {
+        return this->columns;
+    }
+
+    /**
+     * Constraint name
+     */
+    public function getName() -> string
+    {
+        return this->name;
+    }
+
+    /**
+     * Referenced Columns
+     */
+    public function getReferencedColumns() -> array
+    {
+        return this->referencedColumns;
+    }
+
+    /**
+     * Referenced Schema
+     */
+    public function getReferencedSchema() -> string
+    {
+        return this->referencedSchema;
+    }
+
+    /**
+     * Referenced Table
+     */
+    public function getReferencedTable() -> string
+    {
+        return this->referencedTable;
+    }
+
+    /**
+     * Schema name
+     */
+    public function getSchemaName() -> string
+    {
+        return this->schemaName;
+    }
+
+    /**
+     * ON DELETE
+     */
+    public function getOnDelete() -> string
+    {
+        return this->onDelete;
+    }
+
+    /**
+     * ON UPDATE
+     */
+    public function getOnUpdate() -> string
+    {
+        return this->onUpdate;
+    }
 }
diff --git a/phalcon/Domain/Payload/Payload.zep b/phalcon/Domain/Payload/Payload.zep
index 7fa1a38e5ef..32b7f80c3df 100644
--- a/phalcon/Domain/Payload/Payload.zep
+++ b/phalcon/Domain/Payload/Payload.zep
@@ -37,35 +37,35 @@ class Payload implements PayloadInterface
      *
      * @var mixed
      */
-    protected extras { get };
+    protected extras;
 
     /**
      * Input
      *
      * @var mixed
      */
-    protected input { get };
+    protected input;
 
     /**
      * Messages
      *
      * @var mixed
      */
-    protected messages { get };
+    protected messages;
 
     /**
      * Status
      *
      * @var mixed
      */
-    protected status { get };
+    protected status;
 
     /**
      * Output
      *
      * @var mixed
      */
-    protected output { get };
+    protected output;
 
     /**
      * Gets the potential exception thrown in the domain layer
@@ -77,6 +77,56 @@ class Payload implements PayloadInterface
         return this->exception;
     }
 
+    /**
+     * Extra information
+     *
+     * @return mixed
+     */
+    public function getExtras() -> var
+    {
+        return this->extras;
+    }
+
+    /**
+     * Input
+     *
+     * @return mixed
+     */
+    public function getInput() -> var
+    {
+        return this->input;
+    }
+
+    /**
+     * Messages
+     *
+     * @return mixed
+     */
+    public function getMessages() -> var
+    {
+        return this->messages;
+    }
+
+    /**
+     * Status
+     *
+     * @return mixed
+     */
+    public function getStatus() -> var
+    {
+        return this->status;
+    }
+
+    /**
+     * Output
+     *
+     * @return mixed
+     */
+    public function getOutput() -> var
+    {
+        return this->output;
+    }
+
     /**
      * Sets an exception thrown in the domain
      *
diff --git a/phalcon/Encryption/Security.zep b/phalcon/Encryption/Security.zep
index b88531fea11..b20dbc013da 100644
--- a/phalcon/Encryption/Security.zep
+++ b/phalcon/Encryption/Security.zep
@@ -93,7 +93,7 @@ class Security extends AbstractInjectionAware
     /**
      * @var int
      */
-    protected workFactor = 10 { get };
+    protected workFactor = 10;
 
     /**
      * @var SessionInterface|null
@@ -394,6 +394,14 @@ class Security extends AbstractInjectionAware
         return this->tokenKey;
     }
 
+    /**
+     * @return int
+     */
+    public function getWorkFactor() -> int
+    {
+        return this->workFactor;
+    }
+
     /**
      * Creates a password hash using bcrypt with a pseudo random salt
      *
diff --git a/phalcon/Events/Event.zep b/phalcon/Events/Event.zep
index 0b491e2967c..5c7abdecc70 100644
--- a/phalcon/Events/Event.zep
+++ b/phalcon/Events/Event.zep
@@ -37,7 +37,7 @@ class Event implements EventInterface
      *
      * @var mixed
      */
-    protected data { get };
+    protected data;
 
     /**
      * Event source
@@ -58,7 +58,7 @@ class Event implements EventInterface
      *
      * @var string
      */
-    protected type { get };
+    protected type;
 
     /**
      * Phalcon\Events\Event constructor
@@ -78,6 +78,21 @@ class Event implements EventInterface
             this->cancelable = cancelable;
     }
 
+    public function getData() -> var
+    {
+        return this->data;
+    }
+
+    public function getSource() -> object | null
+    {
+        return this->source;
+    }
+
+    public function getType() -> string
+    {
+        return this->type;
+    }
+
     /**
      * Check whether the event is cancelable.
      *
@@ -100,11 +115,6 @@ class Event implements EventInterface
         return this->stopped;
     }
 
-    public function getSource() -> object | null
-    {
-        return this->source;
-    }
-
     /**
      * Sets event data.
      */
diff --git a/phalcon/Filter/Validation.zep b/phalcon/Filter/Validation.zep
index 395b50dc6ae..5028f34d03c 100644
--- a/phalcon/Filter/Validation.zep
+++ b/phalcon/Filter/Validation.zep
@@ -34,7 +34,7 @@ class Validation extends Injectable implements ValidationInterface
     /**
      * @var mixed
      */
-    protected data { get };
+    protected data;
 
     /**
      * @var object|null
@@ -61,7 +61,7 @@ class Validation extends Injectable implements ValidationInterface
      *
      * @var array
      */
-    protected validators = [] { set };
+    protected validators = [];
 
     /**
      * Calculated values
@@ -171,6 +171,14 @@ class Validation extends Injectable implements ValidationInterface
         return this;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getData() -> var
+    {
+        return this->data;
+    }
+
     /**
      * Returns the bound entity
      *
@@ -458,6 +466,13 @@ class Validation extends Injectable implements ValidationInterface
         let this->labels = labels;
     }
 
+    public function setValidators(array validators) -> <Validation>
+    {
+        let this->validators = validators;
+
+        return this;
+    }
+
     /**
      * Validate a set of data according to a set of rules
      *
diff --git a/phalcon/Filter/Validation/AbstractValidatorComposite.zep b/phalcon/Filter/Validation/AbstractValidatorComposite.zep
index acdae19ae8a..d8e368b8ea0 100644
--- a/phalcon/Filter/Validation/AbstractValidatorComposite.zep
+++ b/phalcon/Filter/Validation/AbstractValidatorComposite.zep
@@ -20,7 +20,15 @@ abstract class AbstractValidatorComposite extends AbstractValidator implements V
     /**
      * @var array
      */
-    protected validators = [] { get };
+    protected validators = [];
+
+    /**
+     * @return array
+     */
+    public function getValidators() -> array
+    {
+        return this->validators;
+    }
 
     /**
      * Executes the validation
diff --git a/phalcon/Filter/Validation/Validator/File/AbstractFile.zep b/phalcon/Filter/Validation/Validator/File/AbstractFile.zep
index 0f4a9af873e..ab0ba2dd5c5 100644
--- a/phalcon/Filter/Validation/Validator/File/AbstractFile.zep
+++ b/phalcon/Filter/Validation/Validator/File/AbstractFile.zep
@@ -60,21 +60,21 @@ abstract class AbstractFile extends AbstractValidator
      *
      * @var string
      */
-    protected messageFileEmpty = "Field :field must not be empty" { get, set };
+    protected messageFileEmpty = "Field :field must not be empty";
 
     /**
      * File exceeds the file size set in PHP configuration
      *
      * @var string
      */
-    protected messageIniSize = "File :field exceeds the maximum file size" { get, set };
+    protected messageIniSize = "File :field exceeds the maximum file size";
 
     /**
      * File is not valid
      *
      * @var string
      */
-    protected messageValid = "Field :field is not valid" { get, set };
+    protected messageValid = "Field :field is not valid";
 
     /**
     * Check upload
@@ -236,6 +236,36 @@ abstract class AbstractFile extends AbstractValidator
         return floatval(matches[1]) * pow(2, byteUnits[unit]);
     }
 
+    /**
+     * Empty is empty
+     *
+     * @return string
+     */
+    public function getMessageFileEmpty() -> string
+    {
+        return this->messageFileEmpty;
+    }
+
+    /**
+     * File exceeds the file size set in PHP configuration
+     *
+     * @return string
+     */
+    public function getMessageIniSize() -> string
+    {
+        return this->messageIniSize;
+    }
+
+    /**
+     * File is not valid
+     *
+     * @return string
+     */
+    public function getMessageValid() -> string
+    {
+        return this->messageValid;
+    }
+
     /**
      * Check on empty
      *
@@ -250,6 +280,42 @@ abstract class AbstractFile extends AbstractValidator
         return empty value || isset value["error"] && value["error"] === UPLOAD_ERR_NO_FILE;
     }
 
+    /**
+     * Empty is empty
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    public function setMessageFileEmpty(string message) -> void
+    {
+        let this->messageFileEmpty = message;
+    }
+
+    /**
+     * File exceeds the file size set in PHP configuration
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    public function setMessageIniSize(string message) -> void
+    {
+        let this->messageIniSize = message;
+    }
+
+    /**
+     * File is not valid
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    public function setMessageValid(string message) -> void
+    {
+        let this->messageValid = message;
+    }
+
     /**
      * Checks if a file has been uploaded; Internal check that can be
      * overriden in a subclass if you do not want to check uploaded files
diff --git a/phalcon/Flash/AbstractFlash.zep b/phalcon/Flash/AbstractFlash.zep
index eef4e6d72b1..9cbfd994158 100644
--- a/phalcon/Flash/AbstractFlash.zep
+++ b/phalcon/Flash/AbstractFlash.zep
@@ -35,7 +35,7 @@ abstract class AbstractFlash extends AbstractInjectionAware implements FlashInte
     /**
      * @var bool
      */
-    protected autoescape = true { get };
+    protected autoescape = true;
 
     /**
      * @var bool
@@ -45,17 +45,17 @@ abstract class AbstractFlash extends AbstractInjectionAware implements FlashInte
     /**
      * @var array
      */
-    protected cssClasses = [] { get };
+    protected cssClasses = [];
 
     /**
      * @var array
      */
-    protected cssIconClasses = [] { get };
+    protected cssIconClasses = [];
 
     /**
      * @var string
      */
-    protected customTemplate = "" { get };
+    protected customTemplate = "";
 
     /**
      * @var EscaperInterface | null
@@ -128,6 +128,46 @@ abstract class AbstractFlash extends AbstractInjectionAware implements FlashInte
         return this->{"message"}("error", message);
     }
 
+    /**
+     * @return bool
+     */
+    public function getAutoescape() -> bool
+    {
+        return this->autoescape;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getAutomaticHtml() -> bool
+    {
+        return this->automaticHtml;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCssClasses() -> array
+    {
+        return this->cssClasses;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCssIconClasses() -> array
+    {
+        return this->cssIconClasses;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCustomTemplate() -> string
+    {
+        return this->customTemplate;
+    }
+
     /**
      * Returns the Escaper Service
      *
diff --git a/phalcon/Html/Breadcrumbs.zep b/phalcon/Html/Breadcrumbs.zep
index 1bae7dc4cb5..9bc7347ea9f 100644
--- a/phalcon/Html/Breadcrumbs.zep
+++ b/phalcon/Html/Breadcrumbs.zep
@@ -33,7 +33,7 @@ class Breadcrumbs
      *
      * @var string
      */
-    private separator = " / " { get, set };
+    private separator = " / ";
 
     /**
      * The HTML template to use to render the breadcrumbs.
@@ -72,6 +72,16 @@ class Breadcrumbs
         let this->elements = [];
     }
 
+    /**
+     * Crumb separator
+     *
+     * @return string
+     */
+    public function getSeparator() -> string
+    {
+        return this->separator;
+    }
+
     /**
      * Removes crumb by url.
      *
@@ -149,6 +159,17 @@ class Breadcrumbs
         return "<dl>" . implode("<dt>" . this->separator . "</dt>", output) . "</dl>";
     }
 
+    /**
+     * @param string $separator
+     *
+     * @return Breadcrumbs
+     */
+    public function setSeparator(string separator) -> <Breadcrumbs>
+    {
+        let this->separator = separator;
+
+        return this;
+    }
     /**
      * Returns the internal breadcrumbs array
      */
diff --git a/phalcon/Html/Escaper.zep b/phalcon/Html/Escaper.zep
index 2214551d926..cc2d6e578f2 100644
--- a/phalcon/Html/Escaper.zep
+++ b/phalcon/Html/Escaper.zep
@@ -39,14 +39,14 @@ class Escaper implements EscaperInterface
     /**
      * @var string
      */
-    protected encoding = "utf-8" { get };
+    protected encoding = "utf-8";
 
     /**
      * ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401
      *
      * @var int
      */
-    protected flags = 11 { get };
+    protected flags = 11;
 
     /**
      * Escapes a HTML attribute string
@@ -194,6 +194,22 @@ class Escaper implements EscaperInterface
         return this->url(input);
     }
 
+    /**
+     * @return string
+     */
+    public function getEncoding() -> string
+    {
+        return this->encoding;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFlags() -> int
+    {
+        return this->flags;
+    }
+
     /**
      * Escapes a HTML string. Internally uses htmlspecialchars
      *
diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep
index f2d1c5d74f9..7181eac9a12 100644
--- a/phalcon/Http/Request.zep
+++ b/phalcon/Http/Request.zep
@@ -57,7 +57,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
     /**
      * @var bool
      */
-    private httpMethodParameterOverride = false { get, set };
+    private httpMethodParameterOverride = false;
 
     /**
      * @var array
@@ -160,6 +160,16 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
         return this->getBestQuality(this->getLanguages(), "language");
     }
 
+    /**
+     * Return the HTTP method parameter override flag
+     *
+     * @return bool
+     */
+    public function getHttpMethodParameterOverride() -> bool
+    {
+        return this->httpMethodParameterOverride;
+    }
+
     /**
      * Gets the preferred ISO locale variant.
      *
@@ -1242,6 +1252,20 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
         return numberFiles;
     }
 
+    /**
+     * Set the HTTP method parameter override flag
+     *
+     * @param bool $override
+     *
+     * @return Request
+     */
+    public function setHttpMethodParameterOverride(bool override) -> <Request>
+    {
+        let this->httpMethodParameterOverride = override;
+
+        return this;
+    }
+
     /**
      * Sets automatic sanitizers/filters for a particular field and for
      * particular methods
diff --git a/phalcon/Http/Request/File.zep b/phalcon/Http/Request/File.zep
index 8ae53db2c9e..96ec8a00fc2 100644
--- a/phalcon/Http/Request/File.zep
+++ b/phalcon/Http/Request/File.zep
@@ -38,17 +38,17 @@ class File implements FileInterface
     /**
      * @var string|null
      */
-    protected error = null { get };
+    protected error = null;
 
     /**
      * @var string
      */
-    protected extension { get };
+    protected extension;
 
     /**
      * @var string|null
      */
-    protected key = null { get };
+    protected key = null;
 
     /**
      * @var string
@@ -100,6 +100,30 @@ class File implements FileInterface
         }
     }
 
+    /**
+     * @var string|null
+     */
+    public function getError() -> string | null
+    {
+        return this->error;
+    }
+
+    /**
+     * @var string
+     */
+    public function getExtension() -> string
+    {
+        return this->extension;
+    }
+
+    /**
+     * @var string|null
+     */
+    public function getKey() -> string | null
+    {
+        return this->key;
+    }
+
     /**
      * Returns the real name of the uploaded file
      */
diff --git a/phalcon/Logger/Adapter/Stream.zep b/phalcon/Logger/Adapter/Stream.zep
index 4efadfe8a39..36e25f6106e 100644
--- a/phalcon/Logger/Adapter/Stream.zep
+++ b/phalcon/Logger/Adapter/Stream.zep
@@ -47,7 +47,7 @@ class Stream extends AbstractAdapter
      *
      * @var string
      */
-    protected name { get };
+    protected name;
 
     /**
      * Path options
@@ -88,6 +88,16 @@ class Stream extends AbstractAdapter
         return true;
     }
 
+    /**
+     * Stream name
+     *
+     * @return string
+     */
+    public function getName() -> string
+    {
+        return this->name;
+    }
+
     /**
      * Processes the message i.e. writes it to the file
      *
diff --git a/phalcon/Logger/Formatter/AbstractFormatter.zep b/phalcon/Logger/Formatter/AbstractFormatter.zep
index 234a46befec..53f40fea159 100644
--- a/phalcon/Logger/Formatter/AbstractFormatter.zep
+++ b/phalcon/Logger/Formatter/AbstractFormatter.zep
@@ -10,6 +10,7 @@
 
 namespace Phalcon\Logger\Formatter;
 
+use DateTimeImmutable;
 use Phalcon\Logger\Item;
 use Phalcon\Support\Helper\Str\AbstractStr;
 
@@ -25,7 +26,17 @@ abstract class AbstractFormatter extends AbstractStr implements FormatterInterfa
      *
      * @var string
      */
-    protected dateFormat = "c" { get, set };
+    protected dateFormat = "c";
+
+    /**
+     * Return the default date format
+     *
+     * @var string
+     */
+    public function getDateFormat() -> string
+    {
+        return this->dateFormat;
+    }
 
     /**
      * Returns the date formatted for the logger.
@@ -38,4 +49,16 @@ abstract class AbstractFormatter extends AbstractStr implements FormatterInterfa
     {
         return item->getDateTime()->format(this->dateFormat);
     }
+
+    /**
+     * Set the default date format
+     *
+     * @param string $format
+     *
+     * @return void
+     */
+    public function setDateFormat(string format) -> void
+    {
+        let this->dateFormat = format;
+    }
 }
diff --git a/phalcon/Logger/Formatter/Line.zep b/phalcon/Logger/Formatter/Line.zep
index 5cbf5a42d55..d4777acc8dd 100644
--- a/phalcon/Logger/Formatter/Line.zep
+++ b/phalcon/Logger/Formatter/Line.zep
@@ -25,7 +25,7 @@ class Line extends AbstractFormatter
      *
      * @var string
      */
-    protected format { get, set };
+    protected format;
 
     /**
      * Line constructor.
@@ -64,4 +64,28 @@ class Line extends AbstractFormatter
 
         return this->toInterpolate(message, item->getContext());
     }
+
+    /**
+     * Return the format applied to each message
+     *
+     * @return string
+     */
+    public function getFormat() -> string
+    {
+        return this->format;
+    }
+
+    /**
+     * Set the format applied to each message
+     *
+     * @param string $format
+     *
+     * @return Line
+     */
+    public function setFormat(string format) -> <Line>
+    {
+        let this->format = format;
+
+        return this;
+    }
 }
diff --git a/phalcon/Logger/Item.zep b/phalcon/Logger/Item.zep
index 66dfdfc52ba..8e9b78e9533 100644
--- a/phalcon/Logger/Item.zep
+++ b/phalcon/Logger/Item.zep
@@ -28,27 +28,27 @@ class Item
     /**
      * @var array
      */
-    protected context = [] { get };
+    protected context = [];
 
     /**
-     * @var string
+     * @var DateTimeImmutable
      */
-    protected message { get };
+    protected dateTime;
 
     /**
-     * @var int
+     * @var string
      */
-    protected level { get };
+    protected message;
 
     /**
-     * @var string
+     * @var int
      */
-    protected levelName { get };
+    protected level;
 
     /**
-     * @var DateTimeImmutable
+     * @var string
      */
-    protected dateTime { get };
+    protected levelName;
 
     /**
      * Item constructor.
@@ -72,4 +72,44 @@ class Item
             this->dateTime  = dateTime,
             this->context   = context;
     }
+
+    /**
+     * @return array
+     */
+    public function getContext() -> array
+    {
+        return this->context;
+    }
+
+    /**
+     * @return DateTimeImmutable
+     */
+    public function getDateTime() -> <DateTimeImmutable>
+    {
+        return this->dateTime;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage() -> string
+    {
+        return this->message;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLevel() -> int
+    {
+        return this->level;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLevelName() -> string
+    {
+        return this->levelName;
+    }
 }
diff --git a/phalcon/Messages/Message.zep b/phalcon/Messages/Message.zep
index 1186face5d8..bce5196f149 100644
--- a/phalcon/Messages/Message.zep
+++ b/phalcon/Messages/Message.zep
@@ -22,27 +22,27 @@ class Message implements MessageInterface, JsonSerializable
     /**
      * @var int
      */
-    protected code { get };
+    protected code;
 
     /**
      * @var string
      */
-    protected field { get };
+    protected field;
 
     /**
      * @var string
      */
-    protected message { get };
+    protected message;
 
     /**
      * @var string
      */
-    protected type { get };
+    protected type;
 
     /**
      * @var array
      */
-    protected metaData = [] { get };
+    protected metaData = [];
 
     /**
      * Phalcon\Messages\Message constructor
@@ -64,6 +64,46 @@ class Message implements MessageInterface, JsonSerializable
         return this->message;
     }
 
+    /**
+     * @return int
+     */
+    public function getCode() -> int
+    {
+        return this->code;
+    }
+
+    /**
+     * @return string
+     */
+    public function getField() -> string
+    {
+        return this->field;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage() -> string
+    {
+        return this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType() -> string
+    {
+        return this->type;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMetaData() -> array
+    {
+        return this->metaData;
+    }
+
     /**
      * Serializes the object for json_encode
      */
diff --git a/phalcon/Mvc/Micro/LazyLoader.zep b/phalcon/Mvc/Micro/LazyLoader.zep
index ff97672da36..f1c4706610c 100644
--- a/phalcon/Mvc/Micro/LazyLoader.zep
+++ b/phalcon/Mvc/Micro/LazyLoader.zep
@@ -20,14 +20,14 @@ use Phalcon\Mvc\Model\BinderInterface;
 class LazyLoader
 {
     /**
-     * @var object|null
+     * @var string
      */
-    protected handler = null { get };
+    protected definition;
 
     /**
-     * @var string
+     * @var object|null
      */
-    protected definition { get };
+    protected handler = null;
 
     /**
      * Phalcon\Mvc\Micro\LazyLoader constructor
@@ -79,4 +79,20 @@ class LazyLoader
             arguments
         );
     }
+
+    /**
+     * @return string
+     */
+    public function getDefinition() -> string
+    {
+        return this->definition;
+    }
+
+    /**
+     * @return object|null
+     */
+    public function getHandler() -> object | null
+    {
+        return this->handler;
+    }
 }
diff --git a/phalcon/Mvc/Model/Binder.zep b/phalcon/Mvc/Model/Binder.zep
index 4a12d690f1b..33a4a84890b 100644
--- a/phalcon/Mvc/Model/Binder.zep
+++ b/phalcon/Mvc/Model/Binder.zep
@@ -29,7 +29,7 @@ class Binder implements BinderInterface
      *
      * @var array
      */
-    protected boundModels = [] { get };
+    protected boundModels = [];
 
     /**
      * Cache object used for caching parameters for model binding
@@ -50,7 +50,7 @@ class Binder implements BinderInterface
      *
      * @var array
      */
-    protected originalValues = [] { get };
+    protected originalValues = [];
 
     /**
      * Phalcon\Mvc\Model\Binder constructor
@@ -108,6 +108,26 @@ class Binder implements BinderInterface
         return {className}::findFirst(paramValue);
     }
 
+    /**
+     * Return the active bound models
+     *
+     * @return array
+     */
+    public function getBoundModels() -> array
+    {
+        return this->boundModels;
+    }
+
+    /**
+     * Return the array for original values
+     *
+     * @return array
+     */
+    public function getOriginalValues() -> array
+    {
+        return this->originalValues;
+    }
+
     /**
      * Sets cache instance
      */
diff --git a/phalcon/Mvc/Router.zep b/phalcon/Mvc/Router.zep
index 8a5a5cbb17e..f883c296f0b 100644
--- a/phalcon/Mvc/Router.zep
+++ b/phalcon/Mvc/Router.zep
@@ -96,12 +96,12 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
     /**
      * @var array
      */
-    protected keyRouteNames = [] { get, set };
+    protected keyRouteNames = [];
 
     /**
      * @var array
      */
-    protected keyRouteIds = [] { get, set };
+    protected keyRouteIds = [];
 
     /**
      * @var RouteInterface|null
@@ -217,8 +217,12 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function add(string! pattern, var paths = null, var httpMethods = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function add(
+        string! pattern,
+        var paths = null,
+        var httpMethods = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         var route;
 
         /**
@@ -245,8 +249,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addConnect(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addConnect(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "CONNECT", position);
     }
 
@@ -264,8 +271,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addDelete(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addDelete(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "DELETE", position);
     }
 
@@ -283,8 +293,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addGet(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addGet(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "GET", position);
     }
 
@@ -302,8 +315,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addHead(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addHead(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "HEAD", position);
     }
 
@@ -321,8 +337,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addOptions(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addOptions(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "OPTIONS", position);
     }
 
@@ -340,8 +359,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addPatch(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addPatch(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "PATCH", position);
     }
 
@@ -359,8 +381,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addPost(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addPost(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "POST", position);
     }
 
@@ -379,8 +404,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addPurge(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addPurge(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "PURGE", position);
     }
 
@@ -398,8 +426,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addPut(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addPut(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "PUT", position);
     }
 
@@ -417,8 +448,11 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouteInterface
      */
-    public function addTrace(string! pattern, var paths = null, int position = Router::POSITION_LAST) -> <RouteInterface>
-    {
+    public function addTrace(
+        string! pattern,
+        var paths = null,
+        int position = Router::POSITION_LAST
+    ) -> <RouteInterface> {
         return this->add(pattern, paths, "TRACE", position);
     }
 
@@ -446,8 +480,10 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      *
      * @return RouterInterface
      */
-    public function attach(<RouteInterface> route, int position = Router::POSITION_LAST) -> <RouterInterface>
-    {
+    public function attach(
+        <RouteInterface> route,
+        int position = Router::POSITION_LAST
+    ) -> <RouterInterface> {
         switch position {
             case self::POSITION_LAST:
                 let this->routes[] = route;
@@ -494,6 +530,36 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
         return this->controller;
     }
 
+    /**
+     * Returns an array of default parameters
+     */
+    public function getDefaults() -> array
+    {
+        return [
+            "namespace":  this->defaultNamespace,
+            "module":     this->defaultModule,
+            "controller": this->defaultController,
+            "action":     this->defaultAction,
+            "params":     this->defaultParams
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getKeyRouteNames() -> array
+    {
+        return this->keyRouteNames;
+    }
+
+    /**
+     * @return array
+     */
+    public function getKeyRouteIds() -> array
+    {
+        return this->keyRouteIds;
+    }
+
     /**
      * Returns the route that matches the handled URI
      */
@@ -1177,20 +1243,6 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
         return this;
     }
 
-    /**
-     * Returns an array of default parameters
-     */
-    public function getDefaults() -> array
-    {
-        return [
-            "namespace":  this->defaultNamespace,
-            "module":     this->defaultModule,
-            "controller": this->defaultController,
-            "action":     this->defaultAction,
-            "params":     this->defaultParams
-        ];
-    }
-
     /**
      * Sets the events manager
      *
@@ -1203,6 +1255,30 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
         let this->eventsManager = eventsManager;
     }
 
+    /**
+     * @param array $routeNames
+     *
+     * @return Router
+     */
+    public function setKeyRouteNames(array routeNames) -> <Router>
+    {
+        let this->keyRouteNames = routeNames;
+
+        return this;
+    }
+
+    /**
+     * @param array $routeIds
+     *
+     * @return Router
+     */
+    public function setKeyRouteIds(array routeIds) -> <Router>
+    {
+        let this->keyRouteIds = routeIds;
+
+        return this;
+    }
+
     /**
      * Checks if the router matches any of the defined routes
      *
diff --git a/phalcon/Mvc/Router/Route.zep b/phalcon/Mvc/Router/Route.zep
index cbc636987c2..c6c84699d36 100644
--- a/phalcon/Mvc/Router/Route.zep
+++ b/phalcon/Mvc/Router/Route.zep
@@ -45,7 +45,7 @@ class Route implements RouteInterface
     /**
      * @var string|null
      */
-    protected id = null { get };
+    protected id = null;
 
     /**
      * @var array|string
@@ -382,6 +382,14 @@ class Route implements RouteInterface
         return this->hostname;
     }
 
+    /**
+     * @return string | null
+     */
+    public function getId() -> string | null
+    {
+        return this->id;
+    }
+
     /**
      * Returns the 'match' callback if any
      */
diff --git a/phalcon/Mvc/View.zep b/phalcon/Mvc/View.zep
index d21d08464c6..f7a08036deb 100644
--- a/phalcon/Mvc/View.zep
+++ b/phalcon/Mvc/View.zep
@@ -104,7 +104,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
     /**
      * @var int
      */
-    protected currentRenderLevel = 0 { get };
+    protected currentRenderLevel = 0;
 
     /**
      * @var bool
@@ -164,12 +164,12 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
     /**
      * @var array
      */
-    protected registeredEngines = [] { get };
+    protected registeredEngines = [];
 
     /**
      * @var int
      */
-    protected renderLevel = 5 { get };
+    protected renderLevel = 5;
 
     /**
      * @var array
@@ -371,6 +371,30 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
         return this->controllerName;
     }
 
+    /**
+     * @return int
+     */
+    public function getCurrentRenderLevel() -> int
+    {
+        return this->currentRenderLevel;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRegisteredEngines() -> array | null
+    {
+        return this->registeredEngines;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRenderLevel() -> int
+    {
+        return this->renderLevel;
+    }
+
     /**
      * Returns the internal event manager
      */
diff --git a/phalcon/Mvc/View/Simple.zep b/phalcon/Mvc/View/Simple.zep
index 20a8058c3d0..65c6e458215 100644
--- a/phalcon/Mvc/View/Simple.zep
+++ b/phalcon/Mvc/View/Simple.zep
@@ -74,9 +74,9 @@ class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterfa
     protected options = [];
 
     /**
-     * @var array|null
+     * @var array | null
      */
-    protected registeredEngines { get };
+    protected registeredEngines = null;
 
     /**
      * @var string
@@ -172,6 +172,14 @@ class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterfa
         return this->viewParams;
     }
 
+    /**
+     * @return array
+     */
+    public function getRegisteredEngines() -> array
+    {
+        return this->registeredEngines;
+    }
+
     /**
      * Returns a parameter previously set in the view
      *
diff --git a/phalcon/Storage/Adapter/AbstractAdapter.zep b/phalcon/Storage/Adapter/AbstractAdapter.zep
index 7e9b87c7f8d..f8a6cc523a7 100644
--- a/phalcon/Storage/Adapter/AbstractAdapter.zep
+++ b/phalcon/Storage/Adapter/AbstractAdapter.zep
@@ -42,7 +42,7 @@ abstract class AbstractAdapter implements AdapterInterface
      *
      * @var string
      */
-    protected defaultSerializer = "php" { get };
+    protected defaultSerializer = "php";
 
     /**
      * Name of the default TTL (time to live)
@@ -164,6 +164,16 @@ abstract class AbstractAdapter implements AdapterInterface
         return this->adapter;
     }
 
+    /**
+     * Name of the default serializer class
+     *
+     * @return string
+     */
+    public function getDefaultSerializer() -> string
+    {
+        return this->defaultSerializer;
+    }
+
     /**
      * Returns all the keys stored
      *
diff --git a/phalcon/Support/Debug/Dump.zep b/phalcon/Support/Debug/Dump.zep
index d303bd2761a..cb8e02760a1 100644
--- a/phalcon/Support/Debug/Dump.zep
+++ b/phalcon/Support/Debug/Dump.zep
@@ -39,7 +39,7 @@ class Dump
     /**
      * @var bool
      */
-    protected detailed = false { get, set };
+    protected detailed = false;
 
     /**
      * @var array
@@ -76,6 +76,16 @@ class Dump
         );
     }
 
+    public function getDetailed() -> bool
+    {
+        return this->detailed;
+    }
+
+    public function setDetailed(bool detailed) -> void
+    {
+        let this->detailed = detailed;
+    }
+
     /**
      * Alias of variable() method
      */
diff --git a/phalcon/Translate/Adapter/Gettext.zep b/phalcon/Translate/Adapter/Gettext.zep
index 2a69014e7ce..2c341412dfd 100644
--- a/phalcon/Translate/Adapter/Gettext.zep
+++ b/phalcon/Translate/Adapter/Gettext.zep
@@ -42,22 +42,22 @@ class Gettext extends AbstractAdapter implements ArrayAccess
     /**
      * @var int
      */
-    protected category { get };
+    protected category;
 
     /**
      * @var string
      */
-    protected defaultDomain { get };
+    protected defaultDomain;
 
     /**
      * @var string|array
      */
-    protected directory { get };
+    protected directory;
 
     /**
      * @var string
      */
-    protected locale { get };
+    protected locale;
 
     /**
      * Gettext constructor.
@@ -98,6 +98,38 @@ class Gettext extends AbstractAdapter implements ArrayAccess
         return this->has(index);
     }
 
+    /**
+     * @return int
+     */
+    public function getCategory() -> int
+    {
+        return this->category;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDefaultDomain() -> string
+    {
+        return this->defaultDomain;
+    }
+
+    /**
+     * @return string|array
+     */
+    public function getDirectory() -> array | string
+    {
+        return this->directory;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLocale() -> string
+    {
+        return this->locale;
+    }
+
     /**
      * Check whether is defined a translation key in the internal array
      *

From 8182a1a808dceb2dbed36a2ebc4e413370870e1e Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sun, 18 Sep 2022 22:12:52 -0400
Subject: [PATCH 51/76] [#16102] - fixing stubs

---
 phalcon/Http/Request/File.zep                  | 6 +++---
 phalcon/Http/Request/FileInterface.zep         | 3 ---
 phalcon/Logger/Formatter/AbstractFormatter.zep | 4 +---
 phalcon/Logger/Formatter/Json.zep              | 2 --
 phalcon/Logger/Formatter/Line.zep              | 2 --
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/phalcon/Http/Request/File.zep b/phalcon/Http/Request/File.zep
index 96ec8a00fc2..3e7994b348b 100644
--- a/phalcon/Http/Request/File.zep
+++ b/phalcon/Http/Request/File.zep
@@ -101,7 +101,7 @@ class File implements FileInterface
     }
 
     /**
-     * @var string|null
+     * @return string|null
      */
     public function getError() -> string | null
     {
@@ -109,7 +109,7 @@ class File implements FileInterface
     }
 
     /**
-     * @var string
+     * @return string
      */
     public function getExtension() -> string
     {
@@ -117,7 +117,7 @@ class File implements FileInterface
     }
 
     /**
-     * @var string|null
+     * @return string|null
      */
     public function getKey() -> string | null
     {
diff --git a/phalcon/Http/Request/FileInterface.zep b/phalcon/Http/Request/FileInterface.zep
index bb3db979ad2..498b802311e 100644
--- a/phalcon/Http/Request/FileInterface.zep
+++ b/phalcon/Http/Request/FileInterface.zep
@@ -11,10 +11,7 @@
 namespace Phalcon\Http\Request;
 
 /**
- * Phalcon\Http\Request\FileInterface
- *
  * Interface for Phalcon\Http\Request\File
- *
  */
 interface FileInterface
 {
diff --git a/phalcon/Logger/Formatter/AbstractFormatter.zep b/phalcon/Logger/Formatter/AbstractFormatter.zep
index 53f40fea159..5bb2d0612db 100644
--- a/phalcon/Logger/Formatter/AbstractFormatter.zep
+++ b/phalcon/Logger/Formatter/AbstractFormatter.zep
@@ -16,8 +16,6 @@ use Phalcon\Support\Helper\Str\AbstractStr;
 
 /**
  * Class AbstractFormatter
- *
- * @property string $dateFormat
  */
 abstract class AbstractFormatter extends AbstractStr implements FormatterInterface
 {
@@ -31,7 +29,7 @@ abstract class AbstractFormatter extends AbstractStr implements FormatterInterfa
     /**
      * Return the default date format
      *
-     * @var string
+     * @return string
      */
     public function getDateFormat() -> string
     {
diff --git a/phalcon/Logger/Formatter/Json.zep b/phalcon/Logger/Formatter/Json.zep
index 7d0e9c3e3ab..d6b9ab78e76 100644
--- a/phalcon/Logger/Formatter/Json.zep
+++ b/phalcon/Logger/Formatter/Json.zep
@@ -14,8 +14,6 @@ use JsonException;
 use Phalcon\Logger\Item;
 
 /**
- * Phalcon\Logger\Formatter\Json
- *
  * Formats messages using JSON encoding
  */
 class Json extends AbstractFormatter
diff --git a/phalcon/Logger/Formatter/Line.zep b/phalcon/Logger/Formatter/Line.zep
index d4777acc8dd..b0fd06c34df 100644
--- a/phalcon/Logger/Formatter/Line.zep
+++ b/phalcon/Logger/Formatter/Line.zep
@@ -15,8 +15,6 @@ use Phalcon\Logger\Item;
 
 /**
  * Class Line
- *
- * @property string $format
  */
 class Line extends AbstractFormatter
 {

From 26129e8b83fa277d2871a85b16b3c875e900ad22 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sun, 18 Sep 2022 22:25:01 -0400
Subject: [PATCH 52/76] [#16102] - updating changelog

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index a6396b7b519..36336dcaa3f 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -2,6 +2,7 @@
 
 ## Changed
 - Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072) 
+- Changed getters and setters from shorthand format to full methods [#16102](https://github.com/phalcon/cphalcon/issues/16102)
 
 ## Fixed
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)

From f82700393731c831b7a247547cfe6fa2ac728b50 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 19 Sep 2022 09:19:27 -0400
Subject: [PATCH 53/76] [#16102] - renamed property (psr12); better types for
 registeredEngines (view)

---
 .github/workflows/main.yml  | 2 +-
 phalcon/Db/Column.zep       | 8 ++++----
 phalcon/Mvc/View.zep        | 2 +-
 phalcon/Mvc/View/Simple.zep | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b0197152ba7..ec8c94f8a94 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ on:
 env:
   # All versions should be declared here
   PHALCON_VERSION: 5.0.0RC4
-  ZEPHIR_PARSER_VERSION: 1.5.0
+  ZEPHIR_PARSER_VERSION: 1.5.1
   ZEPHIR_VERSION: 0.16.3
 
   # For tests
diff --git a/phalcon/Db/Column.zep b/phalcon/Db/Column.zep
index 3e72116f015..d9923c63b3d 100644
--- a/phalcon/Db/Column.zep
+++ b/phalcon/Db/Column.zep
@@ -249,7 +249,7 @@ class Column implements ColumnInterface
      *
      * @var mixed|null
      */
-    protected _default = null;
+    protected defaultValue = null;
 
     /**
      * Position is first
@@ -403,7 +403,7 @@ class Column implements ColumnInterface
          * Check if the column is default value
          */
         if fetch defaultValue, definition["default"] {
-            let this->_default = defaultValue;
+            let this->defaultValue = defaultValue;
         }
 
         /**
@@ -502,7 +502,7 @@ class Column implements ColumnInterface
      */
     public function getDefault() -> var
     {
-        return this->_default;
+        return this->defaultValue;
     }
 
     /**
@@ -562,7 +562,7 @@ class Column implements ColumnInterface
             return false;
         }
 
-        return this->_default !== null;
+        return this->defaultValue !== null;
     }
 
     /**
diff --git a/phalcon/Mvc/View.zep b/phalcon/Mvc/View.zep
index f7a08036deb..d302deb997f 100644
--- a/phalcon/Mvc/View.zep
+++ b/phalcon/Mvc/View.zep
@@ -382,7 +382,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
     /**
      * @return array
      */
-    public function getRegisteredEngines() -> array | null
+    public function getRegisteredEngines() -> array
     {
         return this->registeredEngines;
     }
diff --git a/phalcon/Mvc/View/Simple.zep b/phalcon/Mvc/View/Simple.zep
index 65c6e458215..0380b64b5bb 100644
--- a/phalcon/Mvc/View/Simple.zep
+++ b/phalcon/Mvc/View/Simple.zep
@@ -74,9 +74,9 @@ class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterfa
     protected options = [];
 
     /**
-     * @var array | null
+     * @var array
      */
-    protected registeredEngines = null;
+    protected registeredEngines = [];
 
     /**
      * @var string
@@ -444,7 +444,7 @@ class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterfa
 
             let registeredEngines = this->registeredEngines;
 
-            if typeof registeredEngines != "array" {
+            if empty registeredEngines {
                 /**
                  * We use Phalcon\Mvc\View\Engine\Php as default
                  * Use .phtml as extension for the PHP engine

From de2e6d4abcfd527fde72733d23023bff539791bf Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Mon, 19 Sep 2022 23:45:15 +0200
Subject: [PATCH 54/76] build: harden build-docker.yml permissions
 Signed-off-by: Alex <aleksandrosansan@gmail.com>

---
 .github/workflows/build-docker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index b92ebba94ab..ede5b6d06c5 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - 'docker/**'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
     runs-on: ubuntu-20.04

From 7b3ac010c2d5017252d0b736d41cd778a24cde09 Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Mon, 19 Sep 2022 23:50:49 +0200
Subject: [PATCH 55/76] build: harden main.yml permissions Signed-off-by: Alex
 <aleksandrosansan@gmail.com>

---
 .github/workflows/main.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e5beb48e53..383f1a3b26c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,6 +34,7 @@ env:
   # PHP extensions required by Composer
   EXTENSIONS: apcu, gettext, gd, igbinary, imagick, intl, json, mbstring, msgpack, memcached, sqlite3, yaml, redis, :memcache
 
+permissions: {}
 jobs:
   # Configure Workflow for correct run reusable workflow
   # This is required step. It's workaround for non-initialized ENVs when trying to pass input variables from ENVs.
@@ -52,6 +53,9 @@ jobs:
 
   # PHP CodeSniffer inspection
   phpcs:
+    permissions:
+      contents: read
+
     uses: zephir-lang/templates/.github/workflows/phpcs.yml@main
     with:
       standard: ./phpcs.xml
@@ -72,6 +76,9 @@ jobs:
       composer-token: ${{ secrets.GITHUB_TOKEN }}
 
   build-and-test:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+
     name: tests / PHP-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.arch }}
     needs: [generate]
     runs-on: ${{ matrix.os }}
@@ -223,6 +230,9 @@ jobs:
       extensions: ${{ needs.setup_workflow.outputs.zephir_extensions }}
 
   integration-test:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+
     needs: [generate]
     runs-on: ubuntu-20.04
 
@@ -368,6 +378,9 @@ jobs:
       #   run: vendor/bin/codecept run --ext DotReporter database --env sqlsrv
 
   release:
+    permissions:
+      contents: write # to create a release (ncipollo/release-action)
+
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
 
     needs: [generate, install, build-and-test, integration-test]

From 72acb2920439a8e5e058496da2d66e0dd4f95bea Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 00:03:15 +0100
Subject: [PATCH 56/76] Improve and refactor code

---
 phalcon/Acl/Adapter/Memory.zep                |  18 +--
 phalcon/Acl/Component.zep                     |   2 +-
 phalcon/Acl/Role.zep                          |   2 +-
 .../Annotations/Adapter/AbstractAdapter.zep   |   6 +-
 phalcon/Annotations/Reader.zep                |  10 +-
 phalcon/Application/AbstractApplication.zep   |   2 +-
 phalcon/Cli/Console.zep                       |   6 +-
 phalcon/Cli/Dispatcher.zep                    |   4 +-
 phalcon/Cli/Router.zep                        |   2 +-
 phalcon/Config/Adapter/Grouped.zep            |   2 +-
 phalcon/Config/ConfigFactory.zep              |   2 +-
 phalcon/Db/Adapter/AbstractAdapter.zep        |   4 +-
 phalcon/Db/Adapter/Pdo/AbstractPdo.zep        |  30 ++--
 phalcon/Db/Result/PdoResult.zep               |   6 +-
 phalcon/Di/Di.zep                             |  12 +-
 .../Exception/ServiceResolutionException.zep  |  14 +-
 phalcon/Di/InitializationAwareInterface.zep   |  10 ++
 phalcon/Di/Injectable.zep                     |   6 +-
 phalcon/Di/Service.zep                        |   9 +-
 phalcon/Di/Service/Builder.zep                |  30 +---
 phalcon/Dispatcher/AbstractDispatcher.zep     |  27 ++--
 phalcon/Factory/AbstractConfigFactory.zep     |   2 +-
 phalcon/Filter/Validation.zep                 |   6 +-
 phalcon/Http/Cookie.zep                       |   8 +-
 phalcon/Http/Request.zep                      |  20 +--
 phalcon/Http/Response.zep                     |   4 +-
 phalcon/Http/Response/Cookies.zep             |   2 +-
 phalcon/Messages/Messages.zep                 |   2 +-
 phalcon/Mvc/Application.zep                   |  24 +--
 phalcon/Mvc/Dispatcher.zep                    |   2 +-
 phalcon/Mvc/Micro.zep                         | 111 +++++--------
 phalcon/Mvc/Model.zep                         | 146 ++++++++----------
 phalcon/Mvc/Router.zep                        |  18 +--
 phalcon/Mvc/Url.zep                           |   8 +-
 phalcon/Mvc/View.zep                          |  28 ++--
 phalcon/Mvc/View/Engine/Php.zep               |   2 +-
 phalcon/Mvc/View/Engine/Volt/Compiler.zep     |  11 +-
 phalcon/Mvc/ViewBaseInterface.zep             |   1 -
 phalcon/Tag.zep                               |   6 +-
 39 files changed, 257 insertions(+), 348 deletions(-)

diff --git a/phalcon/Acl/Adapter/Memory.zep b/phalcon/Acl/Adapter/Memory.zep
index efd9a05e03d..44608cbe15d 100644
--- a/phalcon/Acl/Adapter/Memory.zep
+++ b/phalcon/Acl/Adapter/Memory.zep
@@ -209,7 +209,7 @@ class Memory extends AbstractAdapter
     {
         var componentName, componentObject;
 
-        if typeof componentValue == "object" && componentValue instanceof ComponentInterface {
+        if componentValue instanceof ComponentInterface {
             let componentObject = componentValue;
         } else {
             let componentObject = new Component(componentValue);
@@ -236,13 +236,13 @@ class Memory extends AbstractAdapter
 
         this->checkExists(this->componentsNames, componentName, "Component");
 
-        if unlikely (typeof accessList != "array" && typeof accessList != "string") {
+        if unlikely (typeof accessList !== "array" && typeof accessList !== "string") {
             throw new Exception("Invalid value for the accessList");
         }
 
         let exists = true;
 
-        if typeof accessList == "array" {
+        if typeof accessList === "array" {
             for accessName in accessList {
                 let accessKey = componentName . "!" . accessName;
 
@@ -284,7 +284,7 @@ class Memory extends AbstractAdapter
         /**
          * Type conversion
          */
-        if typeof roleToInherits != "array" {
+        if typeof roleToInherits !== "array" {
             let roleToInheritList = [roleToInherits];
         } else {
             let roleToInheritList = roleToInherits;
@@ -294,7 +294,7 @@ class Memory extends AbstractAdapter
          * inherits
          */
         for roleToInherit in roleToInheritList {
-            if typeof roleToInherit == "object" && roleToInherit instanceof RoleInterface {
+            if roleToInherit instanceof RoleInterface {
                 let roleInheritName = roleToInherit->getName();
             } else {
                 let roleInheritName = roleToInherit;
@@ -383,7 +383,7 @@ class Memory extends AbstractAdapter
     {
         var roleName, roleObject;
 
-        if typeof role == "object" && role instanceof RoleInterface {
+        if role instanceof RoleInterface {
             let roleObject = role;
         } elseif is_string(role) {
             let roleObject = new Role(role);
@@ -490,13 +490,13 @@ class Memory extends AbstractAdapter
         string accessKey;
         array localAccess = [];
 
-        if typeof accessList == "string" {
+        if typeof accessList === "string" {
             let localAccess = [accessList];
         } else {
             let localAccess = accessList;
         }
 
-        if typeof accessList == "array" {
+        if typeof accessList === "array" {
             for accessName in localAccess {
                 let accessKey = componentName . "!" . accessName;
 
@@ -600,7 +600,7 @@ class Memory extends AbstractAdapter
 
         bool hasComponent = false, hasRole = false;
 
-        if typeof roleName == "object" {
+        if typeof roleName === "object" {
             if roleName instanceof RoleAwareInterface {
                 let roleObject = roleName,
                     roleName   = roleObject->getRoleName();
diff --git a/phalcon/Acl/Component.zep b/phalcon/Acl/Component.zep
index e6f1a43edce..285d7785f6c 100644
--- a/phalcon/Acl/Component.zep
+++ b/phalcon/Acl/Component.zep
@@ -34,7 +34,7 @@ class Component implements ComponentInterface
      */
     public function __construct(string! name, string description = null)
     {
-        if unlikely name == "*" {
+        if unlikely name === "*" {
             throw new Exception("Component name cannot be '*'");
         }
 
diff --git a/phalcon/Acl/Role.zep b/phalcon/Acl/Role.zep
index 079a39263c6..0a8cad06d17 100644
--- a/phalcon/Acl/Role.zep
+++ b/phalcon/Acl/Role.zep
@@ -34,7 +34,7 @@ class Role implements RoleInterface
      */
     public function __construct(string! name, string description = null)
     {
-        if unlikely name == "*" {
+        if unlikely name === "*" {
             throw new Exception("Role name cannot be '*'");
         }
 
diff --git a/phalcon/Annotations/Adapter/AbstractAdapter.zep b/phalcon/Annotations/Adapter/AbstractAdapter.zep
index a96b3697d3b..da270dcb453 100644
--- a/phalcon/Annotations/Adapter/AbstractAdapter.zep
+++ b/phalcon/Annotations/Adapter/AbstractAdapter.zep
@@ -41,7 +41,7 @@ abstract class AbstractAdapter implements AdapterInterface
         /**
          * Get the class name if it's an object
          */
-        if typeof className == "object" {
+        if typeof className === "object" {
             let realClassName = get_class(className);
         }  else {
             let realClassName = className;
@@ -158,7 +158,7 @@ abstract class AbstractAdapter implements AdapterInterface
 
         let methods = classAnnotations->getMethodsAnnotations();
 
-        if typeof methods == "array" {
+        if typeof methods === "array" {
             for methodKey, method in methods {
                 if !strcasecmp(methodKey, methodName) {
                     return method;
@@ -192,7 +192,7 @@ abstract class AbstractAdapter implements AdapterInterface
      */
     public function getReader() -> <ReaderInterface>
     {
-        if typeof this->reader != "object" {
+        if this->reader === null {
             let this->reader = new Reader();
         }
 
diff --git a/phalcon/Annotations/Reader.zep b/phalcon/Annotations/Reader.zep
index d74a8e53f8d..beeb97e1f1c 100644
--- a/phalcon/Annotations/Reader.zep
+++ b/phalcon/Annotations/Reader.zep
@@ -49,7 +49,7 @@ class Reader implements ReaderInterface
             /**
              * Append the class annotations to the annotations var
              */
-            if typeof classAnnotations == "array" {
+            if typeof classAnnotations === "array" {
                 let annotations["class"] = classAnnotations;
             }
         }
@@ -74,7 +74,7 @@ class Reader implements ReaderInterface
                 let constantReflection = reflection->getReflectionConstant(constant);
                 let comment = constantReflection->getDocComment();
 
-                if typeof comment == "string" {
+                if typeof comment === "string" {
                     /**
                      * Parse constant docblock comment
                      */
@@ -113,7 +113,7 @@ class Reader implements ReaderInterface
                  */
                 let comment = property->getDocComment();
 
-                if typeof comment == "string" {
+                if typeof comment === "string" {
                     /**
                      * Parse property docblock comment
                      */
@@ -123,7 +123,7 @@ class Reader implements ReaderInterface
                         line
                     );
 
-                    if typeof propertyAnnotations == "array" {
+                    if typeof propertyAnnotations === "array" {
                         let annotationsProperties[property->name] = propertyAnnotations;
                     }
                 }
@@ -177,7 +177,7 @@ class Reader implements ReaderInterface
      */
     public static function parseDocBlock(string docBlock, file = null, line = null) -> array
     {
-        if typeof file != "string" {
+        if typeof file !== "string" {
             let file = "eval code";
         }
 
diff --git a/phalcon/Application/AbstractApplication.zep b/phalcon/Application/AbstractApplication.zep
index eda9320e40e..291d6ede335 100644
--- a/phalcon/Application/AbstractApplication.zep
+++ b/phalcon/Application/AbstractApplication.zep
@@ -45,7 +45,7 @@ abstract class AbstractApplication extends Injectable implements EventsAwareInte
      */
     public function __construct(<DiInterface> container = null)
     {
-        if typeof container == "object" {
+        if container === null {
             let this->container = container;
         }
     }
diff --git a/phalcon/Cli/Console.zep b/phalcon/Cli/Console.zep
index 6dd0c9bf177..18da2380dd4 100644
--- a/phalcon/Cli/Console.zep
+++ b/phalcon/Cli/Console.zep
@@ -41,7 +41,7 @@ class Console extends AbstractApplication
 
         let container = this->container;
 
-        if unlikely typeof container != "object" {
+        if container === null {
             throw new Exception(
                 "A dependency injection container is required to access internal services"
             );
@@ -53,7 +53,7 @@ class Console extends AbstractApplication
          * Call boot event, this allows the developer to perform initialization
          * actions
          */
-        if typeof eventsManager == "object" {
+        if eventsManager !== null {
             if eventsManager->fire("console:boot", this) === false {
                 return false;
             }
@@ -165,7 +165,7 @@ class Console extends AbstractApplication
         }
 
         for arg in arguments {
-            if typeof arg == "string" {
+            if typeof arg === "string" {
                 if strncmp(arg, "--", 2) == 0 {
                     let pos = strpos(arg, "=");
 
diff --git a/phalcon/Cli/Dispatcher.zep b/phalcon/Cli/Dispatcher.zep
index 060d7c3a49b..d7eb6f3c2a0 100644
--- a/phalcon/Cli/Dispatcher.zep
+++ b/phalcon/Cli/Dispatcher.zep
@@ -113,7 +113,7 @@ class Dispatcher extends CliDispatcher implements DispatcherInterface
 
         let container = this->container;
 
-        if typeof container != "object" {
+        if container === null {
             this->{"throwDispatchException"}(
                 "A dependency injection container is required to access the 'filter' service",
                 Exception::EXCEPTION_NO_DI
@@ -198,7 +198,7 @@ class Dispatcher extends CliDispatcher implements DispatcherInterface
 
         let eventsManager = <ManagerInterface> this->eventsManager;
 
-        if typeof eventsManager == "object" {
+        if eventsManager !== null {
             if eventsManager->fire("dispatch:beforeException", this, exception) === false {
                 return false;
             }
diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep
index c43577799e9..1335ad462ea 100644
--- a/phalcon/Cli/Router.zep
+++ b/phalcon/Cli/Router.zep
@@ -259,7 +259,7 @@ class Router extends AbstractInjectionAware
             this->wasMatched = false,
             this->matchedRoute = null;
 
-        if typeof arguments != "array" {
+        if typeof arguments !== "array" {
             if unlikely (typeof arguments != "string" && arguments !== null) {
                 throw new Exception("Arguments must be an array or string");
             }
diff --git a/phalcon/Config/Adapter/Grouped.zep b/phalcon/Config/Adapter/Grouped.zep
index 71cbbeb6432..886e586c52b 100644
--- a/phalcon/Config/Adapter/Grouped.zep
+++ b/phalcon/Config/Adapter/Grouped.zep
@@ -82,7 +82,7 @@ class Grouped extends Config
             let configInstance = configName;
 
             // Set to default adapter if passed as string
-            if typeof configName === "object" && configName instanceof ConfigInterface {
+            if configName instanceof ConfigInterface {
                 this->merge(configInstance);
                 continue;
             } elseif typeof configName === "string" {
diff --git a/phalcon/Config/ConfigFactory.zep b/phalcon/Config/ConfigFactory.zep
index bc9ccb62cfc..5a56f95d880 100644
--- a/phalcon/Config/ConfigFactory.zep
+++ b/phalcon/Config/ConfigFactory.zep
@@ -167,7 +167,7 @@ class ConfigFactory extends AbstractFactory
             ];
         }
 
-        if typeof config === "object" && config instanceof ConfigInterface {
+        if config instanceof ConfigInterface {
             let config = config->toArray();
         }
 
diff --git a/phalcon/Db/Adapter/AbstractAdapter.zep b/phalcon/Db/Adapter/AbstractAdapter.zep
index 6d695b40a0e..4f4eec905c6 100644
--- a/phalcon/Db/Adapter/AbstractAdapter.zep
+++ b/phalcon/Db/Adapter/AbstractAdapter.zep
@@ -151,9 +151,9 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
         /**
          * Create the instance only if the dialect is a string
          */
-        if typeof dialectClass == "string" {
+        if typeof dialectClass === "string" {
             let this->dialect = create_instance(dialectClass);
-        } elseif typeof dialectClass == "object" {
+        } elseif typeof dialectClass === "object" {
             let this->dialect = dialectClass;
         }
 
diff --git a/phalcon/Db/Adapter/Pdo/AbstractPdo.zep b/phalcon/Db/Adapter/Pdo/AbstractPdo.zep
index 780669027eb..f6a6c560dae 100644
--- a/phalcon/Db/Adapter/Pdo/AbstractPdo.zep
+++ b/phalcon/Db/Adapter/Pdo/AbstractPdo.zep
@@ -95,7 +95,7 @@ abstract class AbstractPdo extends AbstractAdapter
      */
     public function begin(bool nesting = true) -> bool
     {
-        var transactionLevel, eventsManager, savepointName;
+        var eventsManager, savepointName;
 
         /**
          * Increase the transaction nesting level
@@ -105,9 +105,7 @@ abstract class AbstractPdo extends AbstractAdapter
         /**
          * Check the transaction nesting level
          */
-        let transactionLevel = (int) this->transactionLevel;
-
-        if transactionLevel == 1 {
+        if this->transactionLevel === 1 {
             /**
              * Notify the events manager about the started transaction
              */
@@ -122,7 +120,7 @@ abstract class AbstractPdo extends AbstractAdapter
         /**
          * Check if the current database system supports nested transactions
          */
-        if !transactionLevel || !nesting || !this->isNestedTransactionsWithSavepoints() {
+        if this->transactionLevel === 0 || !nesting || !this->isNestedTransactionsWithSavepoints() {
             return false;
         }
 
@@ -144,17 +142,16 @@ abstract class AbstractPdo extends AbstractAdapter
      */
     public function commit(bool nesting = true) -> bool
     {
-        var transactionLevel, eventsManager, savepointName;
+        var eventsManager, savepointName;
 
         /**
          * Check the transaction nesting level
          */
-        let transactionLevel = (int) this->transactionLevel;
-        if unlikely !transactionLevel {
+        if this->transactionLevel === 0 {
             throw new Exception("There is no active transaction");
         }
 
-        if transactionLevel == 1 {
+        if this->transactionLevel === 1 {
             /**
              * Notify the events manager about the committed transaction
              */
@@ -174,11 +171,11 @@ abstract class AbstractPdo extends AbstractAdapter
         /**
          * Check if the current database system supports nested transactions
          */
-        if !transactionLevel || !nesting || !this->isNestedTransactionsWithSavepoints() {
+        if this->transactionLevel === 0 || !nesting || !this->isNestedTransactionsWithSavepoints() {
             /**
              * Reduce the transaction nesting level
              */
-            if transactionLevel > 0 {
+            if this->transactionLevel > 0 {
                 let this->transactionLevel--;
             }
 
@@ -749,17 +746,16 @@ abstract class AbstractPdo extends AbstractAdapter
      */
     public function rollback(bool nesting = true) -> bool
     {
-        var transactionLevel, eventsManager, savepointName;
+        var eventsManager, savepointName;
 
         /**
          * Check the transaction nesting level
          */
-        let transactionLevel = (int) this->transactionLevel;
-        if unlikely !transactionLevel {
+        if this->transactionLevel === 0 {
             throw new Exception("There is no active transaction");
         }
 
-        if transactionLevel == 1 {
+        if this->transactionLevel === 1 {
             /**
              * Notify the events manager about the rollbacked transaction
              */
@@ -779,11 +775,11 @@ abstract class AbstractPdo extends AbstractAdapter
         /**
          * Check if the current database system supports nested transactions
          */
-        if !transactionLevel || !nesting || !this->isNestedTransactionsWithSavepoints() {
+        if this->transactionLevel === 0 || !nesting || !this->isNestedTransactionsWithSavepoints() {
             /**
              * Reduce the transaction nesting level
              */
-            if transactionLevel > 0 {
+            if this->transactionLevel > 0 {
                 let this->transactionLevel--;
             }
 
diff --git a/phalcon/Db/Result/PdoResult.zep b/phalcon/Db/Result/PdoResult.zep
index b9989f493fe..8fb46b077af 100644
--- a/phalcon/Db/Result/PdoResult.zep
+++ b/phalcon/Db/Result/PdoResult.zep
@@ -132,10 +132,10 @@ class PdoResult implements ResultInterface
          * PDO doesn't support scrollable cursors, so we need to re-execute the
          * statement
          */
-        if typeof bindParams == "array" {
+        if typeof bindParams === "array" {
             let statement = pdo->prepare(sqlStatement);
 
-            if typeof statement == "object" {
+            if typeof statement === "object" {
                 let statement = connection->executePrepared(
                     statement,
                     bindParams,
@@ -284,7 +284,7 @@ class PdoResult implements ResultInterface
             /**
              * MySQL and PostgreSQL properly returns the number of records
              */
-            if type == "mysql" || type == "pgsql" {
+            if type === "mysql" || type === "pgsql" {
                 let pdoStatement = this->pdoStatement,
                     rowCount = pdoStatement->rowCount();
             }
diff --git a/phalcon/Di/Di.zep b/phalcon/Di/Di.zep
index 06e2a8229b1..649aff7a865 100644
--- a/phalcon/Di/Di.zep
+++ b/phalcon/Di/Di.zep
@@ -89,15 +89,15 @@ class Di implements DiInterface
      *
      * @var DiInterface|null
      */
-    protected static _default;
+    protected static defaultDi;
 
     /**
      * Phalcon\Di\Di constructor
      */
     public function __construct()
     {
-        if !self::_default {
-            let self::_default = this;
+        if !self::defaultDi {
+            let self::defaultDi = this;
         }
     }
 
@@ -271,7 +271,7 @@ class Di implements DiInterface
      */
     public static function getDefault() -> <DiInterface> | null
     {
-        return self::_default;
+        return self::defaultDi;
     }
 
     /**
@@ -539,7 +539,7 @@ class Di implements DiInterface
      */
     public static function reset() -> void
     {
-        let self::_default = null;
+        let self::defaultDi = null;
     }
 
     /**
@@ -558,7 +558,7 @@ class Di implements DiInterface
      */
     public static function setDefault(<DiInterface> container) -> void
     {
-        let self::_default = container;
+        let self::defaultDi = container;
     }
 
     /**
diff --git a/phalcon/Di/Exception/ServiceResolutionException.zep b/phalcon/Di/Exception/ServiceResolutionException.zep
index d9156862462..590aacec84b 100644
--- a/phalcon/Di/Exception/ServiceResolutionException.zep
+++ b/phalcon/Di/Exception/ServiceResolutionException.zep
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
- namespace Phalcon\Di\Exception;
+namespace Phalcon\Di\Exception;
 
- /**
-  * Phalcon\Di\Exception\ServiceResolutionException
-  */
- class ServiceResolutionException extends \Phalcon\Di\Exception
- {
- }
+/**
+ * Phalcon\Di\Exception\ServiceResolutionException
+ */
+class ServiceResolutionException extends \Phalcon\Di\Exception
+{
+}
diff --git a/phalcon/Di/InitializationAwareInterface.zep b/phalcon/Di/InitializationAwareInterface.zep
index 1ecc8153580..470b912203e 100644
--- a/phalcon/Di/InitializationAwareInterface.zep
+++ b/phalcon/Di/InitializationAwareInterface.zep
@@ -1,3 +1,13 @@
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
 namespace Phalcon\Di;
 
 interface InitializationAwareInterface
diff --git a/phalcon/Di/Injectable.zep b/phalcon/Di/Injectable.zep
index 241cd331e87..51a262c463e 100644
--- a/phalcon/Di/Injectable.zep
+++ b/phalcon/Di/Injectable.zep
@@ -60,7 +60,7 @@ abstract class Injectable implements InjectionAwareInterface
 
         let container = <DiInterface> this->getDI();
 
-        if propertyName == "di" {
+        if propertyName === "di" {
             let this->{"di"} = container;
 
             return container;
@@ -69,7 +69,7 @@ abstract class Injectable implements InjectionAwareInterface
         /**
          * Accessing the persistent property will create a session bag on any class
          */
-        if propertyName == "persistent" {
+        if propertyName === "persistent" {
             let this->{"persistent"} = <BagInterface> container->get(
                 "sessionBag",
                 [
@@ -116,7 +116,7 @@ abstract class Injectable implements InjectionAwareInterface
 
         let container = <DiInterface> this->container;
 
-        if typeof container != "object" {
+        if container === null {
             let container = Di::getDefault();
 
             if unlikely typeof container != "object" {
diff --git a/phalcon/Di/Service.zep b/phalcon/Di/Service.zep
index 984c45cb3ec..60fe2123037 100644
--- a/phalcon/Di/Service.zep
+++ b/phalcon/Di/Service.zep
@@ -76,7 +76,7 @@ class Service implements ServiceInterface
 
         let definition = this->definition;
 
-        if unlikely typeof definition != "array" {
+        if unlikely typeof definition !== "array" {
             throw new Exception(
                 "Definition must be an array to obtain its parameters"
             );
@@ -136,7 +136,7 @@ class Service implements ServiceInterface
             instance = null;
 
         let definition = this->definition;
-        if typeof definition == "string" {
+        if typeof definition === "string" {
             /**
              * String definitions can be class names without implicit parameters
              */
@@ -155,12 +155,11 @@ class Service implements ServiceInterface
                 let found = false;
             }
         } else {
-
             /**
              * Object definitions can be a Closure or an already resolved
              * instance
              */
-            if typeof definition == "object" {
+            if typeof definition === "object" {
                 if definition instanceof Closure {
 
                     /**
@@ -234,7 +233,7 @@ class Service implements ServiceInterface
 
         let definition = this->definition;
 
-        if unlikely typeof definition != "array" {
+        if unlikely typeof definition !== "array" {
             throw new Exception(
                 "Definition must be an array to update its parameters"
             );
diff --git a/phalcon/Di/Service/Builder.zep b/phalcon/Di/Service/Builder.zep
index 480ef650423..d0356748e75 100644
--- a/phalcon/Di/Service/Builder.zep
+++ b/phalcon/Di/Service/Builder.zep
@@ -41,8 +41,7 @@ class Builder
             );
         }
 
-        if typeof parameters == "array" {
-
+        if typeof parameters === "array" {
             /**
              * Build the instance overriding the definition constructor
              * parameters
@@ -52,14 +51,11 @@ class Builder
             } else {
                 let instance = create_instance(className);
             }
-
         } else {
-
             /**
              * Check if the argument has constructor arguments
              */
             if fetch arguments, definition["arguments"] {
-
                 /**
                  * Create the instance based on the parameters
                  */
@@ -67,7 +63,6 @@ class Builder
                     className,
                     this->buildParameters(container, arguments)
                 );
-
             } else {
                 let instance = create_instance(className);
             }
@@ -77,7 +72,7 @@ class Builder
          * The definition has calls?
          */
         if fetch paramCalls, definition["calls"] {
-            if unlikely typeof instance != "object" {
+            if unlikely typeof instance !== "object" {
                 throw new Exception(
                     "The definition has setter injection parameters but the constructor didn't return an instance"
                 );
@@ -93,7 +88,6 @@ class Builder
              * The method call has parameters
              */
             for methodPosition, method in paramCalls {
-
                 /**
                  * The call parameter must be an array of arrays
                  */
@@ -152,14 +146,13 @@ class Builder
          * The definition has properties?
          */
         if fetch paramCalls, definition["properties"] {
-
-            if unlikely typeof instance != "object" {
+            if unlikely typeof instance !== "object" {
                 throw new Exception(
                     "The definition has properties injection parameters but the constructor didn't return an instance"
                 );
             }
 
-            if unlikely typeof paramCalls != "array" {
+            if unlikely typeof paramCalls !== "array" {
                 throw new Exception(
                     "Setter injection parameters must be an array"
                 );
@@ -169,7 +162,6 @@ class Builder
              * The method call has parameters
              */
             for propertyPosition, property in paramCalls {
-
                 /**
                  * The call parameter must be an array of arrays
                  */
@@ -230,7 +222,6 @@ class Builder
         }
 
         switch type {
-
             /**
              * If the argument type is 'service', we obtain the service from the
              * DI
@@ -242,12 +233,6 @@ class Builder
                     );
                 }
 
-                if unlikely typeof container != "object" {
-                    throw new Exception(
-                        "The dependency injector container is not valid"
-                    );
-                }
-
                 return container->get(name);
 
             /**
@@ -266,19 +251,12 @@ class Builder
              * If the argument type is 'instance', we assign the value as it is
              */
             case "instance":
-
                 if unlikely !fetch name, argument["className"] {
                     throw new Exception(
                         "Service 'className' is required in parameter on position " . position
                     );
                 }
 
-                if unlikely typeof container != "object" {
-                    throw new Exception(
-                        "The dependency injector container is not valid"
-                    );
-                }
-
                 if fetch instanceArguments, argument["arguments"] {
                     /**
                      * Build the instance with arguments
diff --git a/phalcon/Dispatcher/AbstractDispatcher.zep b/phalcon/Dispatcher/AbstractDispatcher.zep
index c8e8acb8b2b..c809708eec4 100644
--- a/phalcon/Dispatcher/AbstractDispatcher.zep
+++ b/phalcon/Dispatcher/AbstractDispatcher.zep
@@ -180,7 +180,7 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
 
         let container = <DiInterface> this->container;
 
-        if typeof container != "object" {
+        if container === null {
             this->{"throwDispatchException"}(
                 "A dependency injection container is required to access related dispatching services",
                 PhalconException::EXCEPTION_NO_DI
@@ -276,14 +276,13 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
              * Handlers are retrieved as shared instances from the Service
              * Container
              */
-            let hasService = (bool) container->has(handlerClass);
-
+            let hasService = container->has(handlerClass);
             if !hasService {
                 /**
                  * DI doesn't have a service with that name, try to load it
                  * using an autoloader
                  */
-                let hasService = (bool) class_exists(handlerClass);
+                let hasService = class_exists(handlerClass);
             }
 
             // If the service can be loaded we throw an exception
@@ -334,7 +333,7 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
             /**
              * Check if the params is an array
              */
-            if unlikely typeof this->params != "array" {
+            if unlikely typeof this->params !== "array" {
                 /**
                  * An invalid parameter variable was passed throw an exception
                  */
@@ -748,15 +747,11 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
      */
     public function getBoundModels() -> array
     {
-        var modelBinder;
-
-        let modelBinder = this->modelBinder;
-
-        if modelBinder == null {
+        if this->modelBinder === null {
             return [];
         }
 
-        return modelBinder->getBoundModels();
+        return this->modelBinder->getBoundModels();
     }
 
     /**
@@ -817,7 +812,7 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
      */
     public function getParam(var param, filters = null, defaultValue = null) -> var
     {
-        var params, filter, paramValue, container;
+        var params, filter, paramValue;
 
         let params = this->params;
 
@@ -829,16 +824,14 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
             return paramValue;
         }
 
-        let container = this->container;
-
-        if typeof container != "object" {
+        if this->container === null {
             this->{"throwDispatchException"}(
                 "A dependency injection container is required to access the 'filter' service",
                 PhalconException::EXCEPTION_NO_DI
             );
         }
 
-        let filter = <FilterInterface> container->getShared("filter");
+        let filter = <FilterInterface> this->container->getShared("filter");
 
         return filter->sanitize(paramValue, filters);
     }
@@ -999,7 +992,7 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
     {
         var container;
 
-        if typeof cache == "string" {
+        if typeof cache === "string" {
             let container = this->container;
 
             let cache = container->get(cache);
diff --git a/phalcon/Factory/AbstractConfigFactory.zep b/phalcon/Factory/AbstractConfigFactory.zep
index f6634e51e00..08842ff3a14 100644
--- a/phalcon/Factory/AbstractConfigFactory.zep
+++ b/phalcon/Factory/AbstractConfigFactory.zep
@@ -19,7 +19,7 @@ abstract class AbstractConfigFactory
      */
     protected function checkConfig(var config) -> array
     {
-        if typeof config == "object" && config instanceof ConfigInterface {
+        if config instanceof ConfigInterface {
             let config = config->toArray();
         }
 
diff --git a/phalcon/Filter/Validation.zep b/phalcon/Filter/Validation.zep
index 5028f34d03c..ac21aaccf9f 100644
--- a/phalcon/Filter/Validation.zep
+++ b/phalcon/Filter/Validation.zep
@@ -109,7 +109,7 @@ class Validation extends Injectable implements ValidationInterface
     {
         var singleField;
 
-        if typeof field == "array" {
+        if typeof field === "array" {
             // Uniqueness validator for combination of fields is handled differently
             if validator instanceof AbstractCombinedFieldsValidator {
                 let this->combinedFieldsValidators[] = [field, validator];
@@ -345,10 +345,10 @@ class Validation extends Injectable implements ValidationInterface
             if fieldFilters {
                 let container = this->getDI();
 
-                if typeof container != "object" {
+                if container === null {
                     let container = Di::getDefault();
 
-                    if unlikely typeof container != "object" {
+                    if container === null {
                         throw new Exception(
                             "A dependency injection container is required to access the 'filter' service"
                         );
diff --git a/phalcon/Http/Cookie.zep b/phalcon/Http/Cookie.zep
index 2009e2d660b..67b3ed51083 100644
--- a/phalcon/Http/Cookie.zep
+++ b/phalcon/Http/Cookie.zep
@@ -259,7 +259,7 @@ class Cookie extends AbstractInjectionAware implements CookieInterface
             if this->useEncryption {
                 let container = <DiInterface> this->container;
 
-                if unlikely typeof container != "object" {
+                if container === null {
                     throw new Exception(
                         "A dependency injection container is required to access the 'filter' and 'crypt' services"
                     );
@@ -308,7 +308,7 @@ class Cookie extends AbstractInjectionAware implements CookieInterface
                     if container === null {
                         let container = <DiInterface> this->container;
 
-                        if unlikely typeof container != "object" {
+                        if container === null {
                             throw new Exception(
                                 "A dependency injection container is required to access the 'filter' service"
                             );
@@ -456,7 +456,7 @@ class Cookie extends AbstractInjectionAware implements CookieInterface
         }
 
         if this->useEncryption && !empty value {
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the 'filter' service"
                 );
@@ -464,7 +464,7 @@ class Cookie extends AbstractInjectionAware implements CookieInterface
 
             let crypt = <CryptInterface> container->getShared("crypt");
 
-            if unlikely typeof crypt != "object" {
+            if unlikely typeof crypt !== "object" {
                 throw new Exception(
                     "A dependency which implements CryptInterface is required to use encryption"
                 );
diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep
index 7181eac9a12..cbed5d1cac9 100644
--- a/phalcon/Http/Request.zep
+++ b/phalcon/Http/Request.zep
@@ -1403,18 +1403,18 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
         var value;
         int numberFiles = 0;
 
-        if typeof data != "array" {
+        if typeof data !== "array" {
             return 1;
         }
 
         for value in data {
-            if typeof value != "array" {
+            if typeof value !== "array" {
                 if !value || !onlySuccessful {
                     let numberFiles++;
                 }
             }
 
-            if typeof value == "array" {
+            if typeof value === "array" {
                 let numberFiles += this->hasFileHelper(value, onlySuccessful);
             }
         }
@@ -1479,8 +1479,8 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
             server    = this->getServerArray();
 
         // TODO: Make Request implements EventsAwareInterface for v4.0.0
-        if typeof container === "object" {
-            let hasEventsManager = (bool) container->has("eventsManager");
+        if container !== null {
+            let hasEventsManager = container->has("eventsManager");
 
             if hasEventsManager {
                 let eventsManager = <ManagerInterface> container->getShared("eventsManager");
@@ -1572,7 +1572,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
         for idx, name in names {
             let p = prefix . "." . idx;
 
-            if typeof name == "string" {
+            if typeof name === "string" {
                 let files[] = [
                     "name":     name,
                     "type":     types[idx],
@@ -1583,7 +1583,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
                 ];
             }
 
-            if typeof name == "array" {
+            if typeof name === "array" {
                 let parentFiles = this->smoothFiles(
                     names[idx],
                     types[idx],
@@ -1614,7 +1614,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
         if typeof filterService != "object" {
             let container = <DiInterface> this->container;
 
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the 'filter' service"
                 );
@@ -1631,8 +1631,8 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
     {
         if _SERVER {
             return _SERVER;
-        } else {
-            return [];
         }
+
+        return [];
     }
 }
diff --git a/phalcon/Http/Response.zep b/phalcon/Http/Response.zep
index b66a90f99d9..2ee5d09c845 100644
--- a/phalcon/Http/Response.zep
+++ b/phalcon/Http/Response.zep
@@ -138,10 +138,10 @@ class Response implements ResponseInterface, InjectionAwareInterface, EventsAwar
 
         let container = <DiInterface> this->container;
 
-        if typeof container != "object" {
+        if container === null {
             let container = Di::getDefault();
 
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the 'url' service"
                 );
diff --git a/phalcon/Http/Response/Cookies.zep b/phalcon/Http/Response/Cookies.zep
index be17f22ddd7..07c53bc0589 100644
--- a/phalcon/Http/Response/Cookies.zep
+++ b/phalcon/Http/Response/Cookies.zep
@@ -305,7 +305,7 @@ class Cookies extends AbstractInjectionAware implements CookiesInterface
         if this->registered === false {
             let container = this->container;
 
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the 'response' service"
                 );
diff --git a/phalcon/Messages/Messages.zep b/phalcon/Messages/Messages.zep
index bb8e2ee3cac..7168dc4a9e2 100644
--- a/phalcon/Messages/Messages.zep
+++ b/phalcon/Messages/Messages.zep
@@ -65,7 +65,7 @@ class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable
     {
         var currentMessages, finalMessages, message;
 
-        if typeof messages != "array" && typeof messages != "object" {
+        if typeof messages !== "array" && typeof messages !== "object" {
             throw new Exception("The messages must be iterable");
         }
 
diff --git a/phalcon/Mvc/Application.zep b/phalcon/Mvc/Application.zep
index 83aac9654f1..90659fd0b46 100644
--- a/phalcon/Mvc/Application.zep
+++ b/phalcon/Mvc/Application.zep
@@ -123,7 +123,7 @@ class Application extends AbstractApplication
          */
         let matchedRoute = router->getMatchedRoute();
 
-        if typeof matchedRoute == "object" {
+        if typeof matchedRoute === "object" {
             let match = matchedRoute->getMatch();
 
             if match !== null {
@@ -142,7 +142,7 @@ class Application extends AbstractApplication
                 /**
                  * If the returned value is a string return it as body
                  */
-                if typeof possibleResponse == "string" {
+                if typeof possibleResponse === "string" {
                     let response = <ResponseInterface> container->getShared("response");
 
                     response->setContent(possibleResponse);
@@ -154,7 +154,7 @@ class Application extends AbstractApplication
                  * If the returned string is a ResponseInterface use it as
                  * response
                  */
-                if typeof possibleResponse == "object" && possibleResponse instanceof ResponseInterface {
+                if possibleResponse instanceof ResponseInterface {
                     possibleResponse->sendHeaders();
                     possibleResponse->sendCookies();
 
@@ -178,7 +178,7 @@ class Application extends AbstractApplication
          * Process the module definition
          */
         if moduleName {
-            if typeof eventsManager == "object" {
+            if typeof eventsManager === "object" {
                 if eventsManager->fire("application:beforeStartModule", this, moduleName) === false {
                     return false;
                 }
@@ -192,7 +192,7 @@ class Application extends AbstractApplication
             /**
              * A module definition must ne an array or an object
              */
-            if unlikely (typeof module != "array" && typeof module != "object") {
+            if unlikely (typeof module !== "array" && typeof module !== "object") {
                 throw new Exception("Invalid module definition");
             }
 
@@ -200,7 +200,7 @@ class Application extends AbstractApplication
              * An array module definition contains a path to a module definition
              * class
              */
-            if typeof module == "array" {
+            if typeof module === "array" {
                 /**
                  * Class name used to load the module definition
                  */
@@ -250,7 +250,7 @@ class Application extends AbstractApplication
             /**
              * Calling afterStartModule event
              */
-            if typeof eventsManager == "object" {
+            if typeof eventsManager === "object" {
                 eventsManager->fire("application:afterStartModule", this, moduleObject);
             }
         }
@@ -311,7 +311,7 @@ class Application extends AbstractApplication
             /**
              * Returning a string makes use it as the body of the response
              */
-            if typeof possibleResponse == "string" {
+            if typeof possibleResponse === "string" {
                 let response = <ResponseInterface> container->getShared("response");
 
                 response->setContent(possibleResponse);
@@ -324,7 +324,7 @@ class Application extends AbstractApplication
                 /**
                  * Calling afterHandleRequest
                  */
-                if typeof eventsManager == "object" {
+                if typeof eventsManager === "object" {
                     eventsManager->fire("application:afterHandleRequest", this, controller);
                 }
 
@@ -333,7 +333,7 @@ class Application extends AbstractApplication
                  * in auto-rendering mode
                  */
                 if returnedResponse === false && implicitView === true {
-                    if typeof controller == "object" {
+                    if typeof controller === "object" {
                         let renderStatus = true;
 
                         /**
@@ -393,14 +393,14 @@ class Application extends AbstractApplication
         /**
          * Calling beforeSendResponse
          */
-        if typeof eventsManager == "object" {
+        if typeof eventsManager === "object" {
             eventsManager->fire("application:beforeSendResponse", this, response);
         }
 
         /**
          * Check whether send headers or not (by default yes)
          */
-        if this->sendHeaders  {
+        if this->sendHeaders {
             response->sendHeaders();
         }
 
diff --git a/phalcon/Mvc/Dispatcher.zep b/phalcon/Mvc/Dispatcher.zep
index 8ce8366eb0b..64c1caf2096 100644
--- a/phalcon/Mvc/Dispatcher.zep
+++ b/phalcon/Mvc/Dispatcher.zep
@@ -221,7 +221,7 @@ class Dispatcher extends BaseDispatcher implements DispatcherInterface
 
         let container = this->container;
 
-        if unlikely typeof container != "object" {
+        if container === null {
             throw new Exception(
                 "A dependency injection container is required to access the 'response' service",
                 Exception::EXCEPTION_NO_DI
diff --git a/phalcon/Mvc/Micro.zep b/phalcon/Mvc/Micro.zep
index abacd7de081..ef2c2f0e23d 100644
--- a/phalcon/Mvc/Micro.zep
+++ b/phalcon/Mvc/Micro.zep
@@ -330,30 +330,21 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
      */
     public function getRouter() -> <RouterInterface>
     {
-        var router;
-
-        let router = this->router;
-
-        if typeof router != "object" {
-            let router = this->getSharedService("router");
+        if this->router === null {
+            let this->router = this->getSharedService("router");
 
             /**
              * Clear the set routes if any
              */
-            router->clear();
+            this->router->clear();
 
             /**
              * Automatically remove extra slashes
              */
-            router->removeExtraSlashes(true);
-
-            /**
-             * Update the internal router
-             */
-            let this->router = router;
+            this->router->removeExtraSlashes(true);
         }
 
-        return router;
+        return this->router;
     }
 
     /**
@@ -363,17 +354,11 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
      */
     public function getService(string! serviceName)
     {
-        var container;
-
-        let container = this->container;
-
-        if typeof container != "object" {
-            let container = new FactoryDefault();
-
-            let this->container = container;
+        if this->container === null {
+            let this->container = new FactoryDefault();
         }
 
-        return container->get(serviceName);
+        return this->container->get(serviceName);
     }
 
     /**
@@ -383,17 +368,11 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
      */
     public function getSharedService(string! serviceName)
     {
-        var container;
-
-        let container = this->container;
-
-        if typeof container != "object" {
-            let container = new FactoryDefault();
-
-            let this->container = container;
+        if this->container === null {
+            let this->container = new FactoryDefault();
         }
 
-        return container->getShared(serviceName);
+        return this->container->getShared(serviceName);
     }
 
     /**
@@ -405,7 +384,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
     public function handle(string! uri)
     {
         var container, status = null, router, matchedRoute,
-            handler, beforeHandlers, params, returnedValue, e, errorHandler,
+            handler, beforeHandlers, params, returnedValue, e,
             afterHandlers, notFoundHandler, finishHandlers, finish, before,
             after, response, modelBinder, routeName, realHandler = null,
             methodName, lazyReturned, afterBindingHandlers, afterBinding;
@@ -413,7 +392,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
 
         let container = this->container;
 
-        if unlikely typeof container != "object" {
+        if container === null {
             throw new Exception(
                 "A dependency injection container is required to access micro services"
             );
@@ -446,7 +425,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
              */
             let matchedRoute = router->getMatchedRoute();
 
-            if typeof matchedRoute == "object" {
+            if matchedRoute !== null {
                 if unlikely !fetch handler, this->handlers[matchedRoute->getRouteId()] {
                     throw new Exception(
                         "Matched route doesn't have an associated handler"
@@ -470,14 +449,13 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                 }
 
                 let beforeHandlers = this->beforeHandlers;
-
                 let this->stopped = false;
 
                 /**
                  * Calls the before handlers
                  */
                 for before in beforeHandlers {
-                    if typeof before == "object" && before instanceof MiddlewareInterface {
+                    if before instanceof MiddlewareInterface {
                         /**
                          * Call the middleware
                          */
@@ -533,7 +511,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                 /**
                  * Calling the Handler in the PHP userland
                  */
-                if typeof handler == "array" {
+                if typeof handler === "array" {
                     let realHandler = handler[0];
 
                     if realHandler instanceof Controller && modelBinder != null {
@@ -691,7 +669,6 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
             }
 
             let finishHandlers = this->finishHandlers;
-
             let this->stopped = false;
 
             /**
@@ -701,7 +678,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                 /**
                  * Try to execute middleware as plugins
                  */
-                if typeof finish == "object" && finish instanceof MiddlewareInterface {
+                if finish instanceof MiddlewareInterface {
                     /**
                      * Call the middleware
                      */
@@ -744,10 +721,8 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
             /**
              * Check if an errorhandler is defined and it's callable
              */
-            let errorHandler = this->errorHandler;
-
-            if errorHandler {
-                if unlikely !is_callable(errorHandler) {
+            if this->errorHandler !== null {
+                if unlikely !is_callable(this->errorHandler) {
                     throw new Exception("Error handler is not callable");
                 }
 
@@ -755,11 +730,11 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                  * Call the Error handler
                  */
                 let returnedValue = call_user_func_array(
-                    errorHandler,
+                    this->errorHandler,
                     [e]
                 );
 
-                if typeof returnedValue == "object" {
+                if typeof returnedValue === "object" {
                     if !(returnedValue instanceof ResponseInterface) {
                         throw e;
                     }
@@ -792,7 +767,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
              * Check if the returned value is a string and take it as response
              * body
              */
-            if typeof returnedValue == "string" {
+            if typeof returnedValue === "string" {
                 let response = <ResponseInterface> container->getShared("response");
 
                 if !response->isSent() {
@@ -804,10 +779,8 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
             /**
              * Check if the returned object is already a response
              */
-            if typeof returnedValue == "object" && returnedValue instanceof ResponseInterface {
-                if !returnedValue->isSent() {
-                    returnedValue->send();
-                }
+            if returnedValue instanceof ResponseInterface && !returnedValue->isSent() {
+                returnedValue->send();
             }
         }
 
@@ -819,17 +792,11 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
      */
     public function hasService(string! serviceName) -> bool
     {
-        var container;
-
-        let container = this->container;
-
-        if typeof container != "object" {
-            let container = new FactoryDefault();
-
-            let this->container = container;
+        if this->container === null {
+            let this->container = new FactoryDefault();
         }
 
-        return container->has(serviceName);
+        return this->container->has(serviceName);
     }
 
     /**
@@ -930,7 +897,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
         let prefix = collection->getPrefix();
 
         for handler in handlers {
-            if unlikely typeof handler != "array" {
+            if unlikely typeof handler !== "array" {
                 throw new Exception(
                     "One of the registered handlers is invalid"
                 );
@@ -947,7 +914,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
             let realHandler = [lazyHandler, subHandler];
 
             if !empty prefix {
-                if pattern == "/" {
+                if pattern === "/" {
                     let prefixedPattern = prefix;
                 } else {
                     let prefixedPattern = prefix . pattern;
@@ -961,11 +928,11 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
              */
             let route = this->map(prefixedPattern, realHandler);
 
-            if (typeof methods == "string" && methods != "") || typeof methods == "array" {
+            if (typeof methods === "string" && methods !== "") || typeof methods === "array" {
                 route->via(methods);
             }
 
-            if typeof name == "string" {
+            if typeof name === "string" {
                 route->setName(name);
             }
         }
@@ -1199,7 +1166,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
      */
     public function setModelBinder(<BinderInterface> modelBinder, var cache = null) -> <Micro>
     {
-        if typeof cache == "string" {
+        if typeof cache === "string" {
             let cache = this->getService(cache);
         }
 
@@ -1230,24 +1197,18 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
      */
     public function setService(string! serviceName, var definition, bool shared = false) -> <ServiceInterface>
     {
-        var container;
-
-        let container = this->container;
-
-        if typeof container != "object" {
-            let container = new FactoryDefault();
-
-            let this->container = container;
+        if this->container === null {
+            let this->container = new FactoryDefault();
         }
 
-        return container->set(serviceName, definition, shared);
+        return this->container->set(serviceName, definition, shared);
     }
 
     /**
      * Stops the middleware execution avoiding than other middlewares be
      * executed
      */
-    public function stop()
+    public function stop() -> void
     {
         let this->stopped = true;
     }
diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index 408f6285a93..c182c9a2b24 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -418,7 +418,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Values are probably relationships if they are objects
          */
-        if typeof value == "object" && value instanceof ModelInterface {
+        if value instanceof ModelInterface {
             let lowerProperty = strtolower(property),
                 modelName     = get_class(this),
                 manager       = this->getModelsManager(),
@@ -427,7 +427,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                     lowerProperty
                 );
 
-            if typeof relation == "object" {
+            if typeof relation === "object" {
                 let dirtyState = this->dirtyState;
 
                 if (value->getDirtyState() != dirtyState) {
@@ -446,7 +446,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Check if the value is an array
          */
-        elseif typeof value == "array" {
+        elseif typeof value === "array" {
             let lowerProperty = strtolower(property),
                 modelName = get_class(this),
                 manager   = this->getModelsManager(),
@@ -455,7 +455,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                     lowerProperty
                 );
 
-            if typeof relation == "object" {
+            if typeof relation === "object" {
                 switch relation->getType() {
                     case Relation::BELONGS_TO:
                     case Relation::HAS_ONE:
@@ -466,7 +466,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                             relation->getReferencedModel()
                         );
 
-                        if typeof referencedModel == "object" {
+                        if typeof referencedModel === "object" {
                             referencedModel->assign(value);
 
                             unset this->related[lowerProperty];
@@ -484,7 +484,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                         let related = [];
 
                         for item in value {
-                            if typeof item == "object" {
+                            if typeof item === "object" {
                                 if item instanceof ModelInterface {
                                     let related[] = item;
                                 }
@@ -739,7 +739,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         let disableAssignSetters = globals_get("orm.disable_assign_setters");
 
         // apply column map for data, if exist
-        if typeof dataColumnMap == "array" {
+        if typeof dataColumnMap === "array" {
             let dataMapped = [];
 
             for key, value in data {
@@ -751,7 +751,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             let dataMapped = data;
         }
 
-        if count(dataMapped) == 0 {
+        if count(dataMapped) === 0 {
             return this;
         }
 
@@ -773,7 +773,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             }
 
             // Check if we need to rename the field
-            if typeof columnMap == "array" {
+            if typeof columnMap === "array" {
                 if !fetch attributeField, columnMap[attribute] {
                     if unlikely !globals_get("orm.ignore_unknown_columns") {
                         throw new Exception(
@@ -845,7 +845,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         let result = self::groupResult("AVG", "average", parameters);
 
-        if typeof result == "string" {
+        if typeof result === "string" {
             return (float) result;
         }
 
@@ -881,7 +881,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         instance->setDirtyState(dirtyState);
 
         for key, value in data {
-            if unlikely typeof key != "string" {
+            if unlikely typeof key !== "string" {
                 throw new Exception(
                     "Invalid key in array data provided to dumpResult()"
                 );
@@ -938,7 +938,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 continue;
             }
 
-            if typeof columnMap != "array" {
+            if typeof columnMap !== "array" {
                 let instance->{key} = value;
 
                 continue;
@@ -970,7 +970,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 }
             }
 
-            if typeof attribute != "array" {
+            if typeof attribute !== "array" {
                 let instance->{attribute} = value;
 
                 continue;
@@ -1061,7 +1061,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
          * If there is no column map and the hydration mode is arrays return the
          * data as it is
          */
-        if typeof columnMap != "array" {
+        if typeof columnMap !== "array" {
             if hydrationMode == Resultset::HYDRATE_ARRAYS {
                 return data;
             }
@@ -1073,11 +1073,11 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         let hydrateArray = [];
 
         for key, value in data {
-            if typeof key != "string" {
+            if typeof key !== "string" {
                 continue;
             }
 
-            if typeof columnMap == "array" {
+            if typeof columnMap === "array" {
                 // Try to find case-insensitive key variant
                 if !isset columnMap[key] && globals_get("orm.case_insensitive_column_map") {
                     let key = self::caseInsensitiveColumnMap(columnMap, key);
@@ -1099,7 +1099,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 /**
                  * Attribute can store info about his type
                  */
-                if typeof attribute == "array" {
+                if typeof attribute === "array" {
                     let attributeName = attribute[0];
                 } else {
                     let attributeName = attribute;
@@ -1144,7 +1144,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 continue;
             }
 
-            if typeof record != "object" || !(record instanceof ModelInterface) {
+            if !(record instanceof ModelInterface) {
                 continue;
             }
 
@@ -1182,7 +1182,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         let result = self::groupResult("COUNT", "rowcount", parameters);
 
-        if typeof result == "string" {
+        if typeof result === "string" {
             return (int) result;
         }
 
@@ -1610,7 +1610,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
     {
         var params, query, resultset, hydration;
 
-        if typeof parameters != "array" {
+        if typeof parameters !== "array" {
             let params = [];
 
             if parameters !== null {
@@ -1630,7 +1630,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Define an hydration mode
          */
-        if typeof resultset == "object" {
+        if typeof resultset === "object" {
             if fetch hydration, params["hydration"] {
                 resultset->setHydrateMode(hydration);
             }
@@ -1821,7 +1821,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         let snapshot = this->snapshot;
 
-        if unlikely typeof snapshot != "array" {
+        if unlikely typeof snapshot !== "array" {
             throw new Exception(
                 "The 'keepSnapshots' option must be enabled to track changes"
             );
@@ -1840,7 +1840,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Data types are field indexed
          */
-        if typeof columnMap != "array" {
+        if typeof columnMap !== "array" {
             let allAttributes = metaData->getDataTypes(this);
         } else {
             let allAttributes = columnMap;
@@ -1930,7 +1930,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         var message;
         array filtered;
 
-        if typeof filter == "string" && !empty filter {
+        if typeof filter === "string" && !empty filter {
             let filtered = [];
 
             for message in this->errorMessages {
@@ -1962,7 +1962,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         let metaData = this->modelsMetaData;
 
-        if typeof metaData != "object" {
+        if metaData === null {
             let container = <DiInterface> this->container;
 
             /**
@@ -2007,12 +2007,8 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
      */
     final public function getReadConnection() -> <AdapterInterface>
     {
-        var transaction;
-
-        let transaction = <TransactionInterface> this->transaction;
-
-        if typeof transaction == "object" {
-            return transaction->getConnection();
+        if this->transaction !== null {
+            return this->transaction->getConnection();
         }
 
         return (<ManagerInterface> this->modelsManager)->getReadConnection(this);
@@ -2049,7 +2045,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             lowerAlias
         );
 
-        if unlikely typeof relation != "object" {
+        if unlikely typeof relation !== "object" {
             throw new Exception(
                 "There is no defined relations for the model '" . className . "' using alias '" . alias . "'"
             );
@@ -2214,12 +2210,8 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
      */
     final public function getWriteConnection() -> <AdapterInterface>
     {
-        var transaction;
-
-        let transaction = <TransactionInterface> this->transaction;
-
-        if typeof transaction == "object" {
-            return transaction->getConnection();
+        if this->transaction !== null {
+            return this->transaction->getConnection();
         }
 
         return (<ManagerInterface> this->modelsManager)->getWriteConnection(this);
@@ -2266,11 +2258,11 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * If a field was specified we only check it
          */
-        if typeof fieldName == "string" {
+        if typeof fieldName === "string" {
             return in_array(fieldName, changedFields);
         }
 
-        if typeof fieldName == "array" {
+        if typeof fieldName === "array" {
             let intersect = array_intersect(fieldName, changedFields);
 
             if allFields {
@@ -2532,7 +2524,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
          * Get a column map if any
          * Assign the resulting array to the this object
          */
-        if typeof row == "array" {
+        if typeof row === "array" {
             let columnMap = metaData->getColumnMap(this);
 
             this->assign(row, null, columnMap);
@@ -2768,7 +2760,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         let attributes = unserialize(data);
 
-        if typeof attributes == "array" {
+        if typeof attributes === "array" {
             if !isset attributes["attributes"] {
                 let attributes = [
                     "attributes": attributes
@@ -2779,8 +2771,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
              * Obtain the default DI
              */
             let container = Di::getDefault();
-
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the services related to the ODM"
                 );
@@ -2796,7 +2787,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
              */
             let manager = <ManagerInterface> container->getShared("modelsManager");
 
-            if unlikely typeof manager != "object" {
+            if unlikely typeof manager !== "object" {
                 throw new Exception(
                     "The injected service 'modelsManager' is not valid"
                 );
@@ -2902,14 +2893,14 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Build the snapshot based on a column map
          */
-        if typeof columnMap == "array" {
+        if typeof columnMap === "array" {
             let snapshot = [];
 
             for key, value in data {
                 /**
                  * Use only strings
                  */
-                if typeof key != "string" {
+                if typeof key !== "string" {
                     continue;
                 }
 
@@ -2926,7 +2917,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                     continue;
                 }
 
-                if typeof attribute == "array" {
+                if typeof attribute === "array" {
                     if !fetch attribute, attribute[0] {
                         if unlikely !globals_get("orm.ignore_unknown_columns") {
                             throw new Exception(
@@ -2962,7 +2953,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Build the snapshot based on a column map
          */
-        if typeof columnMap == "array" {
+        if typeof columnMap === "array" {
             let snapshot = [];
 
             for key, value in data {
@@ -3247,7 +3238,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             /**
              * Check if the columns must be renamed
              */
-            if typeof columnMap == "array" {
+            if typeof columnMap === "array" {
                 // Try to find case-insensitive key variant
                 if !isset columnMap[attribute] && globals_get("orm.case_insensitive_column_map") {
                     let attribute = self::caseInsensitiveColumnMap(
@@ -3269,7 +3260,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 let attributeField = attribute;
             }
 
-            if typeof columns == "array" {
+            if typeof columns === "array" {
                 if !in_array(attributeField, columns) {
                     continue;
                 }
@@ -3412,7 +3403,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 fields = relation->getFields(),
                 referencedFields = relation->getReferencedFields();
 
-            if typeof fields == "array" {
+            if typeof fields === "array" {
                 /**
                  * Create a compound condition
                  */
@@ -3613,7 +3604,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             /**
              * Try to find a different action in the foreign key's options
              */
-            if typeof foreignKey == "array" && isset foreignKey["action"] {
+            if typeof foreignKey === "array" && isset foreignKey["action"] {
                 let action = (int) foreignKey["action"];
             }
 
@@ -3707,7 +3698,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             /**
              * Check if the model has a column map
              */
-            if typeof columnMap == "array" {
+            if typeof columnMap === "array" {
                 if unlikely !fetch attributeField, columnMap[field] {
                     throw new Exception(
                         "Column '" . field . "' isn't part of the column map"
@@ -3941,7 +3932,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             snapshot         = this->snapshot;
 
         if useDynamicUpdate {
-            if typeof snapshot != "array" {
+            if typeof snapshot !== "array" {
                 let useDynamicUpdate = false;
             }
         }
@@ -3965,7 +3956,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             /**
              * Check if the model has a column map
              */
-            if typeof columnMap == "array" {
+            if typeof columnMap === "array" {
                 if unlikely !fetch attributeField, columnMap[field] {
                     if unlikely !globals_get("orm.ignore_unknown_columns") {
                         throw new Exception(
@@ -4109,7 +4100,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * When unique params is null we need to rebuild the bind params
          */
-        if typeof uniqueParams != "array" {
+        if typeof uniqueParams !== "array" {
             let primaryKeys = metaData->getPrimaryKeyAttributes(this);
 
             /**
@@ -4230,7 +4221,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
              * We need to create a primary key based on the current data
              */
             for field in primaryKeys {
-                if typeof columnMap == "array" {
+                if typeof columnMap === "array" {
                     if unlikely !fetch attributeField, columnMap[field] {
                         throw new Exception(
                             "Column '" . field . "' isn't part of the column map"
@@ -4375,7 +4366,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
              * Return if the relation was not found because getRelated()
              * throws an exception if the relation is unknown
              */
-            if typeof relation != "object" {
+            if typeof relation !== "object" {
                 return false;
             }
 
@@ -4396,7 +4387,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
             /**
              * If the relation was found perform the query via the models manager
              */
-            if typeof relation != "object" {
+            if typeof relation !== "object" {
                 return false;
             }
 
@@ -4570,7 +4561,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
          */
         let attributes = metaData->getReverseColumnMap(model);
 
-        if typeof attributes != "array" {
+        if typeof attributes !== "array" {
             let attributes = metaData->getDataTypes(model);
         }
 
@@ -4720,7 +4711,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         if globals_get("orm.not_null_validations") {
             let notNull = metaData->getNotNullAttributes(this);
 
-            if typeof notNull == "array" {
+            if typeof notNull === "array" {
                 /**
                  * Gets the fields that are numeric, these are validated in a
                  * different way
@@ -4752,7 +4743,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 let error = false;
 
                 for field in notNull {
-                    if typeof columnMap == "array" {
+                    if typeof columnMap === "array" {
                         if unlikely !fetch attributeField, columnMap[field] {
                             if unlikely !globals_get("orm.ignore_unknown_columns") {
                                 throw new Exception(
@@ -4780,7 +4771,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                              * Objects are never treated as null, numeric fields
                              * must be numeric to be accepted as not null
                              */
-                            if typeof value != "object" {
+                            if typeof value !== "object" {
                                 if !isset dataTypeNumeric[field] {
                                     if isset emptyStringValues[field] {
                                         if value === null {
@@ -4939,7 +4930,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 name
             );
 
-            if typeof relation == "object" {
+            if typeof relation === "object" {
                 /**
                  * Get the relation type
                  */
@@ -4949,7 +4940,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                  * Only belongsTo are stored before save the master record
                  */
                 if type == Relation::BELONGS_TO {
-                    if unlikely typeof record != "object" {
+                    if unlikely typeof record !== "object" {
                         connection->rollback(nesting);
 
                         throw new Exception(
@@ -4963,7 +4954,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 //                        referencedModel = relation->getReferencedModel(),
 //                        referencedFields = relation->getReferencedFields();
 
-                    if unlikely typeof columns == "array" {
+                    if unlikely typeof columns === "array" {
                         connection->rollback(nesting);
 
                         throw new Exception("Not implemented");
@@ -5062,7 +5053,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 name
             );
 
-            if typeof relation == "object" {
+            if typeof relation === "object" {
                 /**
                  * Discard belongsTo relations
                  */
@@ -5070,7 +5061,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                     continue;
                 }
 
-                if unlikely (typeof record != "object" && typeof record != "array") {
+                if unlikely (typeof record !== "object" && typeof record !== "array") {
                     connection->rollback(nesting);
 
                     throw new Exception(
@@ -5082,7 +5073,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                     referencedModel = relation->getReferencedModel(),
                     referencedFields = relation->getReferencedFields();
 
-                if unlikely typeof columns == "array" {
+                if unlikely typeof columns === "array" {
                     connection->rollback(nesting);
 
                     throw new Exception("Not implemented");
@@ -5091,7 +5082,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 /**
                  * Create an implicit array for has-many/has-one records
                  */
-                if typeof record == "object" {
+                if typeof record === "object" {
                     let relatedRecords = [record];
                 } else {
                     let relatedRecords = record;
@@ -5144,7 +5135,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                             /**
                              * Set the related model
                              */
-                            if typeof message == "object" {
+                            if typeof message === "object" {
                                 message->setMetaData(
                                     [
                                         "model": recordAfter
@@ -5175,8 +5166,8 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                         );
 
                         /**
-                         *  Has-one-through relations can only use one intermediate model.
-                         *  If it already exist, it can be updated with the new referenced key.
+                         * Has-one-through relations can only use one intermediate model.
+                         * If it already exist, it can be updated with the new referenced key.
                          */
                         if relation->getType() == Relation::HAS_ONE_THROUGH {
                             let existingIntermediateModel = intermediateModel->findFirst(
@@ -5225,7 +5216,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                                 /**
                                  * Set the related model
                                  */
-                                if typeof message == "object" {
+                                if typeof message === "object" {
                                     message->setMetaData(
                                         [
                                             "model": intermediateModel
@@ -5249,7 +5240,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                     }
                 }
             } else {
-                if unlikely typeof record != "array" {
+                if unlikely typeof record !== "array" {
                     connection->rollback(nesting);
 
                     throw new Exception(
@@ -5857,7 +5848,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         // Call the validation, if it returns not the bool
         // we append the messages to the current object
-        if typeof messages == "boolean" {
+        if typeof messages === "boolean" {
             return messages;
         }
 
@@ -5927,5 +5918,4 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
 
         return key;
     }
-
 }
diff --git a/phalcon/Mvc/Router.zep b/phalcon/Mvc/Router.zep
index f883c296f0b..a17d14d5efb 100644
--- a/phalcon/Mvc/Router.zep
+++ b/phalcon/Mvc/Router.zep
@@ -162,7 +162,6 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
              * Two routes are added by default to match /:controller/:action and
              * /:controller/:action/:params
              */
-
             let routes[] = new Route(
                 "#^/([\\w0-9\\_\\-]+)[/]{0,1}$#u",
                 [
@@ -692,7 +691,7 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
         /**
          * Remove extra slashes in the route
          */
-        if this->removeExtraSlashes && uri != "/" {
+        if this->removeExtraSlashes && uri !== "/" {
             let handledUri = rtrim(uri, "/");
         } else {
             let handledUri = uri;
@@ -713,7 +712,7 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
 
         let eventsManager = this->eventsManager;
 
-        if typeof eventsManager == "object" {
+        if eventsManager !== null {
             eventsManager->fire("router:beforeCheckRoutes", this);
         }
 
@@ -728,15 +727,13 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
              * Look for HTTP method constraints
              */
             let methods = route->getHttpMethods();
-
             if methods !== null {
                 /**
                  * Retrieve the request service from the container
                  */
                 if request === null {
                     let container = <DiInterface> this->container;
-
-                    if unlikely typeof container != "object" {
+                    if container === null {
                         throw new Exception(
                             "A dependency injection container is required to access the 'request' service"
                         );
@@ -757,15 +754,13 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
              * Look for hostname constraints
              */
             let hostname = route->getHostName();
-
             if hostname !== null {
                 /**
                  * Retrieve the request service from the container
                  */
                 if request === null {
                     let container = <DiInterface> this->container;
-
-                    if unlikely typeof container != "object" {
+                    if container === null {
                         throw new Exception(
                             "A dependency injection container is required to access the 'request' service"
                         );
@@ -839,7 +834,6 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
                 }
 
                 let beforeMatch = route->getBeforeMatch();
-
                 if beforeMatch !== null {
                     /**
                      * Check first if the callback is callable
@@ -1037,7 +1031,7 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
             }
         }
 
-        if typeof eventsManager == "object" {
+        if typeof eventsManager === "object" {
             eventsManager->fire("router:afterCheckRoutes", this);
         }
     }
@@ -1112,7 +1106,7 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      */
     public function notFound(var paths) -> <RouterInterface>
     {
-        if unlikely (typeof paths != "array" && typeof paths != "string") {
+        if unlikely (typeof paths !== "array" && typeof paths !== "string") {
             throw new Exception(
                 "The not-found paths must be an array or string"
             );
diff --git a/phalcon/Mvc/Url.zep b/phalcon/Mvc/Url.zep
index 09a8a069ef8..8b960ec4d6c 100644
--- a/phalcon/Mvc/Url.zep
+++ b/phalcon/Mvc/Url.zep
@@ -261,12 +261,8 @@ class Url extends AbstractInjectionAware implements UrlInterface
      */
     public function getStaticBaseUri() -> string
     {
-        var staticBaseUri;
-
-        let staticBaseUri = this->staticBaseUri;
-
-        if staticBaseUri !== null {
-            return staticBaseUri;
+        if this->staticBaseUri !== null {
+            return this->staticBaseUri;
         }
 
         return this->getBaseUri();
diff --git a/phalcon/Mvc/View.zep b/phalcon/Mvc/View.zep
index d302deb997f..109a40c958d 100644
--- a/phalcon/Mvc/View.zep
+++ b/phalcon/Mvc/View.zep
@@ -335,7 +335,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
             activeRenderPath = this->activeRenderPaths;
 
         if viewsDirsCount === 1 {
-            if typeof activeRenderPath == "array" && count(activeRenderPath) {
+            if typeof activeRenderPath === "array" && count(activeRenderPath) {
                 let activeRenderPath = activeRenderPath[0];
             }
         }
@@ -509,7 +509,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
         /**
          * Perform extra configurations over the cloned object
          */
-        if typeof configCallback == "object" {
+        if typeof configCallback === "object" {
             call_user_func_array(configCallback, [view]);
         }
 
@@ -631,7 +631,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
          * If the developer pass an array of variables we create a new virtual
          * symbol table
          */
-        if typeof params == "array" {
+        if typeof params === "array" {
             /**
              * Merge the new params as parameters
              */
@@ -661,7 +661,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
         /**
          * Now we need to restore the original view parameters
          */
-        if typeof params == "array" {
+        if typeof params === "array" {
             /**
              * Restore the original view params
              */
@@ -691,7 +691,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
     {
         var pickView, layout, parts;
 
-        if typeof renderView == "array" {
+        if typeof renderView === "array" {
             let pickView = renderView;
         } else {
             let layout = null;
@@ -909,7 +909,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
      */
     public function setTemplateAfter(var templateAfter) -> <View>
     {
-        if typeof templateAfter != "array" {
+        if typeof templateAfter !== "array" {
             let this->templatesAfter = [templateAfter];
         } else {
             let this->templatesAfter = templateAfter;
@@ -923,7 +923,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
      */
     public function setTemplateBefore(var templateBefore) -> <View>
     {
-        if typeof templateBefore != "array" {
+        if typeof templateBefore !== "array" {
             let this->templatesBefore = [templateBefore];
         } else {
             let this->templatesBefore = templateBefore;
@@ -976,7 +976,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
     {
         var position, directory, newViewsDir;
 
-        if typeof viewsDir != "string" && typeof viewsDir != "array" {
+        if typeof viewsDir !== "string" && typeof viewsDir !== "array" {
             throw new Exception("Views directory must be a string or an array");
         }
 
@@ -1077,7 +1077,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
                      * Call beforeRenderView if there is an events manager
                      * available
                      */
-                    if typeof eventsManager == "object" {
+                    if typeof eventsManager === "object" {
                         let this->activeRenderPaths = [viewEnginePath];
 
                         if eventsManager->fire("view:beforeRenderView", this, viewEnginePath) === false {
@@ -1087,7 +1087,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
 
                     engine->render(viewEnginePath, viewParams, mustClean);
 
-                    if typeof eventsManager == "object" {
+                    if typeof eventsManager === "object" {
                         eventsManager->fire("view:afterRenderView", this);
                     }
 
@@ -1101,7 +1101,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
         /**
          * Notify about not found views
          */
-        if typeof eventsManager == "object" {
+        if typeof eventsManager === "object" {
             let this->activeRenderPaths = viewEnginePaths;
 
             eventsManager->fire("view:notFoundView", this, viewEnginePath);
@@ -1119,7 +1119,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
      */
     final protected function isAbsolutePath(string path)
     {
-        if PHP_OS == "WINNT" {
+        if PHP_OS === "WINNT" {
             return strlen(path) >= 3 && path[1] == ':' && path[2] == '\\';
         }
 
@@ -1288,7 +1288,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
         /**
          * Call beforeRender if there is an events manager
          */
-        if fireEvents && typeof eventsManager == "object" {
+        if fireEvents && typeof eventsManager === "object" {
             if eventsManager->fire("view:beforeRender", this) === false {
                 return false;
             }
@@ -1405,7 +1405,7 @@ class View extends Injectable implements ViewInterface, EventsAwareInterface
         /**
          * Call afterRender event
          */
-        if fireEvents && typeof eventsManager == "object" {
+        if fireEvents && typeof eventsManager === "object" {
             eventsManager->fire("view:afterRender", this);
         }
 
diff --git a/phalcon/Mvc/View/Engine/Php.zep b/phalcon/Mvc/View/Engine/Php.zep
index 9e2601e9325..7165d6c08d6 100644
--- a/phalcon/Mvc/View/Engine/Php.zep
+++ b/phalcon/Mvc/View/Engine/Php.zep
@@ -29,7 +29,7 @@ class Php extends AbstractEngine
         /**
          * Create the variables in local symbol table
          */
-        if typeof params == "array" {
+        if typeof params === "array" {
             for key, value in params {
                 let {key} = value;
             }
diff --git a/phalcon/Mvc/View/Engine/Volt/Compiler.zep b/phalcon/Mvc/View/Engine/Volt/Compiler.zep
index 378bc8c1475..791e13c1a12 100644
--- a/phalcon/Mvc/View/Engine/Volt/Compiler.zep
+++ b/phalcon/Mvc/View/Engine/Volt/Compiler.zep
@@ -768,9 +768,7 @@ class Compiler implements InjectionAwareInterface
             forElse = null;
 
         let this->foreachLevel++;
-
         let prefix = this->getUniquePrefix();
-
         let level = this->foreachLevel;
 
         /**
@@ -782,14 +780,12 @@ class Compiler implements InjectionAwareInterface
          * Evaluate common expressions
          */
         let expr = statement["expr"];
-
         let exprCode = this->expression(expr);
 
         /**
          * Process the block statements
          */
         let blockStatements = statement["block_statements"];
-
         let forElse = false;
 
         if typeof blockStatements == "array" {
@@ -815,7 +811,6 @@ class Compiler implements InjectionAwareInterface
          * Process statements block
          */
         let code = this->statementList(blockStatements, extendsMode);
-
         let loopContext = this->loopPointers;
 
         /**
@@ -1072,9 +1067,7 @@ class Compiler implements InjectionAwareInterface
          * Register the macro
          */
         let this->macros[name] = name;
-
         let macroName = "$this->macros['" . name . "']";
-
         let code = "<?php ";
 
         if !fetch parameters, statement["parameters"] {
@@ -1326,7 +1319,7 @@ class Compiler implements InjectionAwareInterface
         let extensions = this->extensions;
 
         loop {
-            if typeof extensions == "array" {
+            if typeof extensions === "array" {
                 /**
                  * Notify the extensions about being resolving an expression
                  */
@@ -1335,7 +1328,7 @@ class Compiler implements InjectionAwareInterface
                     [expr]
                 );
 
-                if typeof exprCode == "string" {
+                if typeof exprCode === "string" {
                     break;
                 }
             }
diff --git a/phalcon/Mvc/ViewBaseInterface.zep b/phalcon/Mvc/ViewBaseInterface.zep
index b710dbb6e9c..8e10701f73c 100644
--- a/phalcon/Mvc/ViewBaseInterface.zep
+++ b/phalcon/Mvc/ViewBaseInterface.zep
@@ -59,5 +59,4 @@ interface ViewBaseInterface
      * slash or backslash
      */
     public function setViewsDir(string! viewsDir);
-
 }
diff --git a/phalcon/Tag.zep b/phalcon/Tag.zep
index e066e2d25fd..7b014949ec0 100644
--- a/phalcon/Tag.zep
+++ b/phalcon/Tag.zep
@@ -378,7 +378,7 @@ class Tag
 
         let di = self::container;
 
-        if typeof di != "object" {
+        if di === null {
             let di = Di::getDefault();
         }
 
@@ -397,7 +397,7 @@ class Tag
         if typeof escaper != "object" {
             let container = self::getDI();
 
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the 'escaper' service"
                 );
@@ -492,7 +492,7 @@ class Tag
         if typeof url != "object" {
             let container = self::getDI();
 
-            if unlikely typeof container != "object" {
+            if container === null {
                 throw new Exception(
                     "A dependency injection container is required to access the 'url' service"
                 );

From c945539571f19418f08d5f855ea8cbf69efd7bc0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 08:40:33 +0100
Subject: [PATCH 57/76] Fix Zephir code generation error

---
 phalcon/Dispatcher/AbstractDispatcher.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Dispatcher/AbstractDispatcher.zep b/phalcon/Dispatcher/AbstractDispatcher.zep
index c809708eec4..e756b6ae00a 100644
--- a/phalcon/Dispatcher/AbstractDispatcher.zep
+++ b/phalcon/Dispatcher/AbstractDispatcher.zep
@@ -276,7 +276,7 @@ abstract class AbstractDispatcher extends AbstractInjectionAware implements Disp
              * Handlers are retrieved as shared instances from the Service
              * Container
              */
-            let hasService = container->has(handlerClass);
+            let hasService = (bool) container->has(handlerClass);
             if !hasService {
                 /**
                  * DI doesn't have a service with that name, try to load it

From 30379b67ca66f791c4e60c5834288c93d3644705 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 11:28:24 +0100
Subject: [PATCH 58/76] Revert `instanceof` conditions

---
 phalcon/Acl/Adapter/Memory.zep            |  6 +++---
 phalcon/Config/Adapter/Grouped.zep        |  2 +-
 phalcon/Config/ConfigFactory.zep          |  2 +-
 phalcon/Factory/AbstractConfigFactory.zep |  2 +-
 phalcon/Mvc/Application.zep               |  2 +-
 phalcon/Mvc/Micro.zep                     | 16 ++++++++--------
 phalcon/Mvc/Model.zep                     |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/phalcon/Acl/Adapter/Memory.zep b/phalcon/Acl/Adapter/Memory.zep
index 44608cbe15d..ce2b0b861ef 100644
--- a/phalcon/Acl/Adapter/Memory.zep
+++ b/phalcon/Acl/Adapter/Memory.zep
@@ -209,7 +209,7 @@ class Memory extends AbstractAdapter
     {
         var componentName, componentObject;
 
-        if componentValue instanceof ComponentInterface {
+        if typeof componentValue === "object" && componentValue instanceof ComponentInterface {
             let componentObject = componentValue;
         } else {
             let componentObject = new Component(componentValue);
@@ -294,7 +294,7 @@ class Memory extends AbstractAdapter
          * inherits
          */
         for roleToInherit in roleToInheritList {
-            if roleToInherit instanceof RoleInterface {
+            if typeof roleToInherit === "object" && roleToInherit instanceof RoleInterface {
                 let roleInheritName = roleToInherit->getName();
             } else {
                 let roleInheritName = roleToInherit;
@@ -383,7 +383,7 @@ class Memory extends AbstractAdapter
     {
         var roleName, roleObject;
 
-        if role instanceof RoleInterface {
+        if typeof role === "object" && role instanceof RoleInterface {
             let roleObject = role;
         } elseif is_string(role) {
             let roleObject = new Role(role);
diff --git a/phalcon/Config/Adapter/Grouped.zep b/phalcon/Config/Adapter/Grouped.zep
index 886e586c52b..71cbbeb6432 100644
--- a/phalcon/Config/Adapter/Grouped.zep
+++ b/phalcon/Config/Adapter/Grouped.zep
@@ -82,7 +82,7 @@ class Grouped extends Config
             let configInstance = configName;
 
             // Set to default adapter if passed as string
-            if configName instanceof ConfigInterface {
+            if typeof configName === "object" && configName instanceof ConfigInterface {
                 this->merge(configInstance);
                 continue;
             } elseif typeof configName === "string" {
diff --git a/phalcon/Config/ConfigFactory.zep b/phalcon/Config/ConfigFactory.zep
index 5a56f95d880..bc9ccb62cfc 100644
--- a/phalcon/Config/ConfigFactory.zep
+++ b/phalcon/Config/ConfigFactory.zep
@@ -167,7 +167,7 @@ class ConfigFactory extends AbstractFactory
             ];
         }
 
-        if config instanceof ConfigInterface {
+        if typeof config === "object" && config instanceof ConfigInterface {
             let config = config->toArray();
         }
 
diff --git a/phalcon/Factory/AbstractConfigFactory.zep b/phalcon/Factory/AbstractConfigFactory.zep
index 08842ff3a14..1dc90bd9091 100644
--- a/phalcon/Factory/AbstractConfigFactory.zep
+++ b/phalcon/Factory/AbstractConfigFactory.zep
@@ -19,7 +19,7 @@ abstract class AbstractConfigFactory
      */
     protected function checkConfig(var config) -> array
     {
-        if config instanceof ConfigInterface {
+        if typeof config === "object" && config instanceof ConfigInterface {
             let config = config->toArray();
         }
 
diff --git a/phalcon/Mvc/Application.zep b/phalcon/Mvc/Application.zep
index 90659fd0b46..cbda3c6e842 100644
--- a/phalcon/Mvc/Application.zep
+++ b/phalcon/Mvc/Application.zep
@@ -154,7 +154,7 @@ class Application extends AbstractApplication
                  * If the returned string is a ResponseInterface use it as
                  * response
                  */
-                if possibleResponse instanceof ResponseInterface {
+                if typeof possibleResponse === "object" && possibleResponse instanceof ResponseInterface {
                     possibleResponse->sendHeaders();
                     possibleResponse->sendCookies();
 
diff --git a/phalcon/Mvc/Micro.zep b/phalcon/Mvc/Micro.zep
index ef2c2f0e23d..c9e22423208 100644
--- a/phalcon/Mvc/Micro.zep
+++ b/phalcon/Mvc/Micro.zep
@@ -310,7 +310,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
     /**
      * Gets model binder
      */
-    public function getModelBinder() -> <BinderInterface>|null
+    public function getModelBinder() -> <BinderInterface> | null
     {
         return this->modelBinder;
     }
@@ -455,7 +455,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                  * Calls the before handlers
                  */
                 for before in beforeHandlers {
-                    if before instanceof MiddlewareInterface {
+                    if typeof before === "object" && before instanceof MiddlewareInterface {
                         /**
                          * Call the middleware
                          */
@@ -488,10 +488,10 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                 /**
                  * Bound the app to the handler
                  */
-                if typeof handler == "object" && handler instanceof Closure {
+                if typeof handler === "object" && handler instanceof Closure {
                     let handler = Closure::bind(handler, this);
 
-                    if modelBinder != null {
+                    if modelBinder !== null {
                         let routeName = matchedRoute->getName();
 
                         if routeName != null {
@@ -514,7 +514,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                 if typeof handler === "array" {
                     let realHandler = handler[0];
 
-                    if realHandler instanceof Controller && modelBinder != null {
+                    if realHandler instanceof Controller && modelBinder !== null {
                         let methodName = handler[1];
                         let bindCacheKey = "_PHMB_" . get_class(realHandler) . "_" . methodName;
 
@@ -566,7 +566,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                  * Calls the after binding handlers
                  */
                 for afterBinding in afterBindingHandlers {
-                    if typeof afterBinding == "object" && afterBinding instanceof MiddlewareInterface {
+                    if typeof afterBinding === "object" && afterBinding instanceof MiddlewareInterface {
                         /**
                          * Call the middleware
                          */
@@ -612,7 +612,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
                  * Calls the after handlers
                  */
                 for after in afterHandlers {
-                    if typeof after == "object" && after instanceof MiddlewareInterface {
+                    if typeof after === "object" && after instanceof MiddlewareInterface {
                         /**
                          * Call the middleware
                          */
@@ -779,7 +779,7 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface
             /**
              * Check if the returned object is already a response
              */
-            if returnedValue instanceof ResponseInterface && !returnedValue->isSent() {
+            if typeof returnedValue === "object" && returnedValue instanceof ResponseInterface && !returnedValue->isSent() {
                 returnedValue->send();
             }
         }
diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index c182c9a2b24..8e899a25265 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -418,7 +418,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         /**
          * Values are probably relationships if they are objects
          */
-        if value instanceof ModelInterface {
+        if typeof value === "object" && value instanceof ModelInterface {
             let lowerProperty = strtolower(property),
                 modelName     = get_class(this),
                 manager       = this->getModelsManager(),
@@ -1144,7 +1144,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 continue;
             }
 
-            if !(record instanceof ModelInterface) {
+            if typeof record !== "object" || !(record instanceof ModelInterface) {
                 continue;
             }
 

From 0043c7e444e384bdb9a456addb63d510b036a0e4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 11:38:42 +0100
Subject: [PATCH 59/76] Fix condition

---
 phalcon/Application/AbstractApplication.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Application/AbstractApplication.zep b/phalcon/Application/AbstractApplication.zep
index 291d6ede335..bfe27be6bdb 100644
--- a/phalcon/Application/AbstractApplication.zep
+++ b/phalcon/Application/AbstractApplication.zep
@@ -45,7 +45,7 @@ abstract class AbstractApplication extends Injectable implements EventsAwareInte
      */
     public function __construct(<DiInterface> container = null)
     {
-        if container === null {
+        if container !== null {
             let this->container = container;
         }
     }

From 0f370c0d9bbcda83c6debd4374c32446e92ddfba Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 11:43:40 +0100
Subject: [PATCH 60/76] Refactor Phalcon\Cli\Console class

---
 phalcon/Cli/Console.zep | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/phalcon/Cli/Console.zep b/phalcon/Cli/Console.zep
index 18da2380dd4..48802416977 100644
--- a/phalcon/Cli/Console.zep
+++ b/phalcon/Cli/Console.zep
@@ -36,30 +36,26 @@ class Console extends AbstractApplication
      */
     public function handle(array arguments = null)
     {
-        var className, container, dispatcher, eventsManager, module, moduleName,
+        var className, dispatcher, module, moduleName,
             moduleObject, modules, path, router, task;
 
-        let container = this->container;
-
-        if container === null {
+        if this->container === null {
             throw new Exception(
                 "A dependency injection container is required to access internal services"
             );
         }
 
-        let eventsManager = <ManagerInterface> this->eventsManager;
-
         /**
          * Call boot event, this allows the developer to perform initialization
          * actions
          */
-        if eventsManager !== null {
-            if eventsManager->fire("console:boot", this) === false {
+        if this->eventsManager !== null {
+            if this->eventsManager->fire("console:boot", this) === false {
                 return false;
             }
         }
 
-        let router = <Router> container->getShared("router");
+        let router = <Router> this->container->getShared("router");
 
         if !count(arguments) && this->arguments {
             router->handle(this->arguments);
@@ -77,8 +73,8 @@ class Console extends AbstractApplication
         }
 
         if moduleName {
-            if typeof eventsManager == "object" {
-                if eventsManager->fire("console:beforeStartModule", this, moduleName) === false {
+            if this->eventsManager !== null {
+                if this->eventsManager->fire("console:beforeStartModule", this, moduleName) === false {
                     return false;
                 }
             }
@@ -93,7 +89,7 @@ class Console extends AbstractApplication
 
             let module = modules[moduleName];
 
-            if unlikely typeof module != "array" {
+            if unlikely typeof module !== "array" {
                 throw new Exception("Invalid module definition path");
             }
 
@@ -113,20 +109,20 @@ class Console extends AbstractApplication
                 }
             }
 
-            let moduleObject = container->get(className);
+            let moduleObject = this->container->get(className);
 
-            moduleObject->registerAutoloaders(container);
-            moduleObject->registerServices(container);
+            moduleObject->registerAutoloaders(this->container);
+            moduleObject->registerServices(this->container);
 
-            if typeof eventsManager == "object" {
-                if eventsManager->fire("console:afterStartModule", this, moduleObject) === false {
+            if this->eventsManager !== null {
+                if this->eventsManager->fire("console:afterStartModule", this, moduleObject) === false {
                     return false;
                 }
             }
 
         }
 
-        let dispatcher = <Dispatcher> container->getShared("dispatcher");
+        let dispatcher = <Dispatcher> this->container->getShared("dispatcher");
 
         dispatcher->setModuleName(router->getModuleName());
         dispatcher->setTaskName(router->getTaskName());
@@ -134,16 +130,16 @@ class Console extends AbstractApplication
         dispatcher->setParams(router->getParams());
         dispatcher->setOptions(this->options);
 
-        if typeof eventsManager == "object" {
-            if eventsManager->fire("console:beforeHandleTask", this, dispatcher) === false {
+        if this->eventsManager !== null {
+            if this->eventsManager->fire("console:beforeHandleTask", this, dispatcher) === false {
                 return false;
             }
         }
 
         let task = dispatcher->dispatch();
 
-        if typeof eventsManager == "object" {
-            eventsManager->fire("console:afterHandleTask", this, task);
+        if this->eventsManager !== null {
+            this->eventsManager->fire("console:afterHandleTask", this, task);
         }
 
         return task;

From a6fd4d86a064a210add07bfad5c9969697ae33c0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 16:36:12 +0100
Subject: [PATCH 61/76] Refactor Phalcon\Annotations\Reflection class

---
 phalcon/Annotations/Reflection.zep | 97 ++++++++++++------------------
 1 file changed, 37 insertions(+), 60 deletions(-)

diff --git a/phalcon/Annotations/Reflection.zep b/phalcon/Annotations/Reflection.zep
index 585560d5112..a869083d984 100644
--- a/phalcon/Annotations/Reflection.zep
+++ b/phalcon/Annotations/Reflection.zep
@@ -31,37 +31,30 @@ namespace Phalcon\Annotations;
 class Reflection
 {
     /**
-     * @var array
-     * TODO: Make always array
+     * @var Collection|null
      */
-    protected classAnnotations;
+    protected classAnnotations = null;
 
     /**
      * @var array
-     * TODO: Make always array
      */
-    protected constantAnnotations;
+    protected constantAnnotations = [];
 
     /**
      * @var array
-     * TODO: Make always array
      */
-    protected propertyAnnotations;
+    protected propertyAnnotations = [];
 
     /**
      * @var array
-     * TODO: Make always array
      */
-    protected methodAnnotations;
+    protected methodAnnotations = [];
 
     /**
      * @var array
      */
     protected reflectionData = [];
 
-    /**
-     * Phalcon\Annotations\Reflection constructor
-     */
     public function __construct(array reflectionData = [])
     {
         let this->reflectionData = reflectionData;
@@ -69,16 +62,16 @@ class Reflection
 
     /**
      * Returns the annotations found in the class docblock
+     *
+     * @return Collection|null
      */
-    public function getClassAnnotations() -> <Collection> | bool
+    public function getClassAnnotations() -> <Collection> | null
     {
         var reflectionClass;
 
         if this->classAnnotations === null {
             if fetch reflectionClass, this->reflectionData["class"] {
                 let this->classAnnotations = new Collection(reflectionClass);
-            } else {
-                let this->classAnnotations = false;
             }
         }
 
@@ -87,27 +80,21 @@ class Reflection
 
     /**
      * Returns the annotations found in the constants' docblocks
+     *
+     * @return Collection[]
      */
-    public function getConstantsAnnotations() -> <Collection[]> | bool
+    public function getConstantsAnnotations() -> <Collection[]>
     {
         var reflectionConstants, constant, reflectionConstant;
 
-        if this->constantAnnotations === null {
-            if fetch reflectionConstants, this->reflectionData["constants"] {
-                if count(reflectionConstants) {
-                    let this->constantAnnotations = [];
-
-                    for constant, reflectionConstant in reflectionConstants {
-                        let this->constantAnnotations[constant] = new Collection(
-                            reflectionConstant
-                        );
-                    }
-
-                    return this->constantAnnotations;
+        if fetch reflectionConstants, this->reflectionData["constants"] {
+            if typeof reflectionConstants === "array" && count(reflectionConstants) > 0 {
+                for constant, reflectionConstant in reflectionConstants {
+                    let this->constantAnnotations[constant] = new Collection(
+                        reflectionConstant
+                    );
                 }
             }
-
-            let this->constantAnnotations = false;
         }
 
         return this->constantAnnotations;
@@ -115,27 +102,21 @@ class Reflection
 
     /**
      * Returns the annotations found in the properties' docblocks
+     *
+     * @return Collection[]
      */
-    public function getPropertiesAnnotations() -> <Collection[]> | bool
+    public function getPropertiesAnnotations() -> <Collection[]>
     {
         var reflectionProperties, property, reflectionProperty;
 
-        if this->propertyAnnotations === null {
-            if fetch reflectionProperties, this->reflectionData["properties"] {
-                if count(reflectionProperties) {
-                    let this->propertyAnnotations = [];
-
-                    for property, reflectionProperty in reflectionProperties {
-                        let this->propertyAnnotations[property] = new Collection(
-                            reflectionProperty
-                        );
-                    }
-
-                    return this->propertyAnnotations;
+        if fetch reflectionProperties, this->reflectionData["properties"] {
+            if typeof reflectionProperties === "array" && count(reflectionProperties) > 0 {
+                for property, reflectionProperty in reflectionProperties {
+                    let this->propertyAnnotations[property] = new Collection(
+                        reflectionProperty
+                    );
                 }
             }
-
-            let this->propertyAnnotations = false;
         }
 
         return this->propertyAnnotations;
@@ -143,27 +124,21 @@ class Reflection
 
     /**
      * Returns the annotations found in the methods' docblocks
+     *
+     * @return Collection[]
      */
-    public function getMethodsAnnotations() -> <Collection[]> | bool
+    public function getMethodsAnnotations() -> <Collection[]>
     {
         var reflectionMethods, methodName, reflectionMethod;
 
-        if this->methodAnnotations === null {
-            if fetch reflectionMethods, this->reflectionData["methods"] {
-                if count(reflectionMethods) {
-                    let this->methodAnnotations = [];
-
-                    for methodName, reflectionMethod in reflectionMethods {
-                        let this->methodAnnotations[methodName] = new Collection(
-                            reflectionMethod
-                        );
-                    }
-
-                    return this->methodAnnotations;
+        if fetch reflectionMethods, this->reflectionData["methods"] {
+            if typeof reflectionMethods === "array" && count(reflectionMethods) > 0 {
+                for methodName, reflectionMethod in reflectionMethods {
+                    let this->methodAnnotations[methodName] = new Collection(
+                        reflectionMethod
+                    );
                 }
             }
-
-            let this->methodAnnotations = false;
         }
 
         return this->methodAnnotations;
@@ -172,6 +147,8 @@ class Reflection
     /**
      * Returns the raw parsing intermediate definitions used to construct the
      * reflection
+     *
+     * @return array
      */
     public function getReflectionData() -> array
     {

From dd12e6652dad7c4440b2cb3bc8443ac8c95a49de Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 16:36:43 +0100
Subject: [PATCH 62/76] Adjust unit tests

---
 .../unit/Annotations/Reflection/GetClassAnnotationsCest.php  | 2 +-
 .../Annotations/Reflection/GetMethodsAnnotationsCest.php     | 5 ++++-
 .../Annotations/Reflection/GetPropertiesAnnotationsCest.php  | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php b/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php
index 5cefb1deef4..09f07446621 100644
--- a/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php
+++ b/tests/unit/Annotations/Reflection/GetClassAnnotationsCest.php
@@ -39,7 +39,7 @@ public function testEmptyReflection(UnitTester $I)
     {
         $reflection = new Reflection();
 
-        $I->assertFalse(
+        $I->assertNull(
             $reflection->getClassAnnotations()
         );
     }
diff --git a/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php b/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php
index c48b86f9e0a..277ca1fd136 100644
--- a/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php
+++ b/tests/unit/Annotations/Reflection/GetMethodsAnnotationsCest.php
@@ -40,7 +40,10 @@ public function testEmptyReflection(UnitTester $I)
     {
         $reflection = new Reflection();
 
-        $I->assertFalse(
+        $I->assertIsArray(
+            $reflection->getMethodsAnnotations()
+        );
+        $I->assertIsEmpty(
             $reflection->getMethodsAnnotations()
         );
     }
diff --git a/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php b/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php
index 622a110416a..d672d877036 100644
--- a/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php
+++ b/tests/unit/Annotations/Reflection/GetPropertiesAnnotationsCest.php
@@ -40,7 +40,10 @@ public function testEmptyReflection(UnitTester $I)
     {
         $reflection = new Reflection();
 
-        $I->assertFalse(
+        $I->assertIsArray(
+            $reflection->getPropertiesAnnotations()
+        );
+        $I->assertIsEmpty(
             $reflection->getPropertiesAnnotations()
         );
     }

From d9c2fd2e9c6a5b1beefa94f5aaad6a432dfa920a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 16:41:01 +0100
Subject: [PATCH 63/76] Update CHANGELOG-5.0.md

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 36336dcaa3f..f0befd4637b 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -3,6 +3,7 @@
 ## Changed
 - Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072) 
 - Changed getters and setters from shorthand format to full methods [#16102](https://github.com/phalcon/cphalcon/issues/16102)
+- Changed return types to `array` in `Phalcon\Annotations\Reflection` class methods [#16106](https://github.com/phalcon/cphalcon/issues/16106)
 
 ## Fixed
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)

From 40cef77aa9efbb1e5865ad2b576400174f3bae6e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 16:41:28 +0100
Subject: [PATCH 64/76] Implement GetReflectionDataCest test

---
 tests/unit/Annotations/Reflection/GetReflectionDataCest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/Annotations/Reflection/GetReflectionDataCest.php b/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
index 4ccac5a982b..989e9b056d2 100644
--- a/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
+++ b/tests/unit/Annotations/Reflection/GetReflectionDataCest.php
@@ -13,6 +13,7 @@
 
 namespace Phalcon\Tests\Unit\Annotations\Reflection;
 
+use Phalcon\Annotations\Reflection;
 use UnitTester;
 
 class GetReflectionDataCest
@@ -27,6 +28,9 @@ public function annotationsReflectionGetReflectionData(UnitTester $I)
     {
         $I->wantToTest('Annotations\Reflection - getReflectionData()');
 
-        $I->skipTest('Need implementation');
+        $reflection = new Reflection();
+
+        $I->assertIsArray($reflection->getReflectionData());
+        $I->assertIsEmpty($reflection->getReflectionData());
     }
 }

From ea2fd91e47ba18be2871a558858c813b649326f9 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 18:26:57 +0100
Subject: [PATCH 65/76] Adjust condition of `getDocComment()`

---
 phalcon/Annotations/Reader.zep | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/phalcon/Annotations/Reader.zep b/phalcon/Annotations/Reader.zep
index beeb97e1f1c..9557138deb6 100644
--- a/phalcon/Annotations/Reader.zep
+++ b/phalcon/Annotations/Reader.zep
@@ -36,7 +36,7 @@ class Reader implements ReaderInterface
         let reflection = new ReflectionClass(className);
 
         let comment = reflection->getDocComment();
-        if typeof comment == "string" {
+        if comment !== false {
             /**
              * Read annotations from class
              */
@@ -73,8 +73,7 @@ class Reader implements ReaderInterface
                  */
                 let constantReflection = reflection->getReflectionConstant(constant);
                 let comment = constantReflection->getDocComment();
-
-                if typeof comment === "string" {
+                if comment !== false {
                     /**
                      * Parse constant docblock comment
                      */
@@ -112,8 +111,7 @@ class Reader implements ReaderInterface
                  * Read comment from property
                  */
                 let comment = property->getDocComment();
-
-                if typeof comment === "string" {
+                if comment !== false {
                     /**
                      * Parse property docblock comment
                      */
@@ -139,7 +137,7 @@ class Reader implements ReaderInterface
          */
         let methods = reflection->getMethods();
 
-        if count(methods) {
+        if count(methods) > 0 {
             let annotationsMethods = [];
 
             for method in methods {
@@ -147,8 +145,7 @@ class Reader implements ReaderInterface
                  * Read comment from method
                  */
                 let comment = method->getDocComment();
-
-                if typeof comment == "string" {
+                if comment !== false {
                     /**
                      * Parse method docblock comment
                      */
@@ -158,7 +155,7 @@ class Reader implements ReaderInterface
                         method->getStartLine()
                     );
 
-                    if typeof methodAnnotations == "array" {
+                    if typeof methodAnnotations === "array" {
                         let annotationsMethods[method->name] = methodAnnotations;
                     }
                 }

From a1467ab8d3b92ac87e1776fd98364f2d50d50aea Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Tue, 20 Sep 2022 18:37:53 +0100
Subject: [PATCH 66/76] Change condition to use `empty()`

---
 phalcon/Annotations/Reader.zep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phalcon/Annotations/Reader.zep b/phalcon/Annotations/Reader.zep
index 9557138deb6..890fd4b5895 100644
--- a/phalcon/Annotations/Reader.zep
+++ b/phalcon/Annotations/Reader.zep
@@ -137,7 +137,7 @@ class Reader implements ReaderInterface
          */
         let methods = reflection->getMethods();
 
-        if count(methods) > 0 {
+        if false === empty(methods) {
             let annotationsMethods = [];
 
             for method in methods {

From 8f4a1587e0b8c0a46a678ce71b2b852fedbb2fb0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 19 Sep 2022 10:18:56 -0400
Subject: [PATCH 67/76] [#.0.x] - minor reformatting of api generation docs

---
 tests/_config/generate-api-docs.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/_config/generate-api-docs.php b/tests/_config/generate-api-docs.php
index bbd6929f3b8..820dc786210 100644
--- a/tests/_config/generate-api-docs.php
+++ b/tests/_config/generate-api-docs.php
@@ -49,8 +49,6 @@
     echo 'Processing: ' . $document['title'] . PHP_EOL;
     $output = "---
 layout: default
-language: 'en'
-version: '4.0'
 title: '{$document['title']}'
 ---
 ";
@@ -88,7 +86,7 @@
 
 <h1 id=\"{$href}\">{$signature}</h1>
 
-[Source on GitHub](https://github.com/phalcon/cphalcon/blob/v{{ page.version }}.0/phalcon/{$github})
+[Source on GitHub](https://github.com/phalcon/cphalcon/blob/v{{ pageVersion }}.0/phalcon/{$github})
 ";
 
         if (!empty($namespace)) {

From 2cf9d853f8310800dd46e0ca28d6d93132d3ce12 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 20 Sep 2022 18:47:32 -0400
Subject: [PATCH 68/76] [#16108] - changed attributes to expect an array also

---
 phalcon/Html/Escaper.zep                   | 70 +++++++++++++++++++---
 tests/unit/Html/Escaper/AttributesCest.php | 21 ++++---
 2 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/phalcon/Html/Escaper.zep b/phalcon/Html/Escaper.zep
index cc2d6e578f2..52c058f5c7d 100644
--- a/phalcon/Html/Escaper.zep
+++ b/phalcon/Html/Escaper.zep
@@ -49,20 +49,55 @@ class Escaper implements EscaperInterface
     protected flags = 11;
 
     /**
-     * Escapes a HTML attribute string
+     * Escapes a HTML attribute string or array
      *
-     * @param string $input
+     * If the input is an array, the keys are the attribute names and the
+     * values are attribute values. If a value is boolean (true/false) then
+     * the attribute will have no value:
+     * `['disabled' => true]` -> `'disabled``
+     *
+     * The resulting string will have attribute pairs separated by a space.
+     *
+     * @param array|string $input
      *
      * @return string
      */
-    public function attributes(string input) -> string
+    public function attributes(var input) -> string
     {
-        return htmlspecialchars(
-            input,
-            ENT_QUOTES,
-            this->encoding,
-            this->doubleEncode
-        );
+        var key, result, value;
+
+        if (typeof input !== "string" && typeof input !== "array") {
+            throw new Exception("Input must be an array or a string");
+        }
+
+        if (typeof input === "string") {
+            return this->phpHtmlSpecialChars(input);
+        }
+
+        let result = "";
+        for key, value in input {
+            if (null === value || false === value) {
+                continue;
+            }
+
+            let key = trim(key);
+
+            if (typeof value === "array") {
+                let value = implode(" ", value);
+            }
+
+            let result .= this->phpHtmlSpecialChars(key);
+
+            if (true !== value) {
+                let result .= "=\""
+                    . this->phpHtmlSpecialChars(value)
+                    . "\"";
+            }
+
+            let result .= " ";
+        }
+
+        return rtrim(result);
     }
 
     /**
@@ -342,6 +377,23 @@ class Escaper implements EscaperInterface
         return rawurlencode(input);
     }
 
+    /**
+     * Proxy method for testing
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    protected function phpHtmlSpecialChars(string input) -> string
+    {
+        return htmlspecialchars(
+            input,
+            ENT_QUOTES,
+            this->encoding,
+            this->doubleEncode
+        );
+    }
+
     /**
      * @param string $input
      *
diff --git a/tests/unit/Html/Escaper/AttributesCest.php b/tests/unit/Html/Escaper/AttributesCest.php
index 47be327edc3..43bc8961501 100644
--- a/tests/unit/Html/Escaper/AttributesCest.php
+++ b/tests/unit/Html/Escaper/AttributesCest.php
@@ -25,7 +25,7 @@
 class AttributesCest
 {
     /**
-     * Tests Phalcon\Escaper :: escapeHtmlAttr()
+     * Tests Phalcon\Escaper :: attributes()
      *
      * @dataProvider escaperEscapeHtmlAttrProvider
      *
@@ -44,14 +44,11 @@ public function escaperAttributes(UnitTester $I, Example $example)
         $text  = $example['text'];
         $flags = $example['htmlQuoteType'];
 
-        $escaper->setHtmlQuoteType($flags);
+        $escaper->setFlags($flags);
 
         $expected = $example['expected'];
         $actual   = $escaper->attributes($text);
         $I->assertSame($expected, $actual);
-
-        $actual = $escaper->escapeHtmlAttr($text);
-        $I->assertSame($expected, $actual);
     }
 
     /**
@@ -65,24 +62,32 @@ private function escaperEscapeHtmlAttrProvider(): array
                 'expected'      => 'That&#039;s right',
                 'text'          => "That's right",
             ],
-
             [
                 'htmlQuoteType' => ENT_XML1,
                 'expected'      => 'That&#039;s right',
                 'text'          => "That's right",
             ],
-
             [
                 'htmlQuoteType' => ENT_XHTML,
                 'expected'      => 'That&#039;s right',
                 'text'          => "That's right",
             ],
-
             [
                 'htmlQuoteType' => ENT_HTML5,
                 'expected'      => 'That&#039;s right',
                 'text'          => "That's right",
             ],
+            [
+                'htmlQuoteType' => ENT_HTML5,
+                'expected'      => 'text="Ferrari Ford Dodge"',
+                'text'          => [
+                    'text' => [
+                        'Ferrari',
+                        'Ford',
+                        'Dodge',
+                    ],
+                ],
+            ],
         ];
     }
 }

From 774c59e5001bab69ccbd6fc8a9bd8a76592a3027 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 20 Sep 2022 18:48:42 -0400
Subject: [PATCH 69/76] [#16108] - updating changelog

---
 CHANGELOG-5.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index f0befd4637b..56869732609 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -4,6 +4,7 @@
 - Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072) 
 - Changed getters and setters from shorthand format to full methods [#16102](https://github.com/phalcon/cphalcon/issues/16102)
 - Changed return types to `array` in `Phalcon\Annotations\Reflection` class methods [#16106](https://github.com/phalcon/cphalcon/issues/16106)
+- Changed `Phalcon\Html\Escaper::attributes()` to also accept an array of attributes [#16108](https://github.com/phalcon/cphalcon/issues/16108)
 
 ## Fixed
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)

From 3b6d02e7185280548e6f2a3e3ff0b7671be37fb6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Wed, 21 Sep 2022 21:28:33 +0100
Subject: [PATCH 70/76] Make `Phalcon\Mvc\Model:uniqueTypes` always array

---
 phalcon/Mvc/Model.zep | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index 8e899a25265..d69d364438a 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -157,10 +157,9 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
     protected uniqueParams = [];
 
     /**
-     * @var array|null
-     * TODO: Make it always array in code
+     * @var array
      */
-    protected uniqueTypes = null;
+    protected uniqueTypes = [];
 
     /**
      * Phalcon\Mvc\Model constructor
@@ -3914,7 +3913,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         var automaticAttributes, attributeField, bindSkip, bindDataTypes,
             bindType, bindTypes, columnMap, dataType, dataTypes, field, fields,
             manager, nonPrimary, newSnapshot, success, primaryKeys, snapshot,
-            snapshotValue, uniqueKey, uniqueParams, uniqueTypes, value, values,
+            snapshotValue, uniqueKey, uniqueParams, value, values,
             updateValue;
         bool changed, useDynamicUpdate;
 
@@ -4094,8 +4093,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
         }
 
         let uniqueKey    = this->uniqueKey,
-            uniqueParams = this->uniqueParams,
-            uniqueTypes  = this->uniqueTypes;
+            uniqueParams = this->uniqueParams;
 
         /**
          * When unique params is null we need to rebuild the bind params
@@ -4156,7 +4154,7 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
                 [
                     "conditions" : uniqueKey,
                     "bind"       : uniqueParams,
-                    "bindTypes"  : uniqueTypes
+                    "bindTypes"  : this->uniqueTypes
                 ],
                 bindTypes
             );

From f2d57ec5725fad87a3c3fa7167cd7eea4f4ee5f7 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 17:35:32 -0400
Subject: [PATCH 71/76] [#.0.x] - optimized files

---
 build/phalcon/phalcon.zep.c | 9067 ++++++++++++++++++-----------------
 build/phalcon/phalcon.zep.h | 1195 ++---
 build/phalcon/php_phalcon.h |    4 +-
 3 files changed, 5304 insertions(+), 4962 deletions(-)

diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
index 95333b5f5e7..04ad5b1582a 100644
--- a/build/phalcon/phalcon.zep.c
+++ b/build/phalcon/phalcon.zep.c
@@ -15213,7 +15213,7 @@ static PHP_METHOD(Phalcon_Tag, getDI)
 
 	ZEPHIR_OBS_VAR(&di);
 	zephir_read_static_property_ce(&di, phalcon_tag_ce, SL("container"), PH_NOISY_CC);
-	if (Z_TYPE_P(&di) != IS_OBJECT) {
+	if (Z_TYPE_P(&di) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(&di, phalcon_di_di_ce, "getdefault", &_0, 0);
 		zephir_check_call_status();
 	}
@@ -15240,7 +15240,7 @@ static PHP_METHOD(Phalcon_Tag, getEscaperService)
 	if (Z_TYPE_P(&escaper) != IS_OBJECT) {
 		ZEPHIR_CALL_SELF(&container, "getdi", NULL, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_tag_exception_ce, "A dependency injection container is required to access the 'escaper' service", "phalcon/Tag.zep", 403);
 			return;
 		}
@@ -15463,7 +15463,7 @@ static PHP_METHOD(Phalcon_Tag, getUrlService)
 	if (Z_TYPE_P(&url) != IS_OBJECT) {
 		ZEPHIR_CALL_SELF(&container, "getdi", NULL, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_tag_exception_ce, "A dependency injection container is required to access the 'url' service", "phalcon/Tag.zep", 498);
 			return;
 		}
@@ -16123,7 +16123,7 @@ static PHP_METHOD(Phalcon_Tag, preload)
 		zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href);
 		ZEPHIR_INIT_VAR(&_8$$5);
 		ZVAL_STRING(&_8$$5, "preload");
-		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 501, &_8$$5, &_5$$5, &attributes);
+		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 497, &_8$$5, &_5$$5, &attributes);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_8$$5);
 		object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce);
@@ -16135,7 +16135,7 @@ static PHP_METHOD(Phalcon_Tag, preload)
 		ZEPHIR_INIT_VAR(&_10$$5);
 		zephir_create_array(&_10$$5, 1, 0);
 		zephir_array_fast_append(&_10$$5, &link);
-		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 502, &_10$$5);
+		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 498, &_10$$5);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&header);
 		ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5);
@@ -18233,15 +18233,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Adapter_AbstractAdapter)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "defaultSerializer");
-}
-
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -18380,6 +18371,15 @@ static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getAdapter)
 	RETURN_MEMBER(getThis(), "adapter");
 }
 
+static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "defaultSerializer");
+}
+
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getKeys)
 {
 }
@@ -18517,14 +18517,14 @@ static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getFilteredKeys)
 		ZEPHIR_CPY_WRT(&_1, keys);
 	}
 	ZEPHIR_CPY_WRT(keys, &_1);
-	zephir_is_iterable(keys, 0, "phalcon/Storage/Adapter/AbstractAdapter.zep", 257);
+	zephir_is_iterable(keys, 0, "phalcon/Storage/Adapter/AbstractAdapter.zep", 267);
 	if (Z_TYPE_P(keys) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _2)
 		{
 			ZEPHIR_INIT_NVAR(&key);
 			ZVAL_COPY(&key, _2);
 			if (zephir_start_with(&key, &pattern, NULL)) {
-				zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 253);
+				zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 263);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -18539,7 +18539,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getFilteredKeys)
 			ZEPHIR_CALL_METHOD(&key, keys, "current", NULL, 0);
 			zephir_check_call_status();
 				if (zephir_start_with(&key, &pattern, NULL)) {
-					zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 253);
+					zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 263);
 				}
 			ZEPHIR_CALL_METHOD(NULL, keys, "next", NULL, 0);
 			zephir_check_call_status();
@@ -24127,19 +24127,17 @@ ZEPHIR_INIT_CLASS(Phalcon_Cli_Console)
 
 static PHP_METHOD(Phalcon_Cli_Console, handle)
 {
-	zend_bool _5;
+	zend_bool _8;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *arguments_param = NULL, __$false, className, container, dispatcher, eventsManager, module, moduleName, moduleObject, modules, path, router, task, _0, _3, _4, _16, _17, _18, _19, _1$$4, _2$$4, _6$$6, _7$$10, _8$$10, _9$$9, _10$$12, _11$$12, _12$$16, _13$$16, _14$$18, _15$$18, _20$$20, _21$$20, _22$$22;
+	zval *arguments_param = NULL, __$false, className, dispatcher, module, moduleName, moduleObject, modules, path, router, task, _0, _1, _5, _6, _7, _9, _26, _27, _28, _29, _30, _31, _35, _2$$4, _3$$4, _4$$4, _10$$6, _11$$9, _15$$9, _20$$9, _21$$9, _22$$9, _12$$10, _13$$10, _14$$10, _16$$12, _17$$12, _18$$16, _19$$16, _23$$18, _24$$18, _25$$18, _32$$20, _33$$20, _34$$20, _36$$22, _37$$22;
 	zval arguments;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arguments);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&className);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&dispatcher);
-	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&module);
 	ZVAL_UNDEF(&moduleName);
 	ZVAL_UNDEF(&moduleObject);
@@ -24148,27 +24146,42 @@ static PHP_METHOD(Phalcon_Cli_Console, handle)
 	ZVAL_UNDEF(&router);
 	ZVAL_UNDEF(&task);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_3);
-	ZVAL_UNDEF(&_4);
-	ZVAL_UNDEF(&_16);
-	ZVAL_UNDEF(&_17);
-	ZVAL_UNDEF(&_18);
-	ZVAL_UNDEF(&_19);
-	ZVAL_UNDEF(&_1$$4);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_26);
+	ZVAL_UNDEF(&_27);
+	ZVAL_UNDEF(&_28);
+	ZVAL_UNDEF(&_29);
+	ZVAL_UNDEF(&_30);
+	ZVAL_UNDEF(&_31);
+	ZVAL_UNDEF(&_35);
 	ZVAL_UNDEF(&_2$$4);
-	ZVAL_UNDEF(&_6$$6);
-	ZVAL_UNDEF(&_7$$10);
-	ZVAL_UNDEF(&_8$$10);
-	ZVAL_UNDEF(&_9$$9);
-	ZVAL_UNDEF(&_10$$12);
-	ZVAL_UNDEF(&_11$$12);
-	ZVAL_UNDEF(&_12$$16);
-	ZVAL_UNDEF(&_13$$16);
-	ZVAL_UNDEF(&_14$$18);
-	ZVAL_UNDEF(&_15$$18);
-	ZVAL_UNDEF(&_20$$20);
-	ZVAL_UNDEF(&_21$$20);
-	ZVAL_UNDEF(&_22$$22);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_4$$4);
+	ZVAL_UNDEF(&_10$$6);
+	ZVAL_UNDEF(&_11$$9);
+	ZVAL_UNDEF(&_15$$9);
+	ZVAL_UNDEF(&_20$$9);
+	ZVAL_UNDEF(&_21$$9);
+	ZVAL_UNDEF(&_22$$9);
+	ZVAL_UNDEF(&_12$$10);
+	ZVAL_UNDEF(&_13$$10);
+	ZVAL_UNDEF(&_14$$10);
+	ZVAL_UNDEF(&_16$$12);
+	ZVAL_UNDEF(&_17$$12);
+	ZVAL_UNDEF(&_18$$16);
+	ZVAL_UNDEF(&_19$$16);
+	ZVAL_UNDEF(&_23$$18);
+	ZVAL_UNDEF(&_24$$18);
+	ZVAL_UNDEF(&_25$$18);
+	ZVAL_UNDEF(&_32$$20);
+	ZVAL_UNDEF(&_33$$20);
+	ZVAL_UNDEF(&_34$$20);
+	ZVAL_UNDEF(&_36$$22);
+	ZVAL_UNDEF(&_37$$22);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -24188,35 +24201,35 @@ static PHP_METHOD(Phalcon_Cli_Console, handle)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Cli/Console.zep", 47);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Cli/Console.zep", 45);
 		return;
 	}
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_0);
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_2$$4);
-		ZVAL_STRING(&_2$$4, "console:boot");
-		ZEPHIR_CALL_METHOD(&_1$$4, &eventsManager, "fire", NULL, 0, &_2$$4, this_ptr);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_1) != IS_NULL) {
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_4$$4);
+		ZVAL_STRING(&_4$$4, "console:boot");
+		ZEPHIR_CALL_METHOD(&_3$$4, &_2$$4, "fire", NULL, 0, &_4$$4, this_ptr);
 		zephir_check_call_status();
-		if (ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)) {
+		if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$4)) {
 			RETURN_MM_BOOL(0);
 		}
 	}
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "router");
-	ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4);
+	zephir_read_property(&_5, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_INIT_VAR(&_7);
+	ZVAL_STRING(&_7, "router");
+	ZEPHIR_CALL_METHOD(&_6, &_5, "getshared", NULL, 0, &_7);
 	zephir_check_call_status();
-	ZEPHIR_CPY_WRT(&router, &_3);
-	_5 = !(zephir_fast_count_int(&arguments));
-	if (_5) {
-		zephir_read_property(&_0, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
-		_5 = zephir_is_true(&_0);
+	ZEPHIR_CPY_WRT(&router, &_6);
+	_8 = !(zephir_fast_count_int(&arguments));
+	if (_8) {
+		zephir_read_property(&_9, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
+		_8 = zephir_is_true(&_9);
 	}
-	if (_5) {
-		zephir_read_property(&_6$$6, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &_6$$6);
+	if (_8) {
+		zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &_10$$6);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &arguments);
@@ -24229,32 +24242,34 @@ static PHP_METHOD(Phalcon_Cli_Console, handle)
 		zephir_read_property(&moduleName, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC);
 	}
 	if (zephir_is_true(&moduleName)) {
-		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_8$$10);
-			ZVAL_STRING(&_8$$10, "console:beforeStartModule");
-			ZEPHIR_CALL_METHOD(&_7$$10, &eventsManager, "fire", NULL, 0, &_8$$10, this_ptr, &moduleName);
+		zephir_read_property(&_11$$9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_11$$9) != IS_NULL) {
+			zephir_read_property(&_12$$10, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+			ZEPHIR_INIT_VAR(&_14$$10);
+			ZVAL_STRING(&_14$$10, "console:beforeStartModule");
+			ZEPHIR_CALL_METHOD(&_13$$10, &_12$$10, "fire", NULL, 0, &_14$$10, this_ptr, &moduleName);
 			zephir_check_call_status();
-			if (ZEPHIR_IS_FALSE_IDENTICAL(&_7$$10)) {
+			if (ZEPHIR_IS_FALSE_IDENTICAL(&_13$$10)) {
 				RETURN_MM_BOOL(0);
 			}
 		}
-		zephir_read_property(&_9$$9, this_ptr, ZEND_STRL("modules"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CPY_WRT(&modules, &_9$$9);
+		zephir_read_property(&_15$$9, this_ptr, ZEND_STRL("modules"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CPY_WRT(&modules, &_15$$9);
 		if (UNEXPECTED(!(zephir_array_isset(&modules, &moduleName)))) {
-			ZEPHIR_INIT_VAR(&_10$$12);
-			object_init_ex(&_10$$12, phalcon_cli_console_exception_ce);
-			ZEPHIR_INIT_VAR(&_11$$12);
-			ZEPHIR_CONCAT_SVS(&_11$$12, "Module '", &moduleName, "' isn't registered in the console container");
-			ZEPHIR_CALL_METHOD(NULL, &_10$$12, "__construct", NULL, 29, &_11$$12);
+			ZEPHIR_INIT_VAR(&_16$$12);
+			object_init_ex(&_16$$12, phalcon_cli_console_exception_ce);
+			ZEPHIR_INIT_VAR(&_17$$12);
+			ZEPHIR_CONCAT_SVS(&_17$$12, "Module '", &moduleName, "' isn't registered in the console container");
+			ZEPHIR_CALL_METHOD(NULL, &_16$$12, "__construct", NULL, 29, &_17$$12);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_10$$12, "phalcon/Cli/Console.zep", 91);
+			zephir_throw_exception_debug(&_16$$12, "phalcon/Cli/Console.zep", 87);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZEPHIR_OBS_VAR(&module);
-		zephir_array_fetch(&module, &modules, &moduleName, PH_NOISY, "phalcon/Cli/Console.zep", 94);
+		zephir_array_fetch(&module, &modules, &moduleName, PH_NOISY, "phalcon/Cli/Console.zep", 90);
 		if (UNEXPECTED(Z_TYPE_P(&module) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "Invalid module definition path", "phalcon/Cli/Console.zep", 97);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "Invalid module definition path", "phalcon/Cli/Console.zep", 93);
 			return;
 		}
 		ZEPHIR_OBS_VAR(&className);
@@ -24265,13 +24280,13 @@ static PHP_METHOD(Phalcon_Cli_Console, handle)
 		ZEPHIR_OBS_VAR(&path);
 		if (zephir_array_isset_string_fetch(&path, &module, SL("path"), 0)) {
 			if (UNEXPECTED(!((zephir_file_exists(&path) == SUCCESS)))) {
-				ZEPHIR_INIT_VAR(&_12$$16);
-				object_init_ex(&_12$$16, phalcon_cli_console_exception_ce);
-				ZEPHIR_INIT_VAR(&_13$$16);
-				ZEPHIR_CONCAT_SVS(&_13$$16, "Module definition path '", &path, "' doesn't exist");
-				ZEPHIR_CALL_METHOD(NULL, &_12$$16, "__construct", NULL, 29, &_13$$16);
+				ZEPHIR_INIT_VAR(&_18$$16);
+				object_init_ex(&_18$$16, phalcon_cli_console_exception_ce);
+				ZEPHIR_INIT_VAR(&_19$$16);
+				ZEPHIR_CONCAT_SVS(&_19$$16, "Module definition path '", &path, "' doesn't exist");
+				ZEPHIR_CALL_METHOD(NULL, &_18$$16, "__construct", NULL, 29, &_19$$16);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_12$$16, "phalcon/Cli/Console.zep", 108);
+				zephir_throw_exception_debug(&_18$$16, "phalcon/Cli/Console.zep", 104);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -24281,61 +24296,71 @@ static PHP_METHOD(Phalcon_Cli_Console, handle)
 				}
 			}
 		}
-		ZEPHIR_CALL_METHOD(&moduleObject, &container, "get", NULL, 0, &className);
+		zephir_read_property(&_15$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(&moduleObject, &_15$$9, "get", NULL, 0, &className);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &container);
+		zephir_read_property(&_20$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &_20$$9);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &container);
+		zephir_read_property(&_21$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &_21$$9);
 		zephir_check_call_status();
-		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_15$$18);
-			ZVAL_STRING(&_15$$18, "console:afterStartModule");
-			ZEPHIR_CALL_METHOD(&_14$$18, &eventsManager, "fire", NULL, 0, &_15$$18, this_ptr, &moduleObject);
+		zephir_read_property(&_22$$9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_22$$9) != IS_NULL) {
+			zephir_read_property(&_23$$18, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+			ZEPHIR_INIT_VAR(&_25$$18);
+			ZVAL_STRING(&_25$$18, "console:afterStartModule");
+			ZEPHIR_CALL_METHOD(&_24$$18, &_23$$18, "fire", NULL, 0, &_25$$18, this_ptr, &moduleObject);
 			zephir_check_call_status();
-			if (ZEPHIR_IS_FALSE_IDENTICAL(&_14$$18)) {
+			if (ZEPHIR_IS_FALSE_IDENTICAL(&_24$$18)) {
 				RETURN_MM_BOOL(0);
 			}
 		}
 	}
-	ZEPHIR_INIT_NVAR(&_4);
-	ZVAL_STRING(&_4, "dispatcher");
-	ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4);
+	zephir_read_property(&_26, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_INIT_NVAR(&_7);
+	ZVAL_STRING(&_7, "dispatcher");
+	ZEPHIR_CALL_METHOD(&_6, &_26, "getshared", NULL, 0, &_7);
 	zephir_check_call_status();
-	ZEPHIR_CPY_WRT(&dispatcher, &_3);
-	ZEPHIR_CALL_METHOD(&_3, &router, "getmodulename", NULL, 0);
+	ZEPHIR_CPY_WRT(&dispatcher, &_6);
+	ZEPHIR_CALL_METHOD(&_6, &router, "getmodulename", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_3);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_6);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&_16, &router, "gettaskname", NULL, 0);
+	ZEPHIR_CALL_METHOD(&_27, &router, "gettaskname", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "settaskname", NULL, 0, &_16);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "settaskname", NULL, 0, &_27);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&_17, &router, "getactionname", NULL, 0);
+	ZEPHIR_CALL_METHOD(&_28, &router, "getactionname", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setactionname", NULL, 0, &_17);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setactionname", NULL, 0, &_28);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&_18, &router, "getparams", NULL, 0);
+	ZEPHIR_CALL_METHOD(&_29, &router, "getparams", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setparams", NULL, 0, &_18);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setparams", NULL, 0, &_29);
 	zephir_check_call_status();
-	zephir_read_property(&_19, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setoptions", NULL, 0, &_19);
+	zephir_read_property(&_30, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setoptions", NULL, 0, &_30);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_21$$20);
-		ZVAL_STRING(&_21$$20, "console:beforeHandleTask");
-		ZEPHIR_CALL_METHOD(&_20$$20, &eventsManager, "fire", NULL, 0, &_21$$20, this_ptr, &dispatcher);
+	zephir_read_property(&_31, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_31) != IS_NULL) {
+		zephir_read_property(&_32$$20, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_34$$20);
+		ZVAL_STRING(&_34$$20, "console:beforeHandleTask");
+		ZEPHIR_CALL_METHOD(&_33$$20, &_32$$20, "fire", NULL, 0, &_34$$20, this_ptr, &dispatcher);
 		zephir_check_call_status();
-		if (ZEPHIR_IS_FALSE_IDENTICAL(&_20$$20)) {
+		if (ZEPHIR_IS_FALSE_IDENTICAL(&_33$$20)) {
 			RETURN_MM_BOOL(0);
 		}
 	}
 	ZEPHIR_CALL_METHOD(&task, &dispatcher, "dispatch", NULL, 0);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_22$$22);
-		ZVAL_STRING(&_22$$22, "console:afterHandleTask");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_22$$22, this_ptr, &task);
+	zephir_read_property(&_35, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_35) != IS_NULL) {
+		zephir_read_property(&_36$$22, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_37$$22);
+		ZVAL_STRING(&_37$$22, "console:afterHandleTask");
+		ZEPHIR_CALL_METHOD(NULL, &_36$$22, "fire", NULL, 0, &_37$$22, this_ptr, &task);
 		zephir_check_call_status();
 	}
 	RETURN_CCTOR(&task);
@@ -24456,7 +24481,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument)
 		ZEPHIR_UNREF(&arguments);
 		zephir_check_call_status();
 	}
-	zephir_is_iterable(&arguments, 0, "phalcon/Cli/Console.zep", 189);
+	zephir_is_iterable(&arguments, 0, "phalcon/Cli/Console.zep", 185);
 	if (Z_TYPE_P(&arguments) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _1)
 		{
@@ -24506,11 +24531,11 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument)
 						zephir_substr(&_22$$10, &arg, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 						zephir_array_update_zval(&opts, &_22$$10, &__$true, PH_COPY | PH_SEPARATE);
 					} else {
-						zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
+						zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 177);
 					}
 				}
 			} else {
-				zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 185);
+				zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -24568,11 +24593,11 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument)
 							zephir_substr(&_41$$19, &arg, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 							zephir_array_update_zval(&opts, &_41$$19, &__$true, PH_COPY | PH_SEPARATE);
 						} else {
-							zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
+							zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 177);
 						}
 					}
 				} else {
-					zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 185);
+					zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
 			zephir_check_call_status();
@@ -24802,7 +24827,7 @@ static PHP_METHOD(Phalcon_Cli_Dispatcher, getOption)
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$5);
 		ZVAL_STRING(&_1$$5, "A dependency injection container is required to access the 'filter' service");
 		ZVAL_LONG(&_2$$5, 0);
@@ -24994,7 +25019,7 @@ static PHP_METHOD(Phalcon_Cli_Dispatcher, handleException)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&eventsManager, &_0);
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
+	if (Z_TYPE_P(&eventsManager) != IS_NULL) {
 		ZEPHIR_INIT_VAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "dispatch:beforeException");
 		ZEPHIR_CALL_METHOD(&_1$$3, &eventsManager, "fire", NULL, 0, &_2$$3, this_ptr, exception);
@@ -27281,24 +27306,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Forms_Form)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Forms_Form, getValidation)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "validation");
-}
-
-static PHP_METHOD(Phalcon_Forms_Form, getWhitelist)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "whitelist");
-}
-
 static PHP_METHOD(Phalcon_Forms_Form, __construct)
 {
 	zend_bool _0;
@@ -28320,6 +28327,24 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue)
 	RETURN_MM_NULL();
 }
 
+static PHP_METHOD(Phalcon_Forms_Form, getValidation)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "validation");
+}
+
+static PHP_METHOD(Phalcon_Forms_Form, getWhitelist)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "whitelist");
+}
+
 static PHP_METHOD(Phalcon_Forms_Form, has)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -28507,7 +28532,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid)
 		zephir_check_call_status();
 	}
 	zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_8, 0, "phalcon/Forms/Form.zep", 698);
+	zephir_is_iterable(&_8, 0, "phalcon/Forms/Form.zep", 714);
 	if (Z_TYPE_P(&_8) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_8), _9)
 		{
@@ -28520,7 +28545,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid)
 			}
 			ZEPHIR_CALL_METHOD(&name, &element, "getname", NULL, 0);
 			zephir_check_call_status();
-			zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 685);
+			zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 701);
 			if (Z_TYPE_P(&validators) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _11$$10)
 				{
@@ -28572,7 +28597,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid)
 				}
 				ZEPHIR_CALL_METHOD(&name, &element, "getname", NULL, 0);
 				zephir_check_call_status();
-				zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 685);
+				zephir_is_iterable(&validators, 0, "phalcon/Forms/Form.zep", 701);
 				if (Z_TYPE_P(&validators) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _15$$15)
 					{
@@ -28704,7 +28729,7 @@ static PHP_METHOD(Phalcon_Forms_Form, label)
 		ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form");
 		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 748);
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 764);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -28775,7 +28800,7 @@ static PHP_METHOD(Phalcon_Forms_Form, render)
 		ZEPHIR_CONCAT_SVS(&_2$$3, "Element with ID=", &name, " is not part of the form");
 		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_2$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 772);
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Forms/Form.zep", 788);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -30902,7 +30927,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Di_Di)
 	zend_declare_property_null(phalcon_di_di_ce, SL("services"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_di_di_ce, SL("sharedInstances"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_di_di_ce, SL("eventsManager"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_di_di_ce, SL("_default"), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC);
+	zend_declare_property_null(phalcon_di_di_ce, SL("defaultDi"), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC);
 	phalcon_di_di_ce->create_object = zephir_init_properties_Phalcon_Di_Di;
 
 	zend_class_implements(phalcon_di_di_ce, 1, phalcon_di_diinterface_ce);
@@ -30918,9 +30943,9 @@ static PHP_METHOD(Phalcon_Di_Di, __construct)
 
 
 
-	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("_default"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("defaultDi"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
-		zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("_default"), this_ptr);
+		zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("defaultDi"), this_ptr);
 	}
 }
 
@@ -31257,7 +31282,7 @@ static PHP_METHOD(Phalcon_Di_Di, getDefault)
 
 
 
-	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("_default"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("defaultDi"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
 
@@ -31824,7 +31849,7 @@ static PHP_METHOD(Phalcon_Di_Di, reset)
 
 
 
-	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("_default"), &__$null);
+	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("defaultDi"), &__$null);
 }
 
 static PHP_METHOD(Phalcon_Di_Di, set)
@@ -31903,7 +31928,7 @@ static PHP_METHOD(Phalcon_Di_Di, setDefault)
 	zephir_fetch_params_without_memory_grow(1, 0, &container);
 
 
-	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("_default"), container);
+	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("defaultDi"), container);
 }
 
 static PHP_METHOD(Phalcon_Di_Di, setInternalEventsManager)
@@ -32394,11 +32419,11 @@ static PHP_METHOD(Phalcon_Di_Injectable, __get)
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdi", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (ZEPHIR_IS_STRING(&propertyName, "di")) {
+	if (ZEPHIR_IS_STRING_IDENTICAL(&propertyName, "di")) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("di"), &container);
 		RETURN_CCTOR(&container);
 	}
-	if (ZEPHIR_IS_STRING(&propertyName, "persistent")) {
+	if (ZEPHIR_IS_STRING_IDENTICAL(&propertyName, "persistent")) {
 		ZEPHIR_INIT_VAR(&_2$$4);
 		zephir_create_array(&_2$$4, 2, 0);
 		ZEPHIR_INIT_VAR(&_3$$4);
@@ -32483,7 +32508,7 @@ static PHP_METHOD(Phalcon_Di_Injectable, getDI)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
@@ -32779,7 +32804,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve)
 		object_init_ex(&_5$$21, phalcon_di_exception_serviceresolutionexception_ce);
 		ZEPHIR_CALL_METHOD(NULL, &_5$$21, "__construct", NULL, 29);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_5$$21, "phalcon/Di/Service.zep", 205);
+		zephir_throw_exception_debug(&_5$$21, "phalcon/Di/Service.zep", 204);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -32845,7 +32870,7 @@ static PHP_METHOD(Phalcon_Di_Service, setParameter)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("definition"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&definition, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&definition) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Definition must be an array to update its parameters", "phalcon/Di/Service.zep", 240);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Definition must be an array to update its parameters", "phalcon/Di/Service.zep", 239);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&arguments);
@@ -33243,14 +33268,14 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 	ZEPHIR_OBS_VAR(&paramCalls);
 	if (zephir_array_isset_string_fetch(&paramCalls, &definition, SL("calls"), 0)) {
 		if (UNEXPECTED(Z_TYPE_P(&instance) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has setter injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 83);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has setter injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 78);
 			return;
 		}
 		if (UNEXPECTED(Z_TYPE_P(&paramCalls) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 89);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 84);
 			return;
 		}
-		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 149);
+		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 143);
 		if (Z_TYPE_P(&paramCalls) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paramCalls), _3$$10, _4$$10, _1$$10)
 			{
@@ -33269,7 +33294,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_6$$14, "Method call must be an array on position ", &methodPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_7, 29, &_6$$14);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$14, "phalcon/Di/Service/Builder.zep", 103);
+					zephir_throw_exception_debug(&_5$$14, "phalcon/Di/Service/Builder.zep", 97);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -33281,7 +33306,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_9$$15, "The method name is required on position ", &methodPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_8$$15, "__construct", &_7, 29, &_9$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_8$$15, "phalcon/Di/Service/Builder.zep", 112);
+					zephir_throw_exception_debug(&_8$$15, "phalcon/Di/Service/Builder.zep", 106);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -33299,7 +33324,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_12$$17, "Call arguments must be an array on position ", &_11$$17);
 						ZEPHIR_CALL_METHOD(NULL, &_10$$17, "__construct", &_7, 29, &_12$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$17, "phalcon/Di/Service/Builder.zep", 125);
+						zephir_throw_exception_debug(&_10$$17, "phalcon/Di/Service/Builder.zep", 119);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -33336,7 +33361,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_17$$20, "Method call must be an array on position ", &methodPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_16$$20, "__construct", &_7, 29, &_17$$20);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_16$$20, "phalcon/Di/Service/Builder.zep", 103);
+						zephir_throw_exception_debug(&_16$$20, "phalcon/Di/Service/Builder.zep", 97);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -33348,7 +33373,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_19$$21, "The method name is required on position ", &methodPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_18$$21, "__construct", &_7, 29, &_19$$21);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_18$$21, "phalcon/Di/Service/Builder.zep", 112);
+						zephir_throw_exception_debug(&_18$$21, "phalcon/Di/Service/Builder.zep", 106);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -33367,7 +33392,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 							ZEPHIR_CONCAT_SV(&_23$$23, "Call arguments must be an array on position ", &_22$$23);
 							ZEPHIR_CALL_METHOD(NULL, &_21$$23, "__construct", &_7, 29, &_23$$23);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_21$$23, "phalcon/Di/Service/Builder.zep", 125);
+							zephir_throw_exception_debug(&_21$$23, "phalcon/Di/Service/Builder.zep", 119);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -33393,14 +33418,14 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 	ZEPHIR_OBS_NVAR(&paramCalls);
 	if (zephir_array_isset_string_fetch(&paramCalls, &definition, SL("properties"), 0)) {
 		if (UNEXPECTED(Z_TYPE_P(&instance) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has properties injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 159);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has properties injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 152);
 			return;
 		}
 		if (UNEXPECTED(Z_TYPE_P(&paramCalls) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 165);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 158);
 			return;
 		}
-		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 209);
+		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 201);
 		if (Z_TYPE_P(&paramCalls) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paramCalls), _29$$25, _30$$25, _27$$25)
 			{
@@ -33419,7 +33444,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_32$$29, "Property must be an array on position ", &propertyPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_31$$29, "__construct", &_7, 29, &_32$$29);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_31$$29, "phalcon/Di/Service/Builder.zep", 179);
+					zephir_throw_exception_debug(&_31$$29, "phalcon/Di/Service/Builder.zep", 171);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -33431,7 +33456,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_34$$30, "The property name is required on position ", &propertyPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_33$$30, "__construct", &_7, 29, &_34$$30);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_33$$30, "phalcon/Di/Service/Builder.zep", 188);
+					zephir_throw_exception_debug(&_33$$30, "phalcon/Di/Service/Builder.zep", 180);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -33443,7 +33468,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_36$$31, "The property value is required on position ", &propertyPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_35$$31, "__construct", &_7, 29, &_36$$31);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_35$$31, "phalcon/Di/Service/Builder.zep", 197);
+					zephir_throw_exception_debug(&_35$$31, "phalcon/Di/Service/Builder.zep", 189);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -33471,7 +33496,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_40$$33, "Property must be an array on position ", &propertyPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_39$$33, "__construct", &_7, 29, &_40$$33);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_39$$33, "phalcon/Di/Service/Builder.zep", 179);
+						zephir_throw_exception_debug(&_39$$33, "phalcon/Di/Service/Builder.zep", 171);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -33483,7 +33508,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_42$$34, "The property name is required on position ", &propertyPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_41$$34, "__construct", &_7, 29, &_42$$34);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_41$$34, "phalcon/Di/Service/Builder.zep", 188);
+						zephir_throw_exception_debug(&_41$$34, "phalcon/Di/Service/Builder.zep", 180);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -33495,7 +33520,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_44$$35, "The property value is required on position ", &propertyPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_43$$35, "__construct", &_7, 29, &_44$$35);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_43$$35, "phalcon/Di/Service/Builder.zep", 197);
+						zephir_throw_exception_debug(&_43$$35, "phalcon/Di/Service/Builder.zep", 189);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -33514,11 +33539,11 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build)
 
 static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 {
-	zval _2$$3, _5$$5, _8$$8, _11$$10, _14$$13;
+	zval _2$$3, _5$$5, _8$$7, _11$$9, _14$$11;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval argument;
 	zend_long position, ZEPHIR_LAST_CALL_STATUS;
-	zval *container, container_sub, *position_param = NULL, *argument_param = NULL, type, name, value, instanceArguments, _0$$3, _1$$3, _3$$5, _4$$5, _6$$8, _7$$8, _9$$10, _10$$10, _12$$13, _13$$13;
+	zval *container, container_sub, *position_param = NULL, *argument_param = NULL, type, name, value, instanceArguments, _0$$3, _1$$3, _3$$5, _4$$5, _6$$7, _7$$7, _9$$9, _10$$9, _12$$11, _13$$11;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&container_sub);
@@ -33530,18 +33555,18 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_3$$5);
 	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_6$$8);
-	ZVAL_UNDEF(&_7$$8);
-	ZVAL_UNDEF(&_9$$10);
-	ZVAL_UNDEF(&_10$$10);
-	ZVAL_UNDEF(&_12$$13);
-	ZVAL_UNDEF(&_13$$13);
+	ZVAL_UNDEF(&_6$$7);
+	ZVAL_UNDEF(&_7$$7);
+	ZVAL_UNDEF(&_9$$9);
+	ZVAL_UNDEF(&_10$$9);
+	ZVAL_UNDEF(&_12$$11);
+	ZVAL_UNDEF(&_13$$11);
 	ZVAL_UNDEF(&argument);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_5$$5);
-	ZVAL_UNDEF(&_8$$8);
-	ZVAL_UNDEF(&_11$$10);
-	ZVAL_UNDEF(&_14$$13);
+	ZVAL_UNDEF(&_8$$7);
+	ZVAL_UNDEF(&_11$$9);
+	ZVAL_UNDEF(&_14$$11);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
@@ -33568,7 +33593,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 		ZEPHIR_CONCAT_SVS(&_2$$3, "Argument at position ", &_1$$3, " must have a type");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_2$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Di/Service/Builder.zep", 229);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Di/Service/Builder.zep", 221);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -33584,14 +33609,10 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 				ZEPHIR_CONCAT_SV(&_5$$5, "Service 'name' is required in parameter on position ", &_4$$5);
 				ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 29, &_5$$5);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_3$$5, "phalcon/Di/Service/Builder.zep", 242);
+				zephir_throw_exception_debug(&_3$$5, "phalcon/Di/Service/Builder.zep", 233);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The dependency injector container is not valid", "phalcon/Di/Service/Builder.zep", 248);
-				return;
-			}
 			ZEPHIR_RETURN_CALL_METHOD(container, "get", NULL, 0, &name);
 			zephir_check_call_status();
 			RETURN_MM();
@@ -33599,15 +33620,15 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 		if (ZEPHIR_IS_STRING(&type, "parameter")) {
 			ZEPHIR_OBS_VAR(&value);
 			if (UNEXPECTED(!(zephir_array_isset_string_fetch(&value, &argument, SL("value"), 0)))) {
-				ZEPHIR_INIT_VAR(&_6$$8);
-				object_init_ex(&_6$$8, phalcon_di_exception_ce);
-				ZEPHIR_INIT_VAR(&_7$$8);
-				ZVAL_LONG(&_7$$8, position);
-				ZEPHIR_INIT_VAR(&_8$$8);
-				ZEPHIR_CONCAT_SV(&_8$$8, "Service 'value' is required in parameter on position ", &_7$$8);
-				ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 29, &_8$$8);
+				ZEPHIR_INIT_VAR(&_6$$7);
+				object_init_ex(&_6$$7, phalcon_di_exception_ce);
+				ZEPHIR_INIT_VAR(&_7$$7);
+				ZVAL_LONG(&_7$$7, position);
+				ZEPHIR_INIT_VAR(&_8$$7);
+				ZEPHIR_CONCAT_SV(&_8$$7, "Service 'value' is required in parameter on position ", &_7$$7);
+				ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", NULL, 29, &_8$$7);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_6$$8, "phalcon/Di/Service/Builder.zep", 260);
+				zephir_throw_exception_debug(&_6$$7, "phalcon/Di/Service/Builder.zep", 245);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -33616,22 +33637,18 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 		if (ZEPHIR_IS_STRING(&type, "instance")) {
 			ZEPHIR_OBS_NVAR(&name);
 			if (UNEXPECTED(!(zephir_array_isset_string_fetch(&name, &argument, SL("className"), 0)))) {
-				ZEPHIR_INIT_VAR(&_9$$10);
-				object_init_ex(&_9$$10, phalcon_di_exception_ce);
-				ZEPHIR_INIT_VAR(&_10$$10);
-				ZVAL_LONG(&_10$$10, position);
-				ZEPHIR_INIT_VAR(&_11$$10);
-				ZEPHIR_CONCAT_SV(&_11$$10, "Service 'className' is required in parameter on position ", &_10$$10);
-				ZEPHIR_CALL_METHOD(NULL, &_9$$10, "__construct", NULL, 29, &_11$$10);
-				zephir_check_call_status();
-				zephir_throw_exception_debug(&_9$$10, "phalcon/Di/Service/Builder.zep", 273);
+				ZEPHIR_INIT_VAR(&_9$$9);
+				object_init_ex(&_9$$9, phalcon_di_exception_ce);
+				ZEPHIR_INIT_VAR(&_10$$9);
+				ZVAL_LONG(&_10$$9, position);
+				ZEPHIR_INIT_VAR(&_11$$9);
+				ZEPHIR_CONCAT_SV(&_11$$9, "Service 'className' is required in parameter on position ", &_10$$9);
+				ZEPHIR_CALL_METHOD(NULL, &_9$$9, "__construct", NULL, 29, &_11$$9);
+				zephir_check_call_status();
+				zephir_throw_exception_debug(&_9$$9, "phalcon/Di/Service/Builder.zep", 257);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The dependency injector container is not valid", "phalcon/Di/Service/Builder.zep", 279);
-				return;
-			}
 			ZEPHIR_OBS_VAR(&instanceArguments);
 			if (zephir_array_isset_string_fetch(&instanceArguments, &argument, SL("arguments"), 0)) {
 				ZEPHIR_RETURN_CALL_METHOD(container, "get", NULL, 0, &name, &instanceArguments);
@@ -33642,15 +33659,15 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 			zephir_check_call_status();
 			RETURN_MM();
 		}
-		ZEPHIR_INIT_VAR(&_12$$13);
-		object_init_ex(&_12$$13, phalcon_di_exception_ce);
-		ZEPHIR_INIT_VAR(&_13$$13);
-		ZVAL_LONG(&_13$$13, position);
-		ZEPHIR_INIT_VAR(&_14$$13);
-		ZEPHIR_CONCAT_SV(&_14$$13, "Unknown service type in parameter on position ", &_13$$13);
-		ZEPHIR_CALL_METHOD(NULL, &_12$$13, "__construct", NULL, 29, &_14$$13);
+		ZEPHIR_INIT_VAR(&_12$$11);
+		object_init_ex(&_12$$11, phalcon_di_exception_ce);
+		ZEPHIR_INIT_VAR(&_13$$11);
+		ZVAL_LONG(&_13$$11, position);
+		ZEPHIR_INIT_VAR(&_14$$11);
+		ZEPHIR_CONCAT_SV(&_14$$11, "Unknown service type in parameter on position ", &_13$$11);
+		ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_12$$13, "phalcon/Di/Service/Builder.zep", 301);
+		zephir_throw_exception_debug(&_12$$11, "phalcon/Di/Service/Builder.zep", 279);
 		ZEPHIR_MM_RESTORE();
 		return;
 	} while(0);
@@ -33693,7 +33710,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters)
 
 	ZEPHIR_INIT_VAR(&buildArguments);
 	array_init(&buildArguments);
-	zephir_is_iterable(&arguments, 0, "phalcon/Di/Service/Builder.zep", 323);
+	zephir_is_iterable(&arguments, 0, "phalcon/Di/Service/Builder.zep", 301);
 	if (Z_TYPE_P(&arguments) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&arguments), _2, _3, _0)
 		{
@@ -33707,7 +33724,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters)
 			ZVAL_COPY(&argument, _0);
 			ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 220, container, &position, &argument);
 			zephir_check_call_status();
-			zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320);
+			zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0);
@@ -33724,7 +33741,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters)
 			zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 220, container, &position, &argument);
 				zephir_check_call_status();
-				zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320);
+				zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298);
 			ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -34515,60 +34532,15 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Item)
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Item, phalcon, logger_item, phalcon_logger_item_method_entry, 0);
 
 	zend_declare_property_null(phalcon_logger_item_ce, SL("context"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_logger_item_ce, SL("dateTime"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_logger_item_ce, SL("message"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_logger_item_ce, SL("level"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_logger_item_ce, SL("levelName"), 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;
 }
 
-static PHP_METHOD(Phalcon_Logger_Item, getContext)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "context");
-}
-
-static PHP_METHOD(Phalcon_Logger_Item, getMessage)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "message");
-}
-
-static PHP_METHOD(Phalcon_Logger_Item, getLevel)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "level");
-}
-
-static PHP_METHOD(Phalcon_Logger_Item, getLevelName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "levelName");
-}
-
-static PHP_METHOD(Phalcon_Logger_Item, getDateTime)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "dateTime");
-}
-
 static PHP_METHOD(Phalcon_Logger_Item, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -34619,6 +34591,51 @@ static PHP_METHOD(Phalcon_Logger_Item, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Logger_Item, getContext)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "context");
+}
+
+static PHP_METHOD(Phalcon_Logger_Item, getDateTime)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "dateTime");
+}
+
+static PHP_METHOD(Phalcon_Logger_Item, getMessage)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "message");
+}
+
+static PHP_METHOD(Phalcon_Logger_Item, getLevel)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "level");
+}
+
+static PHP_METHOD(Phalcon_Logger_Item, getLevelName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "levelName");
+}
+
 zend_object *zephir_init_properties_Phalcon_Logger_Item(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
@@ -35751,22 +35768,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Adapter, Stream, phalcon, logger_adapter_stream, phalcon_logger_adapter_abstractadapter_ce, phalcon_logger_adapter_stream_method_entry, 0);
 
-	zend_declare_property_null(phalcon_logger_adapter_stream_ce, SL("handler"), ZEND_ACC_PROTECTED);
 	zend_declare_property_string(phalcon_logger_adapter_stream_ce, SL("mode"), "ab", ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_logger_adapter_stream_ce, SL("name"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_logger_adapter_stream_ce, SL("options"), ZEND_ACC_PROTECTED);
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -35804,7 +35811,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
 
 	if (1 == zephir_array_isset_string(&options, SL("mode"))) {
 		ZEPHIR_OBS_VAR(&mode);
-		zephir_array_fetch_string(&mode, &options, SL("mode"), PH_NOISY, "phalcon/Logger/Adapter/Stream.zep", 82);
+		zephir_array_fetch_string(&mode, &options, SL("mode"), PH_NOISY, "phalcon/Logger/Adapter/Stream.zep", 74);
 	} else {
 		ZEPHIR_INIT_NVAR(&mode);
 		ZVAL_STRING(&mode, "ab");
@@ -35814,7 +35821,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
 	ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 82, &mode, &_0);
 	zephir_check_call_status();
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 84);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 76);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name);
@@ -35824,48 +35831,41 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct)
 
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, close)
 {
-	zend_bool result;
-	zval __$null, _0, _1$$3;
 	zval *this_ptr = getThis();
 
-	ZVAL_NULL(&__$null);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
 
 
+	RETURN_BOOL(1);
+}
 
-	result = 1;
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_RESOURCE) {
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-		result = zephir_fclose(&_1$$3);
-	}
-	zephir_update_property_zval(this_ptr, ZEND_STRL("handler"), &__$null);
-	RETURN_BOOL(result);
+static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
 }
 
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, process)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *item, item_sub, __$null, message, _0, _9, _10, _11, _1$$3, _2$$3, _3$$3, _4$$3, _5$$4, _6$$4, _7$$4, _8$$4;
+	zval *item, item_sub, handler, message, _0, _1, _6, _7, _8, _2$$3, _3$$3, _4$$3, _5$$3;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&item_sub);
-	ZVAL_NULL(&__$null);
+	ZVAL_UNDEF(&handler);
 	ZVAL_UNDEF(&message);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_9);
-	ZVAL_UNDEF(&_10);
-	ZVAL_UNDEF(&_11);
-	ZVAL_UNDEF(&_1$$3);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_8);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-	ZVAL_UNDEF(&_5$$4);
-	ZVAL_UNDEF(&_6$$4);
-	ZVAL_UNDEF(&_7$$4);
-	ZVAL_UNDEF(&_8$$4);
+	ZVAL_UNDEF(&_5$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -35878,37 +35878,34 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, process)
 	zephir_fetch_params(1, 1, 0, &item);
 
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-	if (!(Z_TYPE_P(&_0) == IS_RESOURCE)) {
-		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY);
-		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "phpfopen", NULL, 0, &_2$$3, &_3$$3);
-		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("handler"), &_1$$3);
-		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-		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_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);
-			ZEPHIR_CONCAT_SVSVS(&_8$$4, "The file '", &_6$$4, "' cannot be opened with mode '", &_7$$4, "'");
-			ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 408, &_8$$4);
-			zephir_check_call_status();
-			zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 128);
-			ZEPHIR_MM_RESTORE();
-			return;
-		}
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&handler, this_ptr, "phpfopen", NULL, 0, &_0, &_1);
+	zephir_check_call_status();
+	if (!(Z_TYPE_P(&handler) == IS_RESOURCE)) {
+		ZEPHIR_INIT_VAR(&_2$$3);
+		object_init_ex(&_2$$3, spl_ce_LogicException);
+		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_5$$3);
+		ZEPHIR_CONCAT_SVSVS(&_5$$3, "The file '", &_3$$3, "' cannot be opened with mode '", &_4$$3, "'");
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 408, &_5$$3);
+		zephir_check_call_status();
+		zephir_throw_exception_debug(&_2$$3, "phalcon/Logger/Adapter/Stream.zep", 119);
+		ZEPHIR_MM_RESTORE();
+		return;
 	}
-	ZEPHIR_CALL_METHOD(&_9, this_ptr, "getformatteditem", NULL, 0, item);
+	ZVAL_LONG(&_6, 2);
+	ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 127, &handler, &_6);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_10);
-	ZEPHIR_GET_CONSTANT(&_10, "PHP_EOL");
+	ZEPHIR_CALL_METHOD(&_7, this_ptr, "getformatteditem", NULL, 0, item);
+	zephir_check_call_status();
+	ZEPHIR_INIT_VAR(&_8);
+	ZEPHIR_GET_CONSTANT(&_8, "PHP_EOL");
 	ZEPHIR_INIT_VAR(&message);
-	ZEPHIR_CONCAT_VV(&message, &_9, &_10);
-	zephir_read_property(&_11, this_ptr, ZEND_STRL("handler"), PH_NOISY_CC | PH_READONLY);
-	zephir_fwrite(NULL, &_11, &message);
+	ZEPHIR_CONCAT_VV(&message, &_7, &_8);
+	zephir_fwrite(NULL, &handler, &message);
+	zephir_fclose(&handler);
 	ZEPHIR_MM_RESTORE();
 }
 
@@ -36220,59 +36217,59 @@ static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getDateFormat)
 	RETURN_MEMBER(getThis(), "dateFormat");
 }
 
-static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat)
+static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *dateFormat_param = NULL;
-	zval dateFormat;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *item, item_sub, _0, _1;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&dateFormat);
+	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_STR(dateFormat)
+		Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &dateFormat_param);
-	zephir_get_strval(&dateFormat, dateFormat_param);
+	zephir_fetch_params(1, 1, 0, &item);
 
 
-	zephir_update_property_zval(this_ptr, ZEND_STRL("dateFormat"), &dateFormat);
-	RETURN_THIS();
+	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();
 }
 
-static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate)
+static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *item, item_sub, _0, _1;
+	zval *format_param = NULL;
+	zval format;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&item_sub);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&format);
 #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)
+		Z_PARAM_STR(format)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &item);
+	zephir_fetch_params(1, 1, 0, &format_param);
+	zephir_get_strval(&format, format_param);
 
 
-	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();
+	zephir_update_property_zval(this_ptr, ZEND_STRL("dateFormat"), &format);
+	ZEPHIR_MM_RESTORE();
 }
 
 
@@ -36407,40 +36404,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "format");
-}
-
-static PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *format_param = NULL;
-	zval format;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&format);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(format)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &format_param);
-	zephir_get_strval(&format, format_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("format"), &format);
-	RETURN_THIS();
-}
-
 static PHP_METHOD(Phalcon_Logger_Formatter_Line, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -36527,6 +36490,40 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Line, format)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "format");
+}
+
+static PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *format_param = NULL;
+	zval format;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&format);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(format)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &format_param);
+	zephir_get_strval(&format, format_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("format"), &format);
+	RETURN_THIS();
+}
+
 
 
 
@@ -44164,11 +44161,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Column)
 	zend_declare_property_null(phalcon_db_column_ce, SL("after"), ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_db_column_ce, SL("autoIncrement"), 0, ZEND_ACC_PROTECTED);
 	zend_declare_property_long(phalcon_db_column_ce, SL("bindType"), 2, ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_column_ce, SL("_default"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_column_ce, SL("comment"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_column_ce, SL("defaultValue"), ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_db_column_ce, SL("first"), 0, ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_db_column_ce, SL("isNumeric"), 0, ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_db_column_ce, SL("name"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_column_ce, SL("comment"), ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_db_column_ce, SL("notNull"), 1, ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_db_column_ce, SL("primary"), 0, ZEND_ACC_PROTECTED);
 	zend_declare_property_long(phalcon_db_column_ce, SL("scale"), 0, ZEND_ACC_PROTECTED);
@@ -44253,78 +44250,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Column)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Db_Column, getDefault)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "_default");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getComment)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "comment");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getScale)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "scale");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getSize)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "size");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getTypeReference)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "typeReference");
-}
-
-static PHP_METHOD(Phalcon_Db_Column, getTypeValues)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "typeValues");
-}
-
 static PHP_METHOD(Phalcon_Db_Column, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -44416,7 +44341,7 @@ static PHP_METHOD(Phalcon_Db_Column, __construct)
 	}
 	ZEPHIR_OBS_VAR(&defaultValue);
 	if (zephir_array_isset_string_fetch(&defaultValue, &definition, SL("default"), 0)) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("_default"), &defaultValue);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("defaultValue"), &defaultValue);
 	}
 	ZEPHIR_OBS_VAR(&dunsigned);
 	if (zephir_array_isset_string_fetch(&dunsigned, &definition, SL("unsigned"), 0)) {
@@ -44483,6 +44408,78 @@ static PHP_METHOD(Phalcon_Db_Column, getBindType)
 	RETURN_MEMBER(getThis(), "bindType");
 }
 
+static PHP_METHOD(Phalcon_Db_Column, getComment)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "comment");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getDefault)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "defaultValue");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getScale)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "scale");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getSize)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "size");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getTypeReference)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "typeReference");
+}
+
+static PHP_METHOD(Phalcon_Db_Column, getTypeValues)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "typeValues");
+}
+
 static PHP_METHOD(Phalcon_Db_Column, hasDefault)
 {
 	zval _0, _1;
@@ -44501,7 +44498,7 @@ static PHP_METHOD(Phalcon_Db_Column, hasDefault)
 	if (zephir_is_true(&_0)) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_read_property(&_1, this_ptr, ZEND_STRL("_default"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("defaultValue"), PH_NOISY_CC | PH_READONLY);
 	RETURN_MM_BOOL(Z_TYPE_P(&_1) != IS_NULL);
 }
 
@@ -47638,33 +47635,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Index)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Db_Index, getColumns)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "columns");
-}
-
-static PHP_METHOD(Phalcon_Db_Index, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-static PHP_METHOD(Phalcon_Db_Index, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 static PHP_METHOD(Phalcon_Db_Index, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -47713,6 +47683,33 @@ static PHP_METHOD(Phalcon_Db_Index, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Db_Index, getColumns)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "columns");
+}
+
+static PHP_METHOD(Phalcon_Db_Index, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+static PHP_METHOD(Phalcon_Db_Index, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
 
 
 
@@ -47936,24 +47933,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_RawValue)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Db_RawValue, getValue)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "value");
-}
-
-static PHP_METHOD(Phalcon_Db_RawValue, __toString)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "value");
-}
-
 static PHP_METHOD(Phalcon_Db_RawValue, __construct)
 {
 	zval _2$$5;
@@ -47994,102 +47973,48 @@ static PHP_METHOD(Phalcon_Db_RawValue, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
-
-
-
-#ifdef HAVE_CONFIG_H
-#endif
-
-
-
-
-
-ZEPHIR_INIT_CLASS(Phalcon_Db_Reference)
-{
-	ZEPHIR_REGISTER_CLASS(Phalcon\\Db, Reference, phalcon, db_reference, phalcon_db_reference_method_entry, 0);
-
-	zend_declare_property_null(phalcon_db_reference_ce, SL("columns"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("name"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("referencedColumns"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("referencedSchema"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("referencedTable"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("schemaName"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("onDelete"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_db_reference_ce, SL("onUpdate"), ZEND_ACC_PROTECTED);
-	zend_class_implements(phalcon_db_reference_ce, 1, phalcon_db_referenceinterface_ce);
-	return SUCCESS;
-}
-
-static PHP_METHOD(Phalcon_Db_Reference, getColumns)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "columns");
-}
-
-static PHP_METHOD(Phalcon_Db_Reference, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-static PHP_METHOD(Phalcon_Db_Reference, getReferencedColumns)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "referencedColumns");
-}
-
-static PHP_METHOD(Phalcon_Db_Reference, getReferencedSchema)
+static PHP_METHOD(Phalcon_Db_RawValue, __toString)
 {
 	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "referencedSchema");
+	RETURN_MEMBER(getThis(), "value");
 }
 
-static PHP_METHOD(Phalcon_Db_Reference, getReferencedTable)
+static PHP_METHOD(Phalcon_Db_RawValue, getValue)
 {
 	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "referencedTable");
+	RETURN_MEMBER(getThis(), "value");
 }
 
-static PHP_METHOD(Phalcon_Db_Reference, getSchemaName)
-{
-	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "schemaName");
-}
+#ifdef HAVE_CONFIG_H
+#endif
 
-static PHP_METHOD(Phalcon_Db_Reference, getOnDelete)
-{
-	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "onDelete");
-}
 
-static PHP_METHOD(Phalcon_Db_Reference, getOnUpdate)
+ZEPHIR_INIT_CLASS(Phalcon_Db_Reference)
 {
-	zval *this_ptr = getThis();
-
-
+	ZEPHIR_REGISTER_CLASS(Phalcon\\Db, Reference, phalcon, db_reference, phalcon_db_reference_method_entry, 0);
 
-	RETURN_MEMBER(getThis(), "onUpdate");
+	zend_declare_property_null(phalcon_db_reference_ce, SL("columns"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("name"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("referencedColumns"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("referencedSchema"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("referencedTable"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("schemaName"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("onDelete"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_reference_ce, SL("onUpdate"), ZEND_ACC_PROTECTED);
+	zend_class_implements(phalcon_db_reference_ce, 1, phalcon_db_referenceinterface_ce);
+	return SUCCESS;
 }
 
 static PHP_METHOD(Phalcon_Db_Reference, __construct)
@@ -48174,6 +48099,78 @@ static PHP_METHOD(Phalcon_Db_Reference, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Db_Reference, getColumns)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "columns");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getReferencedColumns)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "referencedColumns");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getReferencedSchema)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "referencedSchema");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getReferencedTable)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "referencedTable");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getSchemaName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "schemaName");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getOnDelete)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "onDelete");
+}
+
+static PHP_METHOD(Phalcon_Db_Reference, getOnUpdate)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "onUpdate");
+}
+
 
 
 
@@ -55297,9 +55294,9 @@ static PHP_METHOD(Phalcon_Db_Result_PdoResult, numRows)
 		ZEPHIR_CPY_WRT(&connection, &_1$$3);
 		ZEPHIR_CALL_METHOD(&type, &connection, "gettype", NULL, 0);
 		zephir_check_call_status();
-		_2$$3 = ZEPHIR_IS_STRING(&type, "mysql");
+		_2$$3 = ZEPHIR_IS_STRING_IDENTICAL(&type, "mysql");
 		if (!(_2$$3)) {
-			_2$$3 = ZEPHIR_IS_STRING(&type, "pgsql");
+			_2$$3 = ZEPHIR_IS_STRING_IDENTICAL(&type, "pgsql");
 		}
 		if (_2$$3) {
 			zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY);
@@ -55473,6 +55470,67 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Profiler_Item)
 	return SUCCESS;
 }
 
+static PHP_METHOD(Phalcon_Db_Profiler_Item, getFinalTime)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "finalTime");
+}
+
+static PHP_METHOD(Phalcon_Db_Profiler_Item, getInitialTime)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "initialTime");
+}
+
+static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlBindTypes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sqlBindTypes");
+}
+
+static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlStatement)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sqlStatement");
+}
+
+static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlVariables)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sqlVariables");
+}
+
+static PHP_METHOD(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds)
+{
+	zval _0, _1;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+
+
+
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("finalTime"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("initialTime"), PH_NOISY_CC | PH_READONLY);
+	zephir_sub_function(return_value, &_0, &_1);
+	return;
+}
+
 static PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime)
 {
 	zval *finalTime_param = NULL, _0;
@@ -55498,15 +55556,6 @@ static PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime)
 	RETURN_THISW();
 }
 
-static PHP_METHOD(Phalcon_Db_Profiler_Item, getFinalTime)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "finalTime");
-}
-
 static PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime)
 {
 	zval *initialTime_param = NULL, _0;
@@ -55532,15 +55581,6 @@ static PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime)
 	RETURN_THISW();
 }
 
-static PHP_METHOD(Phalcon_Db_Profiler_Item, getInitialTime)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "initialTime");
-}
-
 static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -55566,15 +55606,6 @@ static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes)
 	RETURN_THIS();
 }
 
-static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlBindTypes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sqlBindTypes");
-}
-
 static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -55600,15 +55631,6 @@ static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement)
 	RETURN_THIS();
 }
 
-static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlStatement)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sqlStatement");
-}
-
 static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -55634,31 +55656,6 @@ static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables)
 	RETURN_THIS();
 }
 
-static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlVariables)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sqlVariables");
-}
-
-static PHP_METHOD(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds)
-{
-	zval _0, _1;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
-
-
-
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("finalTime"), PH_NOISY_CC | PH_READONLY);
-	zephir_read_property(&_1, this_ptr, ZEND_STRL("initialTime"), PH_NOISY_CC | PH_READONLY);
-	zephir_sub_function(return_value, &_0, &_1);
-	return;
-}
-
 
 
 
@@ -55693,24 +55690,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_AbstractAdapter)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "dialectType");
-}
-
-static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -57381,6 +57360,15 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialect)
 	RETURN_MEMBER(getThis(), "dialect");
 }
 
+static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "dialectType");
+}
+
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getEventsManager)
 {
 	zval *this_ptr = getThis();
@@ -57440,6 +57428,15 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLVariables)
 	RETURN_MEMBER(getThis(), "sqlVariables");
 }
 
+static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 {
 	zend_bool _6$$4, _11$$12;
@@ -57519,7 +57516,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 		ZEPHIR_CONCAT_SVS(&_1$$3, "Unable to insert into ", &table, " without data");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Db/Adapter/AbstractAdapter.zep", 810);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Db/Adapter/AbstractAdapter.zep", 826);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -57529,7 +57526,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 	array_init(&insertValues);
 	ZEPHIR_INIT_VAR(&bindDataTypes);
 	array_init(&bindDataTypes);
-	zephir_is_iterable(&values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 848);
+	zephir_is_iterable(&values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 864);
 	if (Z_TYPE_P(&values) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2)
 		{
@@ -57547,7 +57544,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 			}
 			if (_6$$4) {
 				zephir_cast_to_string(&_7$$5, &value);
-				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 823);
+				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
 			} else {
 				if (Z_TYPE_P(&value) == IS_OBJECT) {
 					zephir_cast_to_string(&_8$$7, &value);
@@ -57556,19 +57553,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					ZEPHIR_INIT_NVAR(&_9$$8);
 					ZVAL_STRING(&_9$$8, "null");
-					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 830);
+					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 846);
 				} else {
 					ZEPHIR_INIT_NVAR(&_10$$9);
 					ZVAL_STRING(&_10$$9, "?");
-					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 832);
-					zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 833);
+					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 848);
+					zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 849);
 					if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&bindType);
 						if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 855);
 							return;
 						}
-						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 842);
+						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 858);
 					}
 				}
 			}
@@ -57592,7 +57589,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				}
 				if (_11$$12) {
 					zephir_cast_to_string(&_12$$13, &value);
-					zephir_array_append(&placeholders, &_12$$13, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 823);
+					zephir_array_append(&placeholders, &_12$$13, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
 				} else {
 					if (Z_TYPE_P(&value) == IS_OBJECT) {
 						zephir_cast_to_string(&_13$$15, &value);
@@ -57601,19 +57598,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						ZEPHIR_INIT_NVAR(&_14$$16);
 						ZVAL_STRING(&_14$$16, "null");
-						zephir_array_append(&placeholders, &_14$$16, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 830);
+						zephir_array_append(&placeholders, &_14$$16, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 846);
 					} else {
 						ZEPHIR_INIT_NVAR(&_15$$17);
 						ZVAL_STRING(&_15$$17, "?");
-						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 832);
-						zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 833);
+						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 848);
+						zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 849);
 						if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 							ZEPHIR_OBS_NVAR(&bindType);
 							if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
+								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 855);
 								return;
 							}
-							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 842);
+							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 858);
 						}
 					}
 				}
@@ -57641,7 +57638,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 	if (Z_TYPE_P(fields) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&escapedFields);
 		array_init(&escapedFields);
-		zephir_is_iterable(fields, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 868);
+		zephir_is_iterable(fields, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 884);
 		if (Z_TYPE_P(fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(fields), _18$$22)
 			{
@@ -57649,7 +57646,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				ZVAL_COPY(&field, _18$$22);
 				ZEPHIR_CALL_METHOD(&_20$$23, this_ptr, "escapeidentifier", NULL, 0, &field);
 				zephir_check_call_status();
-				zephir_array_append(&escapedFields, &_20$$23, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 865);
+				zephir_array_append(&escapedFields, &_20$$23, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 881);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, fields, "rewind", NULL, 0);
@@ -57664,7 +57661,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&_21$$24, this_ptr, "escapeidentifier", NULL, 0, &field);
 					zephir_check_call_status();
-					zephir_array_append(&escapedFields, &_21$$24, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 865);
+					zephir_array_append(&escapedFields, &_21$$24, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 881);
 				ZEPHIR_CALL_METHOD(NULL, fields, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -57737,7 +57734,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 914);
+	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 930);
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), _3, _4, _1)
 		{
@@ -57749,8 +57746,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict)
 			}
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
-			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 910);
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 911);
+			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 926);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 927);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, data, "rewind", NULL, 0);
@@ -57765,8 +57762,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&value, data, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 910);
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 911);
+				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 926);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 927);
 			ZEPHIR_CALL_METHOD(NULL, data, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -57880,14 +57877,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listTables)
 	ZVAL_LONG(&_2, 3);
 	ZEPHIR_CALL_METHOD(&tables, this_ptr, "fetchall", NULL, 0, &_1, &_2);
 	zephir_check_call_status();
-	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 961);
+	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 977);
 	if (Z_TYPE_P(&tables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&tables), _3)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _3);
-			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
-			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
+			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
+			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &tables, "rewind", NULL, 0);
@@ -57900,8 +57897,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listTables)
 			}
 			ZEPHIR_CALL_METHOD(&table, &tables, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
-				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
+				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
+				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
 			ZEPHIR_CALL_METHOD(NULL, &tables, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -57962,14 +57959,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listViews)
 	ZVAL_LONG(&_2, 3);
 	ZEPHIR_CALL_METHOD(&tables, this_ptr, "fetchall", NULL, 0, &_1, &_2);
 	zephir_check_call_status();
-	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 988);
+	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1004);
 	if (Z_TYPE_P(&tables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&tables), _3)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _3);
-			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
-			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
+			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
+			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &tables, "rewind", NULL, 0);
@@ -57982,8 +57979,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listViews)
 			}
 			ZEPHIR_CALL_METHOD(&table, &tables, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
-				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
+				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
+				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
 			ZEPHIR_CALL_METHOD(NULL, &tables, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -58093,7 +58090,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, releaseSavepoint)
 	ZEPHIR_CALL_METHOD(&_1, &dialect, "supportssavepoints", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1018);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1034);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_2, &dialect, "supportsreleasesavepoints", NULL, 0);
@@ -58147,7 +58144,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, rollbackSavepoint)
 	ZEPHIR_CALL_METHOD(&_1, &dialect, "supportssavepoints", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1042);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1058);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_2, &dialect, "rollbacksavepoint", NULL, 0, &name);
@@ -58225,14 +58222,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, setNestedTransactionsWithS
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(ZEPHIR_GT_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Nested transaction with savepoints behavior cannot be changed while a transaction is open", "phalcon/Db/Adapter/AbstractAdapter.zep", 1074);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Nested transaction with savepoints behavior cannot be changed while a transaction is open", "phalcon/Db/Adapter/AbstractAdapter.zep", 1090);
 		return;
 	}
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CALL_METHOD(&_2, &_1, "supportssavepoints", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_2))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1080);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1096);
 		return;
 	}
 	if (nestedTransactionsWithSavepoints) {
@@ -58346,7 +58343,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, tableExists)
 	ZVAL_LONG(&_3, 3);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchone", NULL, 0, &_2, &_3);
 	zephir_check_call_status();
-	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1116);
+	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1132);
 	RETURN_MM_BOOL(ZEPHIR_GT_LONG(&_4, 0));
 }
 
@@ -58403,7 +58400,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, tableOptions)
 	ZVAL_LONG(&_2, 2);
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "fetchall", NULL, 0, &sql, &_2);
 	zephir_check_call_status();
-	zephir_array_fetch_long(&_3, &_1, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1138);
+	zephir_array_fetch_long(&_3, &_1, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1154);
 	RETURN_CTOR(&_3);
 }
 
@@ -58485,7 +58482,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 	array_init(&updateValues);
 	ZEPHIR_INIT_VAR(&bindDataTypes);
 	array_init(&bindDataTypes);
-	zephir_is_iterable(values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1228);
+	zephir_is_iterable(values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1244);
 	if (Z_TYPE_P(values) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(values), _2, _3, _0)
 		{
@@ -58499,7 +58496,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 			ZVAL_COPY(&value, _0);
 			ZEPHIR_OBS_NVAR(&field);
 			if (UNEXPECTED(!(zephir_array_isset_fetch(&field, fields, &position, 0)))) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1193);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1209);
 				return;
 			}
 			ZEPHIR_CALL_METHOD(&escapedField, this_ptr, "escapeidentifier", &_4, 0, &field);
@@ -58512,7 +58509,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 				zephir_cast_to_string(&_6$$5, &value);
 				ZEPHIR_INIT_NVAR(&_7$$5);
 				ZEPHIR_CONCAT_VSV(&_7$$5, &escapedField, " = ", &_6$$5);
-				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1199);
+				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1215);
 			} else {
 				if (Z_TYPE_P(&value) == IS_OBJECT) {
 					zephir_cast_to_string(&_8$$7, &value);
@@ -58521,20 +58518,20 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					ZEPHIR_INIT_NVAR(&_9$$8);
 					ZEPHIR_CONCAT_VS(&_9$$8, &escapedField, " = null");
-					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1206);
+					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1222);
 				} else {
-					zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1208);
+					zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1224);
 					if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&bindType);
 						if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1214);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1230);
 							return;
 						}
-						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1217);
+						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1233);
 					}
 					ZEPHIR_INIT_NVAR(&_10$$9);
 					ZEPHIR_CONCAT_VS(&_10$$9, &escapedField, " = ?");
-					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1220);
+					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1236);
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -58553,7 +58550,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&field);
 				if (UNEXPECTED(!(zephir_array_isset_fetch(&field, fields, &position, 0)))) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1193);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1209);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&escapedField, this_ptr, "escapeidentifier", &_4, 0, &field);
@@ -58566,7 +58563,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 					zephir_cast_to_string(&_12$$14, &value);
 					ZEPHIR_INIT_NVAR(&_13$$14);
 					ZEPHIR_CONCAT_VSV(&_13$$14, &escapedField, " = ", &_12$$14);
-					zephir_array_append(&placeholders, &_13$$14, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1199);
+					zephir_array_append(&placeholders, &_13$$14, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1215);
 				} else {
 					if (Z_TYPE_P(&value) == IS_OBJECT) {
 						zephir_cast_to_string(&_14$$16, &value);
@@ -58575,20 +58572,20 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						ZEPHIR_INIT_NVAR(&_15$$17);
 						ZEPHIR_CONCAT_VS(&_15$$17, &escapedField, " = null");
-						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1206);
+						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1222);
 					} else {
-						zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1208);
+						zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1224);
 						if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 							ZEPHIR_OBS_NVAR(&bindType);
 							if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1214);
+								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1230);
 								return;
 							}
-							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1217);
+							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1233);
 						}
 						ZEPHIR_INIT_NVAR(&_16$$18);
 						ZEPHIR_CONCAT_VS(&_16$$18, &escapedField, " = ?");
-						zephir_array_append(&placeholders, &_16$$18, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1220);
+						zephir_array_append(&placeholders, &_16$$18, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1236);
 					}
 				}
 			ZEPHIR_CALL_METHOD(NULL, values, "next", NULL, 0);
@@ -58618,7 +58615,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 			zephir_concat_self(&updateSql, whereCondition);
 		} else {
 			if (UNEXPECTED(Z_TYPE_P(whereCondition) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid WHERE clause conditions", "phalcon/Db/Adapter/AbstractAdapter.zep", 1251);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid WHERE clause conditions", "phalcon/Db/Adapter/AbstractAdapter.zep", 1267);
 				return;
 			}
 			ZEPHIR_OBS_VAR(&conditions);
@@ -58704,7 +58701,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, updateAsDict)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1324);
+	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1340);
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), _3, _4, _1)
 		{
@@ -58716,8 +58713,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, updateAsDict)
 			}
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
-			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1320);
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1321);
+			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1336);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1337);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, data, "rewind", NULL, 0);
@@ -58732,8 +58729,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, updateAsDict)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&value, data, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1320);
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1321);
+				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1336);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1337);
 			ZEPHIR_CALL_METHOD(NULL, data, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -58820,7 +58817,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, viewExists)
 	ZVAL_LONG(&_3, 3);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchone", NULL, 0, &_2, &_3);
 	zephir_check_call_status();
-	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1357);
+	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1373);
 	RETURN_MM_BOOL(ZEPHIR_GT_LONG(&_4, 0));
 }
 
@@ -59189,19 +59186,20 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, affectedRows)
 static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, transactionLevel = 0;
-	zval *nesting_param = NULL, eventsManager, savepointName, _0, _5, _6, _1$$3, _2$$4, _7$$6;
-	zend_bool nesting, _3, _4;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *nesting_param = NULL, eventsManager, savepointName, _0, _3, _6, _7, _1$$3, _2$$4, _8$$6;
+	zend_bool nesting, _4, _5;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&savepointName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_7);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$4);
-	ZVAL_UNDEF(&_7$$6);
+	ZVAL_UNDEF(&_8$$6);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -59221,10 +59219,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 
 
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("transactionLevel")));
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC);
-	transactionLevel = zephir_get_intval(&_0);
-	if (transactionLevel == 1) {
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 1)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&eventsManager, &_1$$3);
 		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
@@ -59238,27 +59234,28 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	_3 = !transactionLevel;
-	if (!(_3)) {
-		_3 = !nesting;
-	}
-	_4 = _3;
+	zephir_read_property(&_3, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	_4 = ZEPHIR_IS_LONG_IDENTICAL(&_3, 0);
 	if (!(_4)) {
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
+		_4 = !nesting;
+	}
+	_5 = _4;
+	if (!(_5)) {
+		ZEPHIR_CALL_METHOD(&_6, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
 		zephir_check_call_status();
-		_4 = !zephir_is_true(&_5);
+		_5 = !zephir_is_true(&_6);
 	}
-	if (_4) {
+	if (_5) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_read_property(&_6, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_6);
+	zephir_read_property(&_7, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CPY_WRT(&eventsManager, &_7);
 	ZEPHIR_CALL_METHOD(&savepointName, this_ptr, "getnestedtransactionsavepointname", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_7$$6);
-		ZVAL_STRING(&_7$$6, "db:createSavepoint");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_7$$6, this_ptr, &savepointName);
+		ZEPHIR_INIT_VAR(&_8$$6);
+		ZVAL_STRING(&_8$$6, "db:createSavepoint");
+		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_8$$6, this_ptr, &savepointName);
 		zephir_check_call_status();
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createsavepoint", NULL, 0, &savepointName);
@@ -59269,19 +59266,22 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, commit)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, transactionLevel = 0;
-	zval *nesting_param = NULL, eventsManager, savepointName, _0, _5, _6, _1$$4, _2$$5, _7$$8;
-	zend_bool nesting, _3, _4;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *nesting_param = NULL, eventsManager, savepointName, _0, _1, _4, _7, _9, _2$$4, _3$$5, _8$$6, _10$$8;
+	zend_bool nesting, _5, _6;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&savepointName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_5);
-	ZVAL_UNDEF(&_6);
-	ZVAL_UNDEF(&_1$$4);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_7$$8);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_2$$4);
+	ZVAL_UNDEF(&_3$$5);
+	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_10$$8);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -59300,52 +59300,53 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, commit)
 	}
 
 
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC);
-	transactionLevel = zephir_get_intval(&_0);
-	if (UNEXPECTED(!transactionLevel)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 154);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 0)) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 151);
 		return;
 	}
-	if (transactionLevel == 1) {
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CPY_WRT(&eventsManager, &_1$$4);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_1, 1)) {
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CPY_WRT(&eventsManager, &_2$$4);
 		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_2$$5);
-			ZVAL_STRING(&_2$$5, "db:commitTransaction");
-			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_2$$5, this_ptr);
+			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_STRING(&_3$$5, "db:commitTransaction");
+			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_3$$5, this_ptr);
 			zephir_check_call_status();
 		}
 		RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_METHOD(&_1$$4, "commit", NULL, 0);
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_2$$4, "commit", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	_3 = !transactionLevel;
-	if (!(_3)) {
-		_3 = !nesting;
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	_5 = ZEPHIR_IS_LONG_IDENTICAL(&_4, 0);
+	if (!(_5)) {
+		_5 = !nesting;
 	}
-	_4 = _3;
-	if (!(_4)) {
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
+	_6 = _5;
+	if (!(_6)) {
+		ZEPHIR_CALL_METHOD(&_7, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
 		zephir_check_call_status();
-		_4 = !zephir_is_true(&_5);
+		_6 = !zephir_is_true(&_7);
 	}
-	if (_4) {
-		if (transactionLevel > 0) {
+	if (_6) {
+		zephir_read_property(&_8$$6, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+		if (ZEPHIR_GT_LONG(&_8$$6, 0)) {
 			RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
 		}
 		RETURN_MM_BOOL(0);
 	}
-	zephir_read_property(&_6, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_6);
+	zephir_read_property(&_9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CPY_WRT(&eventsManager, &_9);
 	ZEPHIR_CALL_METHOD(&savepointName, this_ptr, "getnestedtransactionsavepointname", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_7$$8);
-		ZVAL_STRING(&_7$$8, "db:releaseSavepoint");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_7$$8, this_ptr, &savepointName);
+		ZEPHIR_INIT_VAR(&_10$$8);
+		ZVAL_STRING(&_10$$8, "db:releaseSavepoint");
+		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_10$$8, this_ptr, &savepointName);
 		zephir_check_call_status();
 	}
 	RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
@@ -59437,12 +59438,12 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 	}
 	_1 = zephir_array_isset_string(&descriptor, SL("options"));
 	if (_1) {
-		zephir_array_fetch_string(&_2, &descriptor, SL("options"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 268);
+		zephir_array_fetch_string(&_2, &descriptor, SL("options"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 265);
 		_1 = Z_TYPE_P(&_2) == IS_ARRAY;
 	}
 	if (_1) {
 		ZEPHIR_OBS_VAR(&options);
-		zephir_array_fetch_string(&options, &descriptor, SL("options"), PH_NOISY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 269);
+		zephir_array_fetch_string(&options, &descriptor, SL("options"), PH_NOISY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 266);
 		zephir_array_unset_string(&descriptor, SL("options"), PH_SEPARATE);
 	} else {
 		ZEPHIR_INIT_NVAR(&options);
@@ -59459,14 +59460,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 	zephir_array_update_long(&options, 3, &_4, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_OBS_VAR(&dsnAttributesCustomRaw);
 	if (zephir_array_isset_string_fetch(&dsnAttributesCustomRaw, &descriptor, SL("dsn"), 0)) {
-		zephir_array_append(&dsnParts, &dsnAttributesCustomRaw, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 285);
+		zephir_array_append(&dsnParts, &dsnAttributesCustomRaw, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 282);
 		zephir_array_unset_string(&descriptor, SL("dsn"), PH_SEPARATE);
 	}
 	ZEPHIR_CALL_METHOD(&_5, this_ptr, "getdsndefaults", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&dsnAttributesMap);
 	zephir_fast_array_merge(&dsnAttributesMap, &_5, &descriptor);
-	zephir_is_iterable(&dsnAttributesMap, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 305);
+	zephir_is_iterable(&dsnAttributesMap, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 302);
 	if (Z_TYPE_P(&dsnAttributesMap) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&dsnAttributesMap), _8, _9, _6)
 		{
@@ -59480,7 +59481,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 			ZVAL_COPY(&value, _6);
 			ZEPHIR_INIT_NVAR(&_10$$11);
 			ZEPHIR_CONCAT_VSV(&_10$$11, &key, "=", &value);
-			zephir_array_append(&dsnParts, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 301);
+			zephir_array_append(&dsnParts, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 298);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &dsnAttributesMap, "rewind", NULL, 0);
@@ -59497,7 +59498,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 			zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_11$$12);
 				ZEPHIR_CONCAT_VSV(&_11$$12, &key, "=", &value);
-				zephir_array_append(&dsnParts, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 301);
+				zephir_array_append(&dsnParts, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 298);
 			ZEPHIR_CALL_METHOD(NULL, &dsnAttributesMap, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -59584,27 +59585,27 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, convertBoundParams)
 	ZVAL_LONG(&_2, setOrder);
 	zephir_preg_match(&_1, &bindPattern, &sql, &matches, 1, zephir_get_intval(&_0) , 0 );
 	if (zephir_is_true(&_1)) {
-		zephir_is_iterable(&matches, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 359);
+		zephir_is_iterable(&matches, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 356);
 		if (Z_TYPE_P(&matches) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$3)
 			{
 				ZEPHIR_INIT_NVAR(&placeMatch);
 				ZVAL_COPY(&placeMatch, _3$$3);
 				ZEPHIR_OBS_NVAR(&value);
-				zephir_array_fetch_long(&_5$$4, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 342);
+				zephir_array_fetch_long(&_5$$4, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 339);
 				if (!(zephir_array_isset_fetch(&value, &params, &_5$$4, 0))) {
 					if (UNEXPECTED(!(zephir_array_isset_long(&placeMatch, 2)))) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 343);
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&value);
-					zephir_array_fetch_long(&_6$$5, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
+					zephir_array_fetch_long(&_6$$5, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
 					if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &params, &_6$$5, 0)))) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 352);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
 						return;
 					}
 				}
-				zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 356);
+				zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 353);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &matches, "rewind", NULL, 0);
@@ -59618,20 +59619,20 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, convertBoundParams)
 				ZEPHIR_CALL_METHOD(&placeMatch, &matches, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&value);
-					zephir_array_fetch_long(&_7$$8, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 342);
+					zephir_array_fetch_long(&_7$$8, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 339);
 					if (!(zephir_array_isset_fetch(&value, &params, &_7$$8, 0))) {
 						if (UNEXPECTED(!(zephir_array_isset_long(&placeMatch, 2)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 343);
 							return;
 						}
 						ZEPHIR_OBS_NVAR(&value);
-						zephir_array_fetch_long(&_8$$9, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
+						zephir_array_fetch_long(&_8$$9, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
 						if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &params, &_8$$9, 0)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 352);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
 							return;
 						}
 					}
-					zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 356);
+					zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 353);
 				ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -59843,7 +59844,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 	ZEPHIR_OBS_COPY_OR_DUP(&placeholders, placeholders_param);
 
 
-	zephir_is_iterable(&placeholders, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 570);
+	zephir_is_iterable(&placeholders, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 567);
 	if (Z_TYPE_P(&placeholders) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&placeholders), _2, _3, _0)
 		{
@@ -59861,7 +59862,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 			} else if (Z_TYPE_P(&wildcard) == IS_STRING) {
 				ZEPHIR_CPY_WRT(&parameter, &wildcard);
 			} else {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 490);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 487);
 				return;
 			}
 			_4$$3 = Z_TYPE_P(dataTypes) == IS_ARRAY;
@@ -59920,7 +59921,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 						zephir_check_call_status();
 					}
 				} else {
-					zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 558);
+					zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 555);
 					if (Z_TYPE_P(&castValue) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&castValue), _12$$22, _13$$22, _10$$22)
 						{
@@ -59980,7 +59981,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 					ZEPHIR_CALL_METHOD(NULL, statement, "bindvalue", &_9, 0, &parameter, &value);
 					zephir_check_call_status();
 				} else {
-					zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 566);
+					zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 563);
 					if (Z_TYPE_P(&value) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&value), _20$$31, _21$$31, _18$$31)
 						{
@@ -60042,7 +60043,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 				} else if (Z_TYPE_P(&wildcard) == IS_STRING) {
 					ZEPHIR_CPY_WRT(&parameter, &wildcard);
 				} else {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 490);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 487);
 					return;
 				}
 				_24$$34 = Z_TYPE_P(dataTypes) == IS_ARRAY;
@@ -60101,7 +60102,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 							zephir_check_call_status();
 						}
 					} else {
-						zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 558);
+						zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 555);
 						if (Z_TYPE_P(&castValue) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&castValue), _30$$53, _31$$53, _28$$53)
 							{
@@ -60161,7 +60162,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 						ZEPHIR_CALL_METHOD(NULL, statement, "bindvalue", &_9, 0, &parameter, &value);
 						zephir_check_call_status();
 					} else {
-						zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 566);
+						zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 563);
 						if (Z_TYPE_P(&value) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&value), _38$$62, _39$$62, _36$$62)
 							{
@@ -60432,7 +60433,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, query)
 	ZEPHIR_CALL_METHOD(&statement, &_0, "prepare", NULL, 0, &sqlStatement);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&statement) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Cannot prepare statement", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 720);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Cannot prepare statement", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 717);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "preparerealsql", NULL, 0, &sqlStatement, &bindParams);
@@ -60458,19 +60459,22 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, query)
 static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, rollback)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, transactionLevel = 0;
-	zval *nesting_param = NULL, eventsManager, savepointName, _0, _5, _6, _1$$4, _2$$5, _7$$8;
-	zend_bool nesting, _3, _4;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *nesting_param = NULL, eventsManager, savepointName, _0, _1, _4, _7, _9, _2$$4, _3$$5, _8$$6, _10$$8;
+	zend_bool nesting, _5, _6;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&savepointName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_5);
-	ZVAL_UNDEF(&_6);
-	ZVAL_UNDEF(&_1$$4);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_7$$8);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_2$$4);
+	ZVAL_UNDEF(&_3$$5);
+	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_10$$8);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -60489,52 +60493,53 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, rollback)
 	}
 
 
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC);
-	transactionLevel = zephir_get_intval(&_0);
-	if (UNEXPECTED(!transactionLevel)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 759);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 0)) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 755);
 		return;
 	}
-	if (transactionLevel == 1) {
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CPY_WRT(&eventsManager, &_1$$4);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_1, 1)) {
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CPY_WRT(&eventsManager, &_2$$4);
 		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_2$$5);
-			ZVAL_STRING(&_2$$5, "db:rollbackTransaction");
-			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_2$$5, this_ptr);
+			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_STRING(&_3$$5, "db:rollbackTransaction");
+			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_3$$5, this_ptr);
 			zephir_check_call_status();
 		}
 		RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_METHOD(&_1$$4, "rollback", NULL, 0);
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_2$$4, "rollback", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	_3 = !transactionLevel;
-	if (!(_3)) {
-		_3 = !nesting;
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	_5 = ZEPHIR_IS_LONG_IDENTICAL(&_4, 0);
+	if (!(_5)) {
+		_5 = !nesting;
 	}
-	_4 = _3;
-	if (!(_4)) {
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
+	_6 = _5;
+	if (!(_6)) {
+		ZEPHIR_CALL_METHOD(&_7, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
 		zephir_check_call_status();
-		_4 = !zephir_is_true(&_5);
+		_6 = !zephir_is_true(&_7);
 	}
-	if (_4) {
-		if (transactionLevel > 0) {
+	if (_6) {
+		zephir_read_property(&_8$$6, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+		if (ZEPHIR_GT_LONG(&_8$$6, 0)) {
 			RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
 		}
 		RETURN_MM_BOOL(0);
 	}
 	ZEPHIR_CALL_METHOD(&savepointName, this_ptr, "getnestedtransactionsavepointname", NULL, 0);
 	zephir_check_call_status();
-	zephir_read_property(&_6, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_6);
+	zephir_read_property(&_9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CPY_WRT(&eventsManager, &_9);
 	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_7$$8);
-		ZVAL_STRING(&_7$$8, "db:rollbackSavepoint");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_7$$8, this_ptr, &savepointName);
+		ZEPHIR_INIT_VAR(&_10$$8);
+		ZVAL_STRING(&_10$$8, "db:rollbackSavepoint");
+		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_10$$8, this_ptr, &savepointName);
 		zephir_check_call_status();
 	}
 	RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
@@ -60599,7 +60604,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql)
 	if (!(ZEPHIR_IS_EMPTY(&parameters))) {
 		ZEPHIR_INIT_VAR(&keys);
 		array_init(&keys);
-		zephir_is_iterable(&parameters, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 848);
+		zephir_is_iterable(&parameters, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 844);
 		if (Z_TYPE_P(&parameters) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&parameters), _2$$3, _3$$3, _0$$3)
 			{
@@ -60614,11 +60619,11 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql)
 				if (Z_TYPE_P(&key) == IS_STRING) {
 					ZEPHIR_INIT_NVAR(&_4$$5);
 					ZEPHIR_CONCAT_SVS(&_4$$5, "/:", &key, "/");
-					zephir_array_append(&keys, &_4$$5, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 834);
+					zephir_array_append(&keys, &_4$$5, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 830);
 				} else {
 					ZEPHIR_INIT_NVAR(&_5$$6);
 					ZVAL_STRING(&_5$$6, "/[?]/");
-					zephir_array_append(&keys, &_5$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 836);
+					zephir_array_append(&keys, &_5$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 832);
 				}
 				if (Z_TYPE_P(&value) == IS_STRING) {
 					ZEPHIR_INIT_NVAR(&_6$$7);
@@ -60652,11 +60657,11 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql)
 					if (Z_TYPE_P(&key) == IS_STRING) {
 						ZEPHIR_INIT_NVAR(&_10$$11);
 						ZEPHIR_CONCAT_SVS(&_10$$11, "/:", &key, "/");
-						zephir_array_append(&keys, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 834);
+						zephir_array_append(&keys, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 830);
 					} else {
 						ZEPHIR_INIT_NVAR(&_11$$12);
 						ZVAL_STRING(&_11$$12, "/[?]/");
-						zephir_array_append(&keys, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 836);
+						zephir_array_append(&keys, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 832);
 					}
 					if (Z_TYPE_P(&value) == IS_STRING) {
 						ZEPHIR_INIT_NVAR(&_12$$13);
@@ -65464,6 +65469,108 @@ ZEPHIR_INIT_CLASS(Phalcon_Flash_AbstractFlash)
 	return SUCCESS;
 }
 
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct)
+{
+	zval _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *escaper = NULL, escaper_sub, *session = NULL, session_sub, __$null, _0;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&escaper_sub);
+	ZVAL_UNDEF(&session_sub);
+	ZVAL_NULL(&__$null);
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(0, 2)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(escaper, phalcon_html_escaper_escaperinterface_ce)
+		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, phalcon_session_managerinterface_ce)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 0, 2, &escaper, &session);
+	if (!escaper) {
+		escaper = &escaper_sub;
+		escaper = &__$null;
+	}
+	if (!session) {
+		session = &session_sub;
+		session = &__$null;
+	}
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("escaperService"), escaper);
+	zephir_update_property_zval(this_ptr, ZEND_STRL("sessionService"), session);
+	ZEPHIR_INIT_VAR(&_0);
+	object_init_ex(&_0, phalcon_support_helper_str_interpolate_ce);
+	if (zephir_has_constructor(&_0)) {
+		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
+		zephir_check_call_status();
+	}
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("interpolator"), &_0);
+	ZEPHIR_INIT_VAR(&_1);
+	zephir_create_array(&_1, 4, 0);
+	add_assoc_stringl_ex(&_1, SL("error"), SL("errorMessage"));
+	add_assoc_stringl_ex(&_1, SL("notice"), SL("noticeMessage"));
+	add_assoc_stringl_ex(&_1, SL("success"), SL("successMessage"));
+	add_assoc_stringl_ex(&_1, SL("warning"), SL("warningMessage"));
+	zephir_update_property_zval(this_ptr, ZEND_STRL("cssClasses"), &_1);
+	ZEPHIR_MM_RESTORE();
+}
+
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, clear)
+{
+	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&_0);
+
+
+	ZEPHIR_MM_GROW();
+
+	ZEPHIR_INIT_VAR(&_0);
+	array_init(&_0);
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &_0);
+	ZEPHIR_MM_RESTORE();
+}
+
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, error)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *message_param = NULL, _0;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+	ZVAL_UNDEF(&_0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_STRING(&_0, "error");
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "message", NULL, 0, &_0, &message);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutoescape)
 {
 	zval *this_ptr = getThis();
@@ -65473,6 +65580,15 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutoescape)
 	RETURN_MEMBER(getThis(), "autoescape");
 }
 
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutomaticHtml)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "automaticHtml");
+}
+
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssClasses)
 {
 	zval *this_ptr = getThis();
@@ -65500,108 +65616,6 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, getCustomTemplate)
 	RETURN_MEMBER(getThis(), "customTemplate");
 }
 
-static PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct)
-{
-	zval _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *escaper = NULL, escaper_sub, *session = NULL, session_sub, __$null, _0;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&escaper_sub);
-	ZVAL_UNDEF(&session_sub);
-	ZVAL_NULL(&__$null);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(0, 2)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(escaper, phalcon_html_escaper_escaperinterface_ce)
-		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(session, phalcon_session_managerinterface_ce)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 0, 2, &escaper, &session);
-	if (!escaper) {
-		escaper = &escaper_sub;
-		escaper = &__$null;
-	}
-	if (!session) {
-		session = &session_sub;
-		session = &__$null;
-	}
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("escaperService"), escaper);
-	zephir_update_property_zval(this_ptr, ZEND_STRL("sessionService"), session);
-	ZEPHIR_INIT_VAR(&_0);
-	object_init_ex(&_0, phalcon_support_helper_str_interpolate_ce);
-	if (zephir_has_constructor(&_0)) {
-		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
-		zephir_check_call_status();
-	}
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("interpolator"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
-	zephir_create_array(&_1, 4, 0);
-	add_assoc_stringl_ex(&_1, SL("error"), SL("errorMessage"));
-	add_assoc_stringl_ex(&_1, SL("notice"), SL("noticeMessage"));
-	add_assoc_stringl_ex(&_1, SL("success"), SL("successMessage"));
-	add_assoc_stringl_ex(&_1, SL("warning"), SL("warningMessage"));
-	zephir_update_property_zval(this_ptr, ZEND_STRL("cssClasses"), &_1);
-	ZEPHIR_MM_RESTORE();
-}
-
-static PHP_METHOD(Phalcon_Flash_AbstractFlash, clear)
-{
-	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_MM_GROW();
-
-	ZEPHIR_INIT_VAR(&_0);
-	array_init(&_0);
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &_0);
-	ZEPHIR_MM_RESTORE();
-}
-
-static PHP_METHOD(Phalcon_Flash_AbstractFlash, error)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *message_param = NULL, _0;
-	zval message;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&message);
-	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(message)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &message_param);
-	zephir_get_strval(&message, message_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZVAL_STRING(&_0, "error");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "message", NULL, 0, &_0, &message);
-	zephir_check_call_status();
-	RETURN_MM();
-}
-
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getEscaperService)
 {
 	zend_bool _2;
@@ -65645,7 +65659,7 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, getEscaperService)
 		zephir_update_property_zval(this_ptr, ZEND_STRL("escaperService"), &_7$$4);
 		RETURN_MM_MEMBER(getThis(), "escaperService");
 	}
-	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "A dependency injection container is required to access the 'escaper' service", "phalcon/Flash/AbstractFlash.zep", 154);
+	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "A dependency injection container is required to access the 'escaper' service", "phalcon/Flash/AbstractFlash.zep", 194);
 	return;
 }
 
@@ -65903,7 +65917,7 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL, *_5 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *type_param = NULL, *message = NULL, message_sub, content, html, item, prepared, *_2, _3, _8, _1$$4, _6$$5, _7$$8;
+	zval *type_param = NULL, *message = NULL, message_sub, content, html, item, prepared, *_2, _3, _1$$4, _6$$5, _7$$8;
 	zval type;
 	zval *this_ptr = getThis();
 
@@ -65914,7 +65928,6 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 	ZVAL_UNDEF(&item);
 	ZVAL_UNDEF(&prepared);
 	ZVAL_UNDEF(&_3);
-	ZVAL_UNDEF(&_8);
 	ZVAL_UNDEF(&_1$$4);
 	ZVAL_UNDEF(&_6$$5);
 	ZVAL_UNDEF(&_7$$8);
@@ -65940,7 +65953,7 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 		_0 = Z_TYPE_P(message) != IS_STRING;
 	}
 	if (_0) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "The message must be an array or a string", "phalcon/Flash/AbstractFlash.zep", 294);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "The message must be an array or a string", "phalcon/Flash/AbstractFlash.zep", 334);
 		return;
 	}
 	if (Z_TYPE_P(message) != IS_ARRAY) {
@@ -65949,7 +65962,7 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 		zephir_array_fast_append(&_1$$4, message);
 		ZEPHIR_CPY_WRT(message, &_1$$4);
 	}
-	zephir_is_iterable(message, 0, "phalcon/Flash/AbstractFlash.zep", 320);
+	zephir_is_iterable(message, 0, "phalcon/Flash/AbstractFlash.zep", 360);
 	if (Z_TYPE_P(message) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(message), _2)
 		{
@@ -65994,11 +66007,7 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&item);
-	zephir_read_property(&_8, this_ptr, ZEND_STRL("implicitFlush"), PH_NOISY_CC | PH_READONLY);
-	if (!ZEPHIR_IS_TRUE_IDENTICAL(&_8)) {
-		RETURN_CCTOR(&content);
-	}
-	RETURN_MM_NULL();
+	RETURN_CCTOR(&content);
 }
 
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, warning)
@@ -66218,7 +66227,7 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, checkClasses)
 	ZVAL_STRING(&content, "");
 	if (zephir_array_isset(&collection, &type)) {
 		ZEPHIR_OBS_NVAR(&content);
-		zephir_array_fetch(&content, &collection, &type, PH_NOISY, "phalcon/Flash/AbstractFlash.zep", 448);
+		zephir_array_fetch(&content, &collection, &type, PH_NOISY, "phalcon/Flash/AbstractFlash.zep", 484);
 	}
 	if (1 != ZEPHIR_IS_EMPTY(&content)) {
 		if (Z_TYPE_P(&content) != IS_ARRAY) {
@@ -67775,40 +67784,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Filter_Validation, getData)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "data");
-}
-
-static PHP_METHOD(Phalcon_Filter_Validation, setValidators)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *validators_param = NULL;
-	zval validators;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&validators);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ARRAY(validators)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &validators_param);
-	zephir_get_arrval(&validators, validators_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("validators"), &validators);
-	RETURN_THIS();
-}
-
 static PHP_METHOD(Phalcon_Filter_Validation, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -68002,6 +67977,15 @@ static PHP_METHOD(Phalcon_Filter_Validation, bind)
 	RETURN_THIS();
 }
 
+static PHP_METHOD(Phalcon_Filter_Validation, getData)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "data");
+}
+
 static PHP_METHOD(Phalcon_Filter_Validation, getEntity)
 {
 	zval *this_ptr = getThis();
@@ -68190,7 +68174,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValueByData)
 	}
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		if (zephir_array_isset(data, &field)) {
-			zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 288);
+			zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 296);
 			RETURN_CTOR(&_1$$5);
 		}
 	}
@@ -68260,7 +68244,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue)
 			_1$$5 = Z_TYPE_P(&data) != IS_OBJECT;
 		}
 		if (UNEXPECTED(_1$$5)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 325);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 333);
 			return;
 		}
 		ZEPHIR_CALL_METHOD(&value, this_ptr, "getvaluebydata", NULL, 0, &data, &field);
@@ -68276,11 +68260,11 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue)
 		if (zephir_is_true(&fieldFilters)) {
 			ZEPHIR_CALL_METHOD(&container, this_ptr, "getdi", NULL, 0);
 			zephir_check_call_status();
-			if (Z_TYPE_P(&container) != IS_OBJECT) {
+			if (Z_TYPE_P(&container) == IS_NULL) {
 				ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_2, 0);
 				zephir_check_call_status();
-				if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 346);
+				if (Z_TYPE_P(&container) == IS_NULL) {
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 354);
 					return;
 				}
 			}
@@ -68290,7 +68274,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue)
 			zephir_check_call_status();
 			ZEPHIR_CPY_WRT(&filterService, &_3$$9);
 			if (UNEXPECTED(Z_TYPE_P(&filterService) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 353);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 361);
 				return;
 			}
 			ZEPHIR_CALL_METHOD(&_3$$9, &filterService, "sanitize", NULL, 0, &value, &fieldFilters);
@@ -68380,7 +68364,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, rules)
 	ZEPHIR_OBS_COPY_OR_DUP(&validators, validators_param);
 
 
-	zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 411);
+	zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 419);
 	if (Z_TYPE_P(&validators) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _0)
 		{
@@ -68432,7 +68416,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setEntity)
 
 
 	if (UNEXPECTED(Z_TYPE_P(entity) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 422);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 430);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("entity"), entity);
@@ -68463,7 +68447,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setFilters)
 
 
 	if (Z_TYPE_P(field) == IS_ARRAY) {
-		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 442);
+		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 450);
 		if (Z_TYPE_P(field) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3)
 			{
@@ -68491,7 +68475,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setFilters)
 	} else if (Z_TYPE_P(field) == IS_STRING) {
 		zephir_update_property_array(this_ptr, SL("filters"), field, filters);
 	} else {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 447);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 455);
 		return;
 	}
 	RETURN_THIS();
@@ -68522,6 +68506,31 @@ static PHP_METHOD(Phalcon_Filter_Validation, setLabels)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Filter_Validation, setValidators)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *validators_param = NULL;
+	zval validators;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&validators);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_ARRAY(validators)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &validators_param);
+	zephir_get_arrval(&validators, validators_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("validators"), &validators);
+	RETURN_THIS();
+}
+
 static PHP_METHOD(Phalcon_Filter_Validation, validate)
 {
 	zend_bool _2$$7;
@@ -68602,7 +68611,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&combinedFieldsValidators, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&validatorData) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 476);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 491);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_1);
@@ -68630,12 +68639,12 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 			_2$$7 = Z_TYPE_P(data) != IS_OBJECT;
 		}
 		if (UNEXPECTED(_2$$7)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 508);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 523);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data);
 	}
-	zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 539);
+	zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 554);
 	if (Z_TYPE_P(&validatorData) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _5, _6, _3)
 		{
@@ -68647,14 +68656,14 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 			}
 			ZEPHIR_INIT_NVAR(&validators);
 			ZVAL_COPY(&validators, _3);
-			zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 537);
+			zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
 			if (Z_TYPE_P(&validators) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _7$$9)
 				{
 					ZEPHIR_INIT_NVAR(&validator);
 					ZVAL_COPY(&validator, _7$$9);
 					if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&_9$$10, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -68686,7 +68695,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 					ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
 					zephir_check_call_status();
 						if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&_14$$15, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -68724,14 +68733,14 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&validators, &validatorData, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 537);
+				zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
 				if (Z_TYPE_P(&validators) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _18$$20)
 					{
 						ZEPHIR_INIT_NVAR(&validator);
 						ZVAL_COPY(&validator, _18$$20);
 						if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&_20$$21, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -68763,7 +68772,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 						ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
 						zephir_check_call_status();
 							if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 								return;
 							}
 							ZEPHIR_CALL_METHOD(&_24$$26, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -68793,22 +68802,22 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 	}
 	ZEPHIR_INIT_NVAR(&validators);
 	ZEPHIR_INIT_NVAR(&field);
-	zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 572);
+	zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 587);
 	if (Z_TYPE_P(&combinedFieldsValidators) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _28)
 		{
 			ZEPHIR_INIT_NVAR(&scope);
 			ZVAL_COPY(&scope, _28);
 			if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 541);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
 				return;
 			}
 			ZEPHIR_OBS_NVAR(&field);
-			zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 544);
+			zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
 			ZEPHIR_OBS_NVAR(&validator);
-			zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 545);
+			zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
 			if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 548);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
 				return;
 			}
 			ZEPHIR_CALL_METHOD(&_30$$31, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -68840,15 +68849,15 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
 			ZEPHIR_CALL_METHOD(&scope, &combinedFieldsValidators, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 541);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&field);
-				zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 544);
+				zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
 				ZEPHIR_OBS_NVAR(&validator);
-				zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 545);
+				zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
 				if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 548);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&_34$$37, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -68919,7 +68928,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 	ZEPHIR_INIT_VAR(&results);
 	array_init(&results);
 	if (Z_TYPE_P(field) == IS_ARRAY) {
-		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 600);
+		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 615);
 		if (Z_TYPE_P(field) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3)
 			{
@@ -68927,7 +68936,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 				ZVAL_COPY(&singleField, _0$$3);
 				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 289, &singleField, validator);
 				zephir_check_call_status();
-				zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592);
+				zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
 				if (zephir_fast_in_array(&__$false, &results)) {
 					RETURN_MM_BOOL(0);
 				}
@@ -68946,7 +68955,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 289, &singleField, validator);
 					zephir_check_call_status();
-					zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592);
+					zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
 					if (zephir_fast_in_array(&__$false, &results)) {
 						RETURN_MM_BOOL(0);
 					}
@@ -68971,7 +68980,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 			ZEPHIR_CALL_METHOD(&value, this_ptr, "getvalue", NULL, 0, field);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
-				zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 617);
+				zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 632);
 				if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&allowEmpty), _7$$11)
 					{
@@ -70952,13 +70961,13 @@ static PHP_METHOD(Phalcon_Filter_Validation_AbstractValidatorComposite, validate
 		ZEPHIR_CONCAT_VS(&_3$$3, &_2$$3, " does not have any validator added");
 		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 33);
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 41);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_4, this_ptr, "getvalidators", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 42);
+	zephir_is_iterable(&_4, 0, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 50);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -72303,18 +72312,20 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, __construct)
 
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate)
 {
+	zval _2;
 	zend_bool _1;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *validation, validation_sub, *field, field_sub, value, _0, _2, _3;
+	zval *validation, validation_sub, *field, field_sub, value, _0, _3, _4;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&validation_sub);
 	ZVAL_UNDEF(&field_sub);
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_2);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
@@ -72337,16 +72348,17 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate)
 	}
 	_1 = Z_TYPE_P(&value) == IS_LONG;
 	if (!(_1)) {
-		ZEPHIR_CALL_FUNCTION(&_2, "ctype_digit", NULL, 297, &value);
+		zephir_cast_to_string(&_2, &value);
+		ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 297, &_2);
 		zephir_check_call_status();
-		_1 = zephir_is_true(&_2);
+		_1 = zephir_is_true(&_3);
 	}
 	if (_1) {
 		RETURN_MM_BOOL(1);
 	}
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "messagefactory", NULL, 0, validation, field);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "messagefactory", NULL, 0, validation, field);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_3);
+	ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_4);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(0);
 }
@@ -73673,7 +73685,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Numericality, validate)
 	zephir_fast_str_replace(&_1, &_2, &_3, &value);
 	ZEPHIR_CPY_WRT(&value, &_1);
 	ZEPHIR_INIT_VAR(&pattern);
-	ZVAL_STRING(&pattern, "/((^[-]?[0-9,]+(.[0-9]+)?$)|(^[-]?[0-9.]+(,[0-9]+)?$))/");
+	ZVAL_STRING(&pattern, "/((^[-]?[0-9,]+(\\.[0-9]+)?$)|(^[-]?[0-9.]+(,[0-9]+)?$))/");
 	ZEPHIR_CALL_METHOD(&_4, this_ptr, "allowempty", NULL, 0, field, &value);
 	zephir_check_call_status();
 	if (zephir_is_true(&_4)) {
@@ -75664,108 +75676,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation_Validator_File_AbstractFile)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "messageFileEmpty");
-}
-
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *messageFileEmpty_param = NULL;
-	zval messageFileEmpty;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&messageFileEmpty);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(messageFileEmpty)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &messageFileEmpty_param);
-	zephir_get_strval(&messageFileEmpty, messageFileEmpty_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messageFileEmpty"), &messageFileEmpty);
-	RETURN_THIS();
-}
-
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "messageIniSize");
-}
-
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *messageIniSize_param = NULL;
-	zval messageIniSize;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&messageIniSize);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(messageIniSize)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &messageIniSize_param);
-	zephir_get_strval(&messageIniSize, messageIniSize_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messageIniSize"), &messageIniSize);
-	RETURN_THIS();
-}
-
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "messageValid");
-}
-
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *messageValid_param = NULL;
-	zval messageValid;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&messageValid);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(messageValid)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &messageValid_param);
-	zephir_get_strval(&messageValid, messageValid_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messageValid"), &messageValid);
-	RETURN_THIS();
-}
-
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload)
 {
 	zend_bool _1, _3;
@@ -76122,6 +76032,33 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getFile
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "messageFileEmpty");
+}
+
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "messageIniSize");
+}
+
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "messageValid");
+}
+
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty)
 {
 	zend_bool _0, _1;
@@ -76163,7 +76100,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllow
 	if (!(_0)) {
 		_1 = zephir_array_isset_string(&value, SL("error"));
 		if (_1) {
-			zephir_array_fetch_string(&_2, &value, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/AbstractFile.zep", 250);
+			zephir_array_fetch_string(&_2, &value, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/AbstractFile.zep", 280);
 			_1 = ZEPHIR_IS_LONG_IDENTICAL(&_2, 4);
 		}
 		_0 = _1;
@@ -76171,6 +76108,81 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllow
 	RETURN_MM_BOOL(_0);
 }
 
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *message_param = NULL;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messageFileEmpty"), &message);
+	ZEPHIR_MM_RESTORE();
+}
+
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *message_param = NULL;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messageIniSize"), &message);
+	ZEPHIR_MM_RESTORE();
+}
+
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *message_param = NULL;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messageValid"), &message);
+	ZEPHIR_MM_RESTORE();
+}
+
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkIsUploadedFile)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -77540,51 +77552,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Messages_Message)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Messages_Message, getCode)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "code");
-}
-
-static PHP_METHOD(Phalcon_Messages_Message, getField)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "field");
-}
-
-static PHP_METHOD(Phalcon_Messages_Message, getMessage)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "message");
-}
-
-static PHP_METHOD(Phalcon_Messages_Message, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
-static PHP_METHOD(Phalcon_Messages_Message, getMetaData)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "metaData");
-}
-
 static PHP_METHOD(Phalcon_Messages_Message, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -77666,6 +77633,51 @@ static PHP_METHOD(Phalcon_Messages_Message, __toString)
 	RETURN_MEMBER(getThis(), "message");
 }
 
+static PHP_METHOD(Phalcon_Messages_Message, getCode)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "code");
+}
+
+static PHP_METHOD(Phalcon_Messages_Message, getField)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "field");
+}
+
+static PHP_METHOD(Phalcon_Messages_Message, getMessage)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "message");
+}
+
+static PHP_METHOD(Phalcon_Messages_Message, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
+static PHP_METHOD(Phalcon_Messages_Message, getMetaData)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "metaData");
+}
+
 static PHP_METHOD(Phalcon_Messages_Message, jsonSerialize)
 {
 	zval _0;
@@ -78505,6 +78517,90 @@ ZEPHIR_INIT_CLASS(Phalcon_Events_Event)
 	return SUCCESS;
 }
 
+static PHP_METHOD(Phalcon_Events_Event, __construct)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zend_bool cancelable, _0;
+	zval *type_param = NULL, *source = NULL, source_sub, *data = NULL, data_sub, *cancelable_param = NULL, __$true, __$false, __$null, _1$$3, _2$$3, _3$$3;
+	zval type;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&type);
+	ZVAL_UNDEF(&source_sub);
+	ZVAL_UNDEF(&data_sub);
+	ZVAL_BOOL(&__$true, 1);
+	ZVAL_BOOL(&__$false, 0);
+	ZVAL_NULL(&__$null);
+	ZVAL_UNDEF(&_1$$3);
+	ZVAL_UNDEF(&_2$$3);
+	ZVAL_UNDEF(&_3$$3);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 4)
+		Z_PARAM_STR(type)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_ZVAL_OR_NULL(source)
+		Z_PARAM_ZVAL_OR_NULL(data)
+		Z_PARAM_BOOL(cancelable)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 3, &type_param, &source, &data, &cancelable_param);
+	if (UNEXPECTED(Z_TYPE_P(type_param) != IS_STRING && Z_TYPE_P(type_param) != IS_NULL)) {
+		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'type' must be of the type string"));
+		RETURN_MM_NULL();
+	}
+	if (EXPECTED(Z_TYPE_P(type_param) == IS_STRING)) {
+		zephir_get_strval(&type, type_param);
+	} else {
+		ZEPHIR_INIT_VAR(&type);
+	}
+	if (!source) {
+		source = &source_sub;
+		source = &__$null;
+	}
+	if (!data) {
+		data = &data_sub;
+		data = &__$null;
+	}
+	if (!cancelable_param) {
+		cancelable = 1;
+	} else {
+		cancelable = zephir_get_boolval(cancelable_param);
+	}
+
+
+	_0 = Z_TYPE_P(source) != IS_NULL;
+	if (_0) {
+		_0 = Z_TYPE_P(source) != IS_OBJECT;
+	}
+	if (UNEXPECTED(_0)) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_events_exception_ce);
+		ZEPHIR_INIT_VAR(&_2$$3);
+		zephir_gettype(&_2$$3, source);
+		ZEPHIR_INIT_VAR(&_3$$3);
+		ZEPHIR_CONCAT_SVSV(&_3$$3, "The source of ", &type, " event must be an object, got ", &_2$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3);
+		zephir_check_call_status();
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Events/Event.zep", 73);
+		ZEPHIR_MM_RESTORE();
+		return;
+	}
+	zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &type);
+	zephir_update_property_zval(this_ptr, ZEND_STRL("source"), source);
+	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data);
+	if (cancelable) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("cancelable"), &__$true);
+	} else {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("cancelable"), &__$false);
+	}
+	ZEPHIR_MM_RESTORE();
+}
+
 static PHP_METHOD(Phalcon_Events_Event, getData)
 {
 	zval *this_ptr = getThis();
@@ -78532,90 +78628,6 @@ static PHP_METHOD(Phalcon_Events_Event, getType)
 	RETURN_MEMBER(getThis(), "type");
 }
 
-static PHP_METHOD(Phalcon_Events_Event, __construct)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zend_bool cancelable, _0;
-	zval *type_param = NULL, *source = NULL, source_sub, *data = NULL, data_sub, *cancelable_param = NULL, __$true, __$false, __$null, _1$$3, _2$$3, _3$$3;
-	zval type;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&type);
-	ZVAL_UNDEF(&source_sub);
-	ZVAL_UNDEF(&data_sub);
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
-	ZVAL_NULL(&__$null);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$3);
-	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 4)
-		Z_PARAM_STR(type)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_ZVAL_OR_NULL(source)
-		Z_PARAM_ZVAL_OR_NULL(data)
-		Z_PARAM_BOOL(cancelable)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 3, &type_param, &source, &data, &cancelable_param);
-	if (UNEXPECTED(Z_TYPE_P(type_param) != IS_STRING && Z_TYPE_P(type_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'type' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(type_param) == IS_STRING)) {
-		zephir_get_strval(&type, type_param);
-	} else {
-		ZEPHIR_INIT_VAR(&type);
-	}
-	if (!source) {
-		source = &source_sub;
-		source = &__$null;
-	}
-	if (!data) {
-		data = &data_sub;
-		data = &__$null;
-	}
-	if (!cancelable_param) {
-		cancelable = 1;
-	} else {
-		cancelable = zephir_get_boolval(cancelable_param);
-	}
-
-
-	_0 = Z_TYPE_P(source) != IS_NULL;
-	if (_0) {
-		_0 = Z_TYPE_P(source) != IS_OBJECT;
-	}
-	if (UNEXPECTED(_0)) {
-		ZEPHIR_INIT_VAR(&_1$$3);
-		object_init_ex(&_1$$3, phalcon_events_exception_ce);
-		ZEPHIR_INIT_VAR(&_2$$3);
-		zephir_gettype(&_2$$3, source);
-		ZEPHIR_INIT_VAR(&_3$$3);
-		ZEPHIR_CONCAT_SVSV(&_3$$3, "The source of ", &type, " event must be an object, got ", &_2$$3);
-		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3);
-		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Events/Event.zep", 73);
-		ZEPHIR_MM_RESTORE();
-		return;
-	}
-	zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &type);
-	zephir_update_property_zval(this_ptr, ZEND_STRL("source"), source);
-	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data);
-	if (cancelable) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("cancelable"), &__$true);
-	} else {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("cancelable"), &__$false);
-	}
-	ZEPHIR_MM_RESTORE();
-}
-
 static PHP_METHOD(Phalcon_Events_Event, isCancelable)
 {
 	zval *this_ptr = getThis();
@@ -78707,7 +78719,7 @@ static PHP_METHOD(Phalcon_Events_Event, stop)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("cancelable"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!zephir_is_true(&_0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_events_exception_ce, "Trying to cancel a non-cancelable event", "phalcon/Events/Event.zep", 135);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_events_exception_ce, "Trying to cancel a non-cancelable event", "phalcon/Events/Event.zep", 150);
 		return;
 	}
 	if (1) {
@@ -80588,7 +80600,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_NativeArray, paginate)
 	}
 	ZVAL_LONG(&_0, (show * ((pageNumber - 1))));
 	ZVAL_LONG(&_4, show);
-	ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 503, &items, &_0, &_4);
+	ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 499, &items, &_0, &_4);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&items, &_5);
 	if (pageNumber < totalPages) {
@@ -85357,7 +85369,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 153);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&comment) == IS_STRING) {
+	if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 		ZEPHIR_INIT_VAR(&classAnnotations);
 		ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 154);
 		zephir_check_call_status();
@@ -85377,7 +85389,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 		zephir_array_keys(&arrayKeys, &constants);
 		ZEPHIR_INIT_VAR(&anotationsConstants);
 		array_init(&anotationsConstants);
-		zephir_is_iterable(&arrayKeys, 0, "phalcon/Annotations/Reader.zep", 93);
+		zephir_is_iterable(&arrayKeys, 0, "phalcon/Annotations/Reader.zep", 92);
 		if (Z_TYPE_P(&arrayKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arrayKeys), _2$$5)
 			{
@@ -85387,7 +85399,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0);
 				zephir_check_call_status();
-				if (Z_TYPE_P(&comment) == IS_STRING) {
+				if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 					ZEPHIR_INIT_NVAR(&constantAnnotations);
 					ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 154);
 					zephir_check_call_status();
@@ -85414,7 +85426,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 					zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0);
 					zephir_check_call_status();
-					if (Z_TYPE_P(&comment) == IS_STRING) {
+					if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 						ZEPHIR_INIT_NVAR(&constantAnnotations);
 						ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 154);
 						zephir_check_call_status();
@@ -85440,7 +85452,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 		line = 1;
 		ZEPHIR_INIT_VAR(&annotationsProperties);
 		array_init(&annotationsProperties);
-		zephir_is_iterable(&properties, 0, "phalcon/Annotations/Reader.zep", 132);
+		zephir_is_iterable(&properties, 0, "phalcon/Annotations/Reader.zep", 130);
 		if (Z_TYPE_P(&properties) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&properties), _9$$13)
 			{
@@ -85448,7 +85460,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				ZVAL_COPY(&property, _9$$13);
 				ZEPHIR_CALL_METHOD(&comment, &property, "getdoccomment", NULL, 0);
 				zephir_check_call_status();
-				if (Z_TYPE_P(&comment) == IS_STRING) {
+				if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 					ZEPHIR_INIT_NVAR(&propertyAnnotations);
 					ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 154);
 					zephir_check_call_status();
@@ -85475,7 +85487,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&comment, &property, "getdoccomment", NULL, 0);
 					zephir_check_call_status();
-					if (Z_TYPE_P(&comment) == IS_STRING) {
+					if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 						ZEPHIR_INIT_NVAR(&propertyAnnotations);
 						ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 154);
 						zephir_check_call_status();
@@ -85499,10 +85511,10 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 	}
 	ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 159);
 	zephir_check_call_status();
-	if (zephir_fast_count_int(&methods)) {
+	if (0 == ZEPHIR_IS_EMPTY(&methods)) {
 		ZEPHIR_INIT_VAR(&annotationsMethods);
 		array_init(&annotationsMethods);
-		zephir_is_iterable(&methods, 0, "phalcon/Annotations/Reader.zep", 167);
+		zephir_is_iterable(&methods, 0, "phalcon/Annotations/Reader.zep", 164);
 		if (Z_TYPE_P(&methods) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&methods), _17$$21)
 			{
@@ -85510,7 +85522,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				ZVAL_COPY(&method, _17$$21);
 				ZEPHIR_CALL_METHOD(&comment, &method, "getdoccomment", NULL, 0);
 				zephir_check_call_status();
-				if (Z_TYPE_P(&comment) == IS_STRING) {
+				if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 					ZEPHIR_INIT_NVAR(&methodAnnotations);
 					ZEPHIR_CALL_METHOD(&_19$$23, &method, "getfilename", NULL, 0);
 					zephir_check_call_status();
@@ -85538,7 +85550,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&comment, &method, "getdoccomment", NULL, 0);
 					zephir_check_call_status();
-					if (Z_TYPE_P(&comment) == IS_STRING) {
+					if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 						ZEPHIR_INIT_NVAR(&methodAnnotations);
 						ZEPHIR_CALL_METHOD(&_22$$26, &method, "getfilename", NULL, 0);
 						zephir_check_call_status();
@@ -85687,13 +85699,11 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, __construct)
 
 static PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations)
 {
+	zval reflectionClass, _0, _1$$3, _2$$4;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionClass, _0, _1$$3, _2$$4;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionClass);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
@@ -85711,12 +85721,6 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations)
 			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 34, &reflectionClass);
 			zephir_check_call_status();
 			zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &_2$$4);
-		} else {
-			if (0) {
-				zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &__$true);
-			} else {
-				zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &__$false);
-			}
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "classAnnotations");
@@ -85724,87 +85728,76 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations)
 
 static PHP_METHOD(Phalcon_Annotations_Reflection, getConstantsAnnotations)
 {
-	zend_string *_6$$5;
-	zend_ulong _5$$5;
+	zend_string *_5$$4;
+	zend_ulong _4$$4;
+	zend_bool _1$$3;
+	zval reflectionConstants, constant, reflectionConstant, _0, *_2$$4, _3$$4, _6$$5, _8$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionConstants, constant, reflectionConstant, _0, _1$$3, _2$$5, *_3$$5, _4$$5, _7$$6, _9$$7;
-	zephir_fcall_cache_entry *_8 = NULL;
+	zephir_fcall_cache_entry *_7 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionConstants);
 	ZVAL_UNDEF(&constant);
 	ZVAL_UNDEF(&reflectionConstant);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_7$$6);
-	ZVAL_UNDEF(&_9$$7);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$6);
 
 
 	ZEPHIR_MM_GROW();
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("constantAnnotations"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_NULL) {
-		ZEPHIR_OBS_VAR(&reflectionConstants);
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset_string_fetch(&reflectionConstants, &_1$$3, SL("constants"), 0)) {
-			if (zephir_fast_count_int(&reflectionConstants)) {
-				ZEPHIR_INIT_VAR(&_2$$5);
-				array_init(&_2$$5);
-				zephir_update_property_zval(this_ptr, ZEND_STRL("constantAnnotations"), &_2$$5);
-				zephir_is_iterable(&reflectionConstants, 0, "phalcon/Annotations/Reflection.zep", 106);
-				if (Z_TYPE_P(&reflectionConstants) == IS_ARRAY) {
-					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionConstants), _5$$5, _6$$5, _3$$5)
-					{
-						ZEPHIR_INIT_NVAR(&constant);
-						if (_6$$5 != NULL) { 
-							ZVAL_STR_COPY(&constant, _6$$5);
-						} else {
-							ZVAL_LONG(&constant, _5$$5);
-						}
-						ZEPHIR_INIT_NVAR(&reflectionConstant);
-						ZVAL_COPY(&reflectionConstant, _3$$5);
-						ZEPHIR_INIT_NVAR(&_7$$6);
-						object_init_ex(&_7$$6, phalcon_annotations_collection_ce);
-						ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 34, &reflectionConstant);
-						zephir_check_call_status();
-						zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_7$$6);
-					} ZEND_HASH_FOREACH_END();
-				} else {
-					ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "rewind", NULL, 0);
+	ZEPHIR_OBS_VAR(&reflectionConstants);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
+	if (zephir_array_isset_string_fetch(&reflectionConstants, &_0, SL("constants"), 0)) {
+		_1$$3 = Z_TYPE_P(&reflectionConstants) == IS_ARRAY;
+		if (_1$$3) {
+			_1$$3 = zephir_fast_count_int(&reflectionConstants) > 0;
+		}
+		if (_1$$3) {
+			zephir_is_iterable(&reflectionConstants, 0, "phalcon/Annotations/Reflection.zep", 97);
+			if (Z_TYPE_P(&reflectionConstants) == IS_ARRAY) {
+				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionConstants), _4$$4, _5$$4, _2$$4)
+				{
+					ZEPHIR_INIT_NVAR(&constant);
+					if (_5$$4 != NULL) { 
+						ZVAL_STR_COPY(&constant, _5$$4);
+					} else {
+						ZVAL_LONG(&constant, _4$$4);
+					}
+					ZEPHIR_INIT_NVAR(&reflectionConstant);
+					ZVAL_COPY(&reflectionConstant, _2$$4);
+					ZEPHIR_INIT_NVAR(&_6$$5);
+					object_init_ex(&_6$$5, phalcon_annotations_collection_ce);
+					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_7, 34, &reflectionConstant);
 					zephir_check_call_status();
-					while (1) {
-						ZEPHIR_CALL_METHOD(&_4$$5, &reflectionConstants, "valid", NULL, 0);
-						zephir_check_call_status();
-						if (!zend_is_true(&_4$$5)) {
-							break;
-						}
-						ZEPHIR_CALL_METHOD(&constant, &reflectionConstants, "key", NULL, 0);
-						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&reflectionConstant, &reflectionConstants, "current", NULL, 0);
-						zephir_check_call_status();
-							ZEPHIR_INIT_NVAR(&_9$$7);
-							object_init_ex(&_9$$7, phalcon_annotations_collection_ce);
-							ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 34, &reflectionConstant);
-							zephir_check_call_status();
-							zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_9$$7);
-						ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "next", NULL, 0);
-						zephir_check_call_status();
+					zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_6$$5);
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "rewind", NULL, 0);
+				zephir_check_call_status();
+				while (1) {
+					ZEPHIR_CALL_METHOD(&_3$$4, &reflectionConstants, "valid", NULL, 0);
+					zephir_check_call_status();
+					if (!zend_is_true(&_3$$4)) {
+						break;
 					}
+					ZEPHIR_CALL_METHOD(&constant, &reflectionConstants, "key", NULL, 0);
+					zephir_check_call_status();
+					ZEPHIR_CALL_METHOD(&reflectionConstant, &reflectionConstants, "current", NULL, 0);
+					zephir_check_call_status();
+						ZEPHIR_INIT_NVAR(&_8$$6);
+						object_init_ex(&_8$$6, phalcon_annotations_collection_ce);
+						ZEPHIR_CALL_METHOD(NULL, &_8$$6, "__construct", &_7, 34, &reflectionConstant);
+						zephir_check_call_status();
+						zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_8$$6);
+					ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "next", NULL, 0);
+					zephir_check_call_status();
 				}
-				ZEPHIR_INIT_NVAR(&reflectionConstant);
-				ZEPHIR_INIT_NVAR(&constant);
-				RETURN_MM_MEMBER(getThis(), "constantAnnotations");
 			}
-		}
-		if (0) {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("constantAnnotations"), &__$true);
-		} else {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("constantAnnotations"), &__$false);
+			ZEPHIR_INIT_NVAR(&reflectionConstant);
+			ZEPHIR_INIT_NVAR(&constant);
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "constantAnnotations");
@@ -85812,87 +85805,76 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getConstantsAnnotations)
 
 static PHP_METHOD(Phalcon_Annotations_Reflection, getPropertiesAnnotations)
 {
-	zend_string *_6$$5;
-	zend_ulong _5$$5;
+	zend_string *_5$$4;
+	zend_ulong _4$$4;
+	zend_bool _1$$3;
+	zval reflectionProperties, property, reflectionProperty, _0, *_2$$4, _3$$4, _6$$5, _8$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionProperties, property, reflectionProperty, _0, _1$$3, _2$$5, *_3$$5, _4$$5, _7$$6, _9$$7;
-	zephir_fcall_cache_entry *_8 = NULL;
+	zephir_fcall_cache_entry *_7 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionProperties);
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&reflectionProperty);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_7$$6);
-	ZVAL_UNDEF(&_9$$7);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$6);
 
 
 	ZEPHIR_MM_GROW();
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("propertyAnnotations"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_NULL) {
-		ZEPHIR_OBS_VAR(&reflectionProperties);
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset_string_fetch(&reflectionProperties, &_1$$3, SL("properties"), 0)) {
-			if (zephir_fast_count_int(&reflectionProperties)) {
-				ZEPHIR_INIT_VAR(&_2$$5);
-				array_init(&_2$$5);
-				zephir_update_property_zval(this_ptr, ZEND_STRL("propertyAnnotations"), &_2$$5);
-				zephir_is_iterable(&reflectionProperties, 0, "phalcon/Annotations/Reflection.zep", 134);
-				if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) {
-					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionProperties), _5$$5, _6$$5, _3$$5)
-					{
-						ZEPHIR_INIT_NVAR(&property);
-						if (_6$$5 != NULL) { 
-							ZVAL_STR_COPY(&property, _6$$5);
-						} else {
-							ZVAL_LONG(&property, _5$$5);
-						}
-						ZEPHIR_INIT_NVAR(&reflectionProperty);
-						ZVAL_COPY(&reflectionProperty, _3$$5);
-						ZEPHIR_INIT_NVAR(&_7$$6);
-						object_init_ex(&_7$$6, phalcon_annotations_collection_ce);
-						ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 34, &reflectionProperty);
-						zephir_check_call_status();
-						zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_7$$6);
-					} ZEND_HASH_FOREACH_END();
-				} else {
-					ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "rewind", NULL, 0);
+	ZEPHIR_OBS_VAR(&reflectionProperties);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
+	if (zephir_array_isset_string_fetch(&reflectionProperties, &_0, SL("properties"), 0)) {
+		_1$$3 = Z_TYPE_P(&reflectionProperties) == IS_ARRAY;
+		if (_1$$3) {
+			_1$$3 = zephir_fast_count_int(&reflectionProperties) > 0;
+		}
+		if (_1$$3) {
+			zephir_is_iterable(&reflectionProperties, 0, "phalcon/Annotations/Reflection.zep", 119);
+			if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) {
+				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionProperties), _4$$4, _5$$4, _2$$4)
+				{
+					ZEPHIR_INIT_NVAR(&property);
+					if (_5$$4 != NULL) { 
+						ZVAL_STR_COPY(&property, _5$$4);
+					} else {
+						ZVAL_LONG(&property, _4$$4);
+					}
+					ZEPHIR_INIT_NVAR(&reflectionProperty);
+					ZVAL_COPY(&reflectionProperty, _2$$4);
+					ZEPHIR_INIT_NVAR(&_6$$5);
+					object_init_ex(&_6$$5, phalcon_annotations_collection_ce);
+					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_7, 34, &reflectionProperty);
 					zephir_check_call_status();
-					while (1) {
-						ZEPHIR_CALL_METHOD(&_4$$5, &reflectionProperties, "valid", NULL, 0);
-						zephir_check_call_status();
-						if (!zend_is_true(&_4$$5)) {
-							break;
-						}
-						ZEPHIR_CALL_METHOD(&property, &reflectionProperties, "key", NULL, 0);
-						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&reflectionProperty, &reflectionProperties, "current", NULL, 0);
-						zephir_check_call_status();
-							ZEPHIR_INIT_NVAR(&_9$$7);
-							object_init_ex(&_9$$7, phalcon_annotations_collection_ce);
-							ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 34, &reflectionProperty);
-							zephir_check_call_status();
-							zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_9$$7);
-						ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "next", NULL, 0);
-						zephir_check_call_status();
+					zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_6$$5);
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "rewind", NULL, 0);
+				zephir_check_call_status();
+				while (1) {
+					ZEPHIR_CALL_METHOD(&_3$$4, &reflectionProperties, "valid", NULL, 0);
+					zephir_check_call_status();
+					if (!zend_is_true(&_3$$4)) {
+						break;
 					}
+					ZEPHIR_CALL_METHOD(&property, &reflectionProperties, "key", NULL, 0);
+					zephir_check_call_status();
+					ZEPHIR_CALL_METHOD(&reflectionProperty, &reflectionProperties, "current", NULL, 0);
+					zephir_check_call_status();
+						ZEPHIR_INIT_NVAR(&_8$$6);
+						object_init_ex(&_8$$6, phalcon_annotations_collection_ce);
+						ZEPHIR_CALL_METHOD(NULL, &_8$$6, "__construct", &_7, 34, &reflectionProperty);
+						zephir_check_call_status();
+						zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_8$$6);
+					ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "next", NULL, 0);
+					zephir_check_call_status();
 				}
-				ZEPHIR_INIT_NVAR(&reflectionProperty);
-				ZEPHIR_INIT_NVAR(&property);
-				RETURN_MM_MEMBER(getThis(), "propertyAnnotations");
 			}
-		}
-		if (0) {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("propertyAnnotations"), &__$true);
-		} else {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("propertyAnnotations"), &__$false);
+			ZEPHIR_INIT_NVAR(&reflectionProperty);
+			ZEPHIR_INIT_NVAR(&property);
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "propertyAnnotations");
@@ -85900,87 +85882,76 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getPropertiesAnnotations)
 
 static PHP_METHOD(Phalcon_Annotations_Reflection, getMethodsAnnotations)
 {
-	zend_string *_6$$5;
-	zend_ulong _5$$5;
+	zend_string *_5$$4;
+	zend_ulong _4$$4;
+	zend_bool _1$$3;
+	zval reflectionMethods, methodName, reflectionMethod, _0, *_2$$4, _3$$4, _6$$5, _8$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionMethods, methodName, reflectionMethod, _0, _1$$3, _2$$5, *_3$$5, _4$$5, _7$$6, _9$$7;
-	zephir_fcall_cache_entry *_8 = NULL;
+	zephir_fcall_cache_entry *_7 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionMethods);
 	ZVAL_UNDEF(&methodName);
 	ZVAL_UNDEF(&reflectionMethod);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_7$$6);
-	ZVAL_UNDEF(&_9$$7);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$6);
 
 
 	ZEPHIR_MM_GROW();
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("methodAnnotations"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_NULL) {
-		ZEPHIR_OBS_VAR(&reflectionMethods);
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset_string_fetch(&reflectionMethods, &_1$$3, SL("methods"), 0)) {
-			if (zephir_fast_count_int(&reflectionMethods)) {
-				ZEPHIR_INIT_VAR(&_2$$5);
-				array_init(&_2$$5);
-				zephir_update_property_zval(this_ptr, ZEND_STRL("methodAnnotations"), &_2$$5);
-				zephir_is_iterable(&reflectionMethods, 0, "phalcon/Annotations/Reflection.zep", 162);
-				if (Z_TYPE_P(&reflectionMethods) == IS_ARRAY) {
-					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionMethods), _5$$5, _6$$5, _3$$5)
-					{
-						ZEPHIR_INIT_NVAR(&methodName);
-						if (_6$$5 != NULL) { 
-							ZVAL_STR_COPY(&methodName, _6$$5);
-						} else {
-							ZVAL_LONG(&methodName, _5$$5);
-						}
-						ZEPHIR_INIT_NVAR(&reflectionMethod);
-						ZVAL_COPY(&reflectionMethod, _3$$5);
-						ZEPHIR_INIT_NVAR(&_7$$6);
-						object_init_ex(&_7$$6, phalcon_annotations_collection_ce);
-						ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 34, &reflectionMethod);
-						zephir_check_call_status();
-						zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_7$$6);
-					} ZEND_HASH_FOREACH_END();
-				} else {
-					ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "rewind", NULL, 0);
+	ZEPHIR_OBS_VAR(&reflectionMethods);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
+	if (zephir_array_isset_string_fetch(&reflectionMethods, &_0, SL("methods"), 0)) {
+		_1$$3 = Z_TYPE_P(&reflectionMethods) == IS_ARRAY;
+		if (_1$$3) {
+			_1$$3 = zephir_fast_count_int(&reflectionMethods) > 0;
+		}
+		if (_1$$3) {
+			zephir_is_iterable(&reflectionMethods, 0, "phalcon/Annotations/Reflection.zep", 141);
+			if (Z_TYPE_P(&reflectionMethods) == IS_ARRAY) {
+				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionMethods), _4$$4, _5$$4, _2$$4)
+				{
+					ZEPHIR_INIT_NVAR(&methodName);
+					if (_5$$4 != NULL) { 
+						ZVAL_STR_COPY(&methodName, _5$$4);
+					} else {
+						ZVAL_LONG(&methodName, _4$$4);
+					}
+					ZEPHIR_INIT_NVAR(&reflectionMethod);
+					ZVAL_COPY(&reflectionMethod, _2$$4);
+					ZEPHIR_INIT_NVAR(&_6$$5);
+					object_init_ex(&_6$$5, phalcon_annotations_collection_ce);
+					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_7, 34, &reflectionMethod);
 					zephir_check_call_status();
-					while (1) {
-						ZEPHIR_CALL_METHOD(&_4$$5, &reflectionMethods, "valid", NULL, 0);
-						zephir_check_call_status();
-						if (!zend_is_true(&_4$$5)) {
-							break;
-						}
-						ZEPHIR_CALL_METHOD(&methodName, &reflectionMethods, "key", NULL, 0);
-						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&reflectionMethod, &reflectionMethods, "current", NULL, 0);
-						zephir_check_call_status();
-							ZEPHIR_INIT_NVAR(&_9$$7);
-							object_init_ex(&_9$$7, phalcon_annotations_collection_ce);
-							ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 34, &reflectionMethod);
-							zephir_check_call_status();
-							zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_9$$7);
-						ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "next", NULL, 0);
-						zephir_check_call_status();
+					zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_6$$5);
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "rewind", NULL, 0);
+				zephir_check_call_status();
+				while (1) {
+					ZEPHIR_CALL_METHOD(&_3$$4, &reflectionMethods, "valid", NULL, 0);
+					zephir_check_call_status();
+					if (!zend_is_true(&_3$$4)) {
+						break;
 					}
+					ZEPHIR_CALL_METHOD(&methodName, &reflectionMethods, "key", NULL, 0);
+					zephir_check_call_status();
+					ZEPHIR_CALL_METHOD(&reflectionMethod, &reflectionMethods, "current", NULL, 0);
+					zephir_check_call_status();
+						ZEPHIR_INIT_NVAR(&_8$$6);
+						object_init_ex(&_8$$6, phalcon_annotations_collection_ce);
+						ZEPHIR_CALL_METHOD(NULL, &_8$$6, "__construct", &_7, 34, &reflectionMethod);
+						zephir_check_call_status();
+						zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_8$$6);
+					ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "next", NULL, 0);
+					zephir_check_call_status();
 				}
-				ZEPHIR_INIT_NVAR(&reflectionMethod);
-				ZEPHIR_INIT_NVAR(&methodName);
-				RETURN_MM_MEMBER(getThis(), "methodAnnotations");
 			}
-		}
-		if (0) {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("methodAnnotations"), &__$true);
-		} else {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("methodAnnotations"), &__$false);
+			ZEPHIR_INIT_NVAR(&reflectionMethod);
+			ZEPHIR_INIT_NVAR(&methodName);
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "methodAnnotations");
@@ -85997,10 +85968,16 @@ static PHP_METHOD(Phalcon_Annotations_Reflection, getReflectionData)
 
 zend_object *zephir_init_properties_Phalcon_Annotations_Reflection(zend_class_entry *class_type)
 {
-		zval _0, _1$$3;
+		zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_1$$3);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_5$$5);
+	ZVAL_UNDEF(&_7$$6);
 	
 
 		ZEPHIR_MM_GROW();
@@ -86014,6 +85991,24 @@ zend_object *zephir_init_properties_Phalcon_Annotations_Reflection(zend_class_en
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("reflectionData"), &_1$$3);
 		}
+		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("methodAnnotations"), 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("methodAnnotations"), &_3$$4);
+		}
+		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("propertyAnnotations"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_4) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_5$$5);
+			array_init(&_5$$5);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("propertyAnnotations"), &_5$$5);
+		}
+		zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("constantAnnotations"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_6) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_7$$6);
+			array_init(&_7$$6);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("constantAnnotations"), &_7$$6);
+		}
 		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
@@ -87249,9 +87244,8 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, getReader)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("reader"), PH_NOISY_CC);
-	if (Z_TYPE_P(&_0) != IS_OBJECT) {
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reader"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$3);
 		object_init_ex(&_1$$3, phalcon_annotations_reader_ce);
 		if (zephir_has_constructor(&_1$$3)) {
@@ -90361,7 +90355,7 @@ static PHP_METHOD(Phalcon_Support_Debug, onUncaughtException)
 	ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 0);
 	zephir_check_call_status();
 	if (ZEPHIR_GT_LONG(&obLevel, 0)) {
-		ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+		ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 		zephir_check_call_status();
 	}
 	zephir_read_static_property_ce(&_0, phalcon_support_debug_ce, SL("isActive"), PH_NOISY_CC | PH_READONLY);
@@ -92678,10 +92672,10 @@ static PHP_METHOD(Phalcon_Support_Version, getVersion)
 	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(return_value, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZVAL_LONG(&_0, 3);
+	ZVAL_LONG(&_0, 4);
 	zephir_array_fast_append(return_value, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZVAL_LONG(&_0, 4);
+	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(return_value, &_0);
 	RETURN_MM();
 }
@@ -93483,7 +93477,7 @@ static 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, 479, &filtered);
+	ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 475, &filtered);
 	ZEPHIR_UNREF(&filtered);
 	zephir_check_call_status();
 	RETURN_MM();
@@ -94780,7 +94774,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_SliceLeft, __invoke)
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, elements);
-	ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, &collection, &_0, &_1);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 499, &collection, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -94833,7 +94827,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_SliceRight, __invoke)
 
 
 	ZVAL_LONG(&_0, elements);
-	ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, &collection, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 499, &collection, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -95501,15 +95495,15 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke)
 		return;
 	}
 	ZEPHIR_MAKE_REF(&arguments);
-	ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 479, &arguments);
+	ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 475, &arguments);
 	ZEPHIR_UNREF(&arguments);
 	zephir_check_call_status();
 	ZVAL_LONG(&_0, 1);
-	ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 503, &arguments, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 499, &arguments, &_0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&arguments, &_1);
 	ZEPHIR_MAKE_REF(&arguments);
-	ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 479, &arguments);
+	ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 475, &arguments);
 	ZEPHIR_UNREF(&arguments);
 	zephir_check_call_status();
 	ZEPHIR_MAKE_REF(&arguments);
@@ -98172,43 +98166,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Support_Debug_Dump)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "detailed");
-}
-
-static PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed)
-{
-	zval *detailed_param = NULL, __$true, __$false;
-	zend_bool detailed;
-	zval *this_ptr = getThis();
-
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_BOOL(detailed)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	zephir_fetch_params_without_memory_grow(1, 0, &detailed_param);
-	detailed = zephir_get_boolval(detailed_param);
-
-
-	if (detailed) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$true);
-	} else {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$false);
-	}
-	RETURN_THISW();
-}
-
 static PHP_METHOD(Phalcon_Support_Debug_Dump, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -98283,6 +98240,42 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, all)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "detailed");
+}
+
+static PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed)
+{
+	zval *detailed_param = NULL, __$true, __$false;
+	zend_bool detailed;
+	zval *this_ptr = getThis();
+
+	ZVAL_BOOL(&__$true, 1);
+	ZVAL_BOOL(&__$false, 0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_BOOL(detailed)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	zephir_fetch_params_without_memory_grow(1, 0, &detailed_param);
+	detailed = zephir_get_boolval(detailed_param);
+
+
+	if (detailed) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$true);
+	} else {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$false);
+	}
+}
+
 static PHP_METHOD(Phalcon_Support_Debug_Dump, one)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -98469,7 +98462,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, variables)
 	ZEPHIR_INIT_VAR(&output);
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_get_args(&_0);
-	zephir_is_iterable(&_0, 0, "phalcon/Support/Debug/Dump.zep", 181);
+	zephir_is_iterable(&_0, 0, "phalcon/Support/Debug/Dump.zep", 191);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _3, _4, _1)
 		{
@@ -98766,7 +98759,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output)
 		ZEPHIR_CALL_FUNCTION(&_2$$4, "strtr", NULL, 5, &_3$$4, &_1$$4);
 		zephir_check_call_status();
 		zephir_concat_self(&output, &_2$$4);
-		zephir_is_iterable(variable, 0, "phalcon/Support/Debug/Dump.zep", 231);
+		zephir_is_iterable(variable, 0, "phalcon/Support/Debug/Dump.zep", 241);
 		if (Z_TYPE_P(variable) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(variable), _6$$4, _7$$4, _4$$4)
 			{
@@ -98935,9 +98928,9 @@ static 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, 429, variable);
+			ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 425, variable);
 			zephir_check_call_status();
-			zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263);
+			zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 273);
 			if (Z_TYPE_P(&_46$$12) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_46$$12), _49$$12, _50$$12, _47$$12)
 				{
@@ -99031,7 +99024,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output)
 			ZVAL_LONG(&_67$$15, ((1 | 2) | 4));
 			ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 158, &_67$$15);
 			zephir_check_call_status();
-			zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 289);
+			zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 299);
 			if (Z_TYPE_P(&props$$15) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&props$$15), _68$$15)
 				{
@@ -99171,7 +99164,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output)
 			ZEPHIR_CONCAT_VS(&_110$$18, &_109$$18, "[already listed]\n");
 			zephir_concat_self(&output, &_110$$18);
 		} else {
-			zephir_is_iterable(&attr, 0, "phalcon/Support/Debug/Dump.zep", 307);
+			zephir_is_iterable(&attr, 0, "phalcon/Support/Debug/Dump.zep", 317);
 			if (Z_TYPE_P(&attr) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attr), _111$$19)
 				{
@@ -99476,7 +99469,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, encode)
 		ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3);
 		ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 192, &_5$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Debug/Dump.zep", 356);
+		zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Debug/Dump.zep", 366);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -99556,6 +99549,15 @@ ZEPHIR_INIT_CLASS(Phalcon_Domain_Payload_Payload)
 	return SUCCESS;
 }
 
+static PHP_METHOD(Phalcon_Domain_Payload_Payload, getException)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "exception");
+}
+
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, getExtras)
 {
 	zval *this_ptr = getThis();
@@ -99601,15 +99603,6 @@ static PHP_METHOD(Phalcon_Domain_Payload_Payload, getOutput)
 	RETURN_MEMBER(getThis(), "output");
 }
 
-static PHP_METHOD(Phalcon_Domain_Payload_Payload, getException)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "exception");
-}
-
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, setException)
 {
 	zval *exception, exception_sub;
@@ -100746,7 +100739,7 @@ static PHP_METHOD(Phalcon_Mvc_Dispatcher, throwDispatchException)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$3);
 		object_init_ex(&_1$$3, phalcon_mvc_dispatcher_exception_ce);
 		ZEPHIR_INIT_VAR(&_2$$3);
@@ -101181,47 +101174,51 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getReturnedValue)
 
 static PHP_METHOD(Phalcon_Mvc_Micro, getRouter)
 {
-	zval router, _0, _1$$3, _2$$3;
+	zval _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&router);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$3);
+	ZVAL_UNDEF(&_3$$3);
+	ZVAL_UNDEF(&_4$$3);
+	ZVAL_UNDEF(&_5$$3);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("router"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&router, &_0);
-	if (Z_TYPE_P(&router) != IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_1$$3);
-		ZVAL_STRING(&_1$$3, "router");
-		ZEPHIR_CALL_METHOD(&router, this_ptr, "getsharedservice", NULL, 0, &_1$$3);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_2$$3);
+		ZVAL_STRING(&_2$$3, "router");
+		ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "getsharedservice", NULL, 0, &_2$$3);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &router, "clear", NULL, 0);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("router"), &_1$$3);
+		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("router"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &_3$$3, "clear", NULL, 0);
 		zephir_check_call_status();
-		ZVAL_BOOL(&_2$$3, 1);
-		ZEPHIR_CALL_METHOD(NULL, &router, "removeextraslashes", NULL, 0, &_2$$3);
+		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("router"), PH_NOISY_CC | PH_READONLY);
+		ZVAL_BOOL(&_5$$3, 1);
+		ZEPHIR_CALL_METHOD(NULL, &_4$$3, "removeextraslashes", NULL, 0, &_5$$3);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("router"), &router);
 	}
-	RETURN_CCTOR(&router);
+	RETURN_MM_MEMBER(getThis(), "router");
 }
 
 static PHP_METHOD(Phalcon_Mvc_Micro, getService)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *serviceName_param = NULL, container, _0;
+	zval *serviceName_param = NULL, _0, _2, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -101244,15 +101241,15 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 416, &serviceName);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "get", NULL, 0, &serviceName);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -101261,13 +101258,14 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getSharedService)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *serviceName_param = NULL, container, _0;
+	zval *serviceName_param = NULL, _0, _2, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -101290,27 +101288,27 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getSharedService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 417, &serviceName);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "getshared", NULL, 0, &serviceName);
 	zephir_check_call_status();
 	RETURN_MM();
 }
 
 static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 {
-	zval _81$$59, _86$$64, _93$$69;
+	zval _80$$59, _84$$64, _93$$69;
 	zend_class_entry *_28$$21;
-	zend_bool _26$$7, _37$$7, _18$$11, _22$$16, _33$$25, _44$$31, _48$$36, _57$$42, _61$$47, _78$$57, _83$$62, _98$$79;
+	zend_bool _26$$7, _37$$7, _18$$11, _22$$16, _33$$25, _44$$31, _48$$36, _57$$42, _61$$47, _98$$79, _99$$79;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *uri_param = NULL, __$true, __$false, container, status, router, matchedRoute, handler, beforeHandlers, params, returnedValue, e, errorHandler, afterHandlers, notFoundHandler, finishHandlers, finish, before, after, response, modelBinder, routeName, realHandler, methodName, lazyReturned, afterBindingHandlers, afterBinding, _0, _88, _1$$4, _5$$4, _6$$4, _72$$4, _75$$4, *_76$$4, _77$$4, _2$$5, _3$$5, _4$$5, _7$$7, _8$$7, _11$$7, _15$$7, *_16$$7, _17$$7, _41$$7, *_42$$7, _43$$7, _54$$7, *_55$$7, _56$$7, _9$$8, _10$$8, _12$$9, _13$$9, _14$$9, _21$$11, _19$$14, _20$$14, _25$$16, _23$$19, _24$$19, _27$$21, _29$$23, _30$$24, _31$$24, _32$$22, _34$$26, _35$$26, _36$$26, _38$$29, _39$$29, _40$$29, _47$$31, _45$$34, _46$$34, _51$$36, _49$$39, _50$$39, _52$$41, _53$$41, _60$$42, _58$$45, _59$$45, _64$$47, _62$$50, _63$$50, _65$$52, _69$$52, _66$$53, _67$$53, _68$$53, _70$$55, _71$$55, _73$$56, _74$$56, _82$$57, _79$$60, _80$$60, _87$$62, _84$$65, _85$$65, _89$$67, _92$$67, _90$$68, _91$$68, _94$$77, _95$$77, _96$$80, _97$$80, _99$$82;
+	zval *uri_param = NULL, __$true, __$false, container, status, router, matchedRoute, handler, beforeHandlers, params, returnedValue, e, afterHandlers, notFoundHandler, finishHandlers, finish, before, after, response, modelBinder, routeName, realHandler, methodName, lazyReturned, afterBindingHandlers, afterBinding, _0, _86, _1$$4, _5$$4, _6$$4, _72$$4, _75$$4, *_76$$4, _77$$4, _2$$5, _3$$5, _4$$5, _7$$7, _8$$7, _11$$7, _15$$7, *_16$$7, _17$$7, _41$$7, *_42$$7, _43$$7, _54$$7, *_55$$7, _56$$7, _9$$8, _10$$8, _12$$9, _13$$9, _14$$9, _21$$11, _19$$14, _20$$14, _25$$16, _23$$19, _24$$19, _27$$21, _29$$23, _30$$24, _31$$24, _32$$22, _34$$26, _35$$26, _36$$26, _38$$29, _39$$29, _40$$29, _47$$31, _45$$34, _46$$34, _51$$36, _49$$39, _50$$39, _52$$41, _53$$41, _60$$42, _58$$45, _59$$45, _64$$47, _62$$50, _63$$50, _65$$52, _69$$52, _66$$53, _67$$53, _68$$53, _70$$55, _71$$55, _73$$56, _74$$56, _78$$60, _79$$60, _81$$57, _82$$65, _83$$65, _85$$62, _87$$67, _90$$67, _88$$68, _89$$68, _91$$69, _92$$69, _94$$77, _95$$77, _96$$80, _97$$80, _100$$79;
 	zval uri, bindCacheKey;
 	zval *this_ptr = getThis();
 
@@ -101327,7 +101325,6 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&returnedValue);
 	ZVAL_UNDEF(&e);
-	ZVAL_UNDEF(&errorHandler);
 	ZVAL_UNDEF(&afterHandlers);
 	ZVAL_UNDEF(&notFoundHandler);
 	ZVAL_UNDEF(&finishHandlers);
@@ -101343,7 +101340,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_UNDEF(&afterBindingHandlers);
 	ZVAL_UNDEF(&afterBinding);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_88);
+	ZVAL_UNDEF(&_86);
 	ZVAL_UNDEF(&_1$$4);
 	ZVAL_UNDEF(&_5$$4);
 	ZVAL_UNDEF(&_6$$4);
@@ -101407,23 +101404,25 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_UNDEF(&_71$$55);
 	ZVAL_UNDEF(&_73$$56);
 	ZVAL_UNDEF(&_74$$56);
-	ZVAL_UNDEF(&_82$$57);
+	ZVAL_UNDEF(&_78$$60);
 	ZVAL_UNDEF(&_79$$60);
-	ZVAL_UNDEF(&_80$$60);
-	ZVAL_UNDEF(&_87$$62);
-	ZVAL_UNDEF(&_84$$65);
-	ZVAL_UNDEF(&_85$$65);
-	ZVAL_UNDEF(&_89$$67);
-	ZVAL_UNDEF(&_92$$67);
-	ZVAL_UNDEF(&_90$$68);
-	ZVAL_UNDEF(&_91$$68);
+	ZVAL_UNDEF(&_81$$57);
+	ZVAL_UNDEF(&_82$$65);
+	ZVAL_UNDEF(&_83$$65);
+	ZVAL_UNDEF(&_85$$62);
+	ZVAL_UNDEF(&_87$$67);
+	ZVAL_UNDEF(&_90$$67);
+	ZVAL_UNDEF(&_88$$68);
+	ZVAL_UNDEF(&_89$$68);
+	ZVAL_UNDEF(&_91$$69);
+	ZVAL_UNDEF(&_92$$69);
 	ZVAL_UNDEF(&_94$$77);
 	ZVAL_UNDEF(&_95$$77);
 	ZVAL_UNDEF(&_96$$80);
 	ZVAL_UNDEF(&_97$$80);
-	ZVAL_UNDEF(&_99$$82);
-	ZVAL_UNDEF(&_81$$59);
-	ZVAL_UNDEF(&_86$$64);
+	ZVAL_UNDEF(&_100$$79);
+	ZVAL_UNDEF(&_80$$59);
+	ZVAL_UNDEF(&_84$$64);
 	ZVAL_UNDEF(&_93$$69);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
@@ -101452,8 +101451,8 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_NULL(&realHandler);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "A dependency injection container is required to access micro services", "phalcon/Mvc/Micro.zep", 419);
+	if (Z_TYPE_P(&container) == IS_NULL) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "A dependency injection container is required to access micro services", "phalcon/Mvc/Micro.zep", 398);
 		return;
 	}
 
@@ -101481,7 +101480,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 		zephir_check_call_status_or_jump(try_end_1);
 		ZEPHIR_CALL_METHOD(&matchedRoute, &router, "getmatchedroute", NULL, 0);
 		zephir_check_call_status_or_jump(try_end_1);
-		if (Z_TYPE_P(&matchedRoute) == IS_OBJECT) {
+		if (Z_TYPE_P(&matchedRoute) != IS_NULL) {
 			ZEPHIR_OBS_VAR(&handler);
 			zephir_read_property(&_7$$7, this_ptr, ZEND_STRL("handlers"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_CALL_METHOD(&_8$$7, &matchedRoute, "getrouteid", NULL, 0);
@@ -101493,7 +101492,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 				ZVAL_STRING(&_10$$8, "Matched route doesn't have an associated handler");
 				ZEPHIR_CALL_METHOD(NULL, &_9$$8, "__construct", NULL, 29, &_10$$8);
 				zephir_check_call_status_or_jump(try_end_1);
-				zephir_throw_exception_debug(&_9$$8, "phalcon/Mvc/Micro.zep", 453);
+				zephir_throw_exception_debug(&_9$$8, "phalcon/Mvc/Micro.zep", 432);
 				goto try_end_1;
 
 			}
@@ -101518,7 +101517,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			} else {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 			}
-			zephir_is_iterable(&beforeHandlers, 0, "phalcon/Mvc/Micro.zep", 506);
+			zephir_is_iterable(&beforeHandlers, 0, "phalcon/Mvc/Micro.zep", 484);
 			if (Z_TYPE_P(&beforeHandlers) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&beforeHandlers), _16$$7)
 				{
@@ -101539,7 +101538,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 							ZVAL_STRING(&_20$$14, "'before' handler is not callable");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$14, "__construct", NULL, 29, &_20$$14);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_19$$14, "phalcon/Mvc/Micro.zep", 489);
+							zephir_throw_exception_debug(&_19$$14, "phalcon/Mvc/Micro.zep", 467);
 							goto try_end_1;
 
 						}
@@ -101578,7 +101577,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 								ZVAL_STRING(&_24$$19, "'before' handler is not callable");
 								ZEPHIR_CALL_METHOD(NULL, &_23$$19, "__construct", NULL, 29, &_24$$19);
 								zephir_check_call_status_or_jump(try_end_1);
-								zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Micro.zep", 489);
+								zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Micro.zep", 467);
 								goto try_end_1;
 
 							}
@@ -101629,14 +101628,14 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			}
 			if (Z_TYPE_P(&handler) == IS_ARRAY) {
 				ZEPHIR_OBS_NVAR(&realHandler);
-				zephir_array_fetch_long(&realHandler, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 537);
+				zephir_array_fetch_long(&realHandler, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 515);
 				_33$$25 = zephir_instance_of_ev(&realHandler, phalcon_mvc_controller_ce);
 				if (_33$$25) {
 					_33$$25 = Z_TYPE_P(&modelBinder) != IS_NULL;
 				}
 				if (_33$$25) {
 					ZEPHIR_OBS_VAR(&methodName);
-					zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 540);
+					zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 518);
 					ZEPHIR_INIT_VAR(&_34$$26);
 					zephir_get_class(&_34$$26, &realHandler, 0);
 					ZEPHIR_INIT_VAR(&_35$$26);
@@ -101653,7 +101652,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			}
 			if (_37$$7) {
 				ZEPHIR_OBS_NVAR(&methodName);
-				zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 557);
+				zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 535);
 				ZEPHIR_CALL_METHOD(&lazyReturned, &realHandler, "callmethod", NULL, 0, &methodName, &params, &modelBinder);
 				zephir_check_call_status_or_jump(try_end_1);
 			} else {
@@ -101680,7 +101679,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			} else {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 			}
-			zephir_is_iterable(&afterBindingHandlers, 0, "phalcon/Mvc/Micro.zep", 620);
+			zephir_is_iterable(&afterBindingHandlers, 0, "phalcon/Mvc/Micro.zep", 598);
 			if (Z_TYPE_P(&afterBindingHandlers) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&afterBindingHandlers), _42$$7)
 				{
@@ -101701,7 +101700,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 							ZVAL_STRING(&_46$$34, "'afterBinding' handler is not callable");
 							ZEPHIR_CALL_METHOD(NULL, &_45$$34, "__construct", NULL, 29, &_46$$34);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_45$$34, "phalcon/Mvc/Micro.zep", 600);
+							zephir_throw_exception_debug(&_45$$34, "phalcon/Mvc/Micro.zep", 578);
 							goto try_end_1;
 
 						}
@@ -101740,7 +101739,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 								ZVAL_STRING(&_50$$39, "'afterBinding' handler is not callable");
 								ZEPHIR_CALL_METHOD(NULL, &_49$$39, "__construct", NULL, 29, &_50$$39);
 								zephir_check_call_status_or_jump(try_end_1);
-								zephir_throw_exception_debug(&_49$$39, "phalcon/Mvc/Micro.zep", 600);
+								zephir_throw_exception_debug(&_49$$39, "phalcon/Mvc/Micro.zep", 578);
 								goto try_end_1;
 
 							}
@@ -101773,7 +101772,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			} else {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 			}
-			zephir_is_iterable(&afterHandlers, 0, "phalcon/Mvc/Micro.zep", 659);
+			zephir_is_iterable(&afterHandlers, 0, "phalcon/Mvc/Micro.zep", 637);
 			if (Z_TYPE_P(&afterHandlers) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&afterHandlers), _55$$7)
 				{
@@ -101794,7 +101793,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 							ZVAL_STRING(&_59$$45, "One of the 'after' handlers is not callable");
 							ZEPHIR_CALL_METHOD(NULL, &_58$$45, "__construct", NULL, 29, &_59$$45);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_58$$45, "phalcon/Mvc/Micro.zep", 646);
+							zephir_throw_exception_debug(&_58$$45, "phalcon/Mvc/Micro.zep", 624);
 							goto try_end_1;
 
 						}
@@ -101833,7 +101832,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 								ZVAL_STRING(&_63$$50, "One of the 'after' handlers is not callable");
 								ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", NULL, 29, &_63$$50);
 								zephir_check_call_status_or_jump(try_end_1);
-								zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Micro.zep", 646);
+								zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Micro.zep", 624);
 								goto try_end_1;
 
 							}
@@ -101871,7 +101870,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 				ZVAL_STRING(&_71$$55, "Not-Found handler is not callable or is not defined");
 				ZEPHIR_CALL_METHOD(NULL, &_70$$55, "__construct", NULL, 29, &_71$$55);
 				zephir_check_call_status_or_jump(try_end_1);
-				zephir_throw_exception_debug(&_70$$55, "phalcon/Mvc/Micro.zep", 677);
+				zephir_throw_exception_debug(&_70$$55, "phalcon/Mvc/Micro.zep", 655);
 				goto try_end_1;
 
 			}
@@ -101894,40 +101893,36 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 		} else {
 			zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 		}
-		zephir_is_iterable(&finishHandlers, 0, "phalcon/Mvc/Micro.zep", 732);
+		zephir_is_iterable(&finishHandlers, 0, "phalcon/Mvc/Micro.zep", 709);
 		if (Z_TYPE_P(&finishHandlers) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&finishHandlers), _76$$4)
 			{
 				ZEPHIR_INIT_NVAR(&finish);
 				ZVAL_COPY(&finish, _76$$4);
-				_78$$57 = Z_TYPE_P(&finish) == IS_OBJECT;
-				if (_78$$57) {
-					_78$$57 = zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce);
-				}
-				if (_78$$57) {
+				if (zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce)) {
 					ZEPHIR_CALL_METHOD(&status, &finish, "call", NULL, 0, this_ptr);
 					zephir_check_call_status_or_jump(try_end_1);
 				} else {
 					if (UNEXPECTED(!(zephir_is_callable(&finish)))) {
+						ZEPHIR_INIT_NVAR(&_78$$60);
+						object_init_ex(&_78$$60, phalcon_mvc_micro_exception_ce);
 						ZEPHIR_INIT_NVAR(&_79$$60);
-						object_init_ex(&_79$$60, phalcon_mvc_micro_exception_ce);
-						ZEPHIR_INIT_NVAR(&_80$$60);
-						ZVAL_STRING(&_80$$60, "One of the 'finish' handlers is not callable");
-						ZEPHIR_CALL_METHOD(NULL, &_79$$60, "__construct", NULL, 29, &_80$$60);
+						ZVAL_STRING(&_79$$60, "One of the 'finish' handlers is not callable");
+						ZEPHIR_CALL_METHOD(NULL, &_78$$60, "__construct", NULL, 29, &_79$$60);
 						zephir_check_call_status_or_jump(try_end_1);
-						zephir_throw_exception_debug(&_79$$60, "phalcon/Mvc/Micro.zep", 713);
+						zephir_throw_exception_debug(&_78$$60, "phalcon/Mvc/Micro.zep", 690);
 						goto try_end_1;
 
 					}
-					ZEPHIR_INIT_NVAR(&_81$$59);
-					zephir_create_array(&_81$$59, 1, 0);
-					zephir_array_fast_append(&_81$$59, this_ptr);
+					ZEPHIR_INIT_NVAR(&_80$$59);
+					zephir_create_array(&_80$$59, 1, 0);
+					zephir_array_fast_append(&_80$$59, this_ptr);
 					ZEPHIR_INIT_NVAR(&status);
-					ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_81$$59);
+					ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_80$$59);
 					zephir_check_call_status_or_jump(try_end_1);
 				}
-				zephir_read_property(&_82$$57, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
-				if (zephir_is_true(&_82$$57)) {
+				zephir_read_property(&_81$$57, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
+				if (zephir_is_true(&_81$$57)) {
 					break;
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -101942,34 +101937,30 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 				}
 				ZEPHIR_CALL_METHOD(&finish, &finishHandlers, "current", NULL, 0);
 				zephir_check_call_status();
-					_83$$62 = Z_TYPE_P(&finish) == IS_OBJECT;
-					if (_83$$62) {
-						_83$$62 = zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce);
-					}
-					if (_83$$62) {
+					if (zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce)) {
 						ZEPHIR_CALL_METHOD(&status, &finish, "call", NULL, 0, this_ptr);
 						zephir_check_call_status_or_jump(try_end_1);
 					} else {
 						if (UNEXPECTED(!(zephir_is_callable(&finish)))) {
-							ZEPHIR_INIT_NVAR(&_84$$65);
-							object_init_ex(&_84$$65, phalcon_mvc_micro_exception_ce);
-							ZEPHIR_INIT_NVAR(&_85$$65);
-							ZVAL_STRING(&_85$$65, "One of the 'finish' handlers is not callable");
-							ZEPHIR_CALL_METHOD(NULL, &_84$$65, "__construct", NULL, 29, &_85$$65);
+							ZEPHIR_INIT_NVAR(&_82$$65);
+							object_init_ex(&_82$$65, phalcon_mvc_micro_exception_ce);
+							ZEPHIR_INIT_NVAR(&_83$$65);
+							ZVAL_STRING(&_83$$65, "One of the 'finish' handlers is not callable");
+							ZEPHIR_CALL_METHOD(NULL, &_82$$65, "__construct", NULL, 29, &_83$$65);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_84$$65, "phalcon/Mvc/Micro.zep", 713);
+							zephir_throw_exception_debug(&_82$$65, "phalcon/Mvc/Micro.zep", 690);
 							goto try_end_1;
 
 						}
-						ZEPHIR_INIT_NVAR(&_86$$64);
-						zephir_create_array(&_86$$64, 1, 0);
-						zephir_array_fast_append(&_86$$64, this_ptr);
+						ZEPHIR_INIT_NVAR(&_84$$64);
+						zephir_create_array(&_84$$64, 1, 0);
+						zephir_array_fast_append(&_84$$64, this_ptr);
 						ZEPHIR_INIT_NVAR(&status);
-						ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_86$$64);
+						ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_84$$64);
 						zephir_check_call_status_or_jump(try_end_1);
 					}
-					zephir_read_property(&_87$$62, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
-					if (zephir_is_true(&_87$$62)) {
+					zephir_read_property(&_85$$62, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
+					if (zephir_is_true(&_85$$62)) {
 						break;
 					}
 				ZEPHIR_CALL_METHOD(NULL, &finishHandlers, "next", NULL, 0);
@@ -101981,49 +101972,50 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_88);
-		ZVAL_OBJ(&_88, EG(exception));
-		Z_ADDREF_P(&_88);
-		if (zephir_is_instance_of(&_88, SL("Throwable"))) {
+		ZEPHIR_INIT_VAR(&_86);
+		ZVAL_OBJ(&_86, EG(exception));
+		Z_ADDREF_P(&_86);
+		if (zephir_is_instance_of(&_86, SL("Throwable"))) {
 			zend_clear_exception();
-			ZEPHIR_CPY_WRT(&e, &_88);
-			zephir_read_property(&_89$$67, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-			if (Z_TYPE_P(&_89$$67) != IS_NULL) {
-				zephir_read_property(&_90$$68, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-				ZEPHIR_INIT_VAR(&_91$$68);
-				ZVAL_STRING(&_91$$68, "micro:beforeException");
-				ZEPHIR_CALL_METHOD(&returnedValue, &_90$$68, "fire", NULL, 0, &_91$$68, this_ptr, &e);
-				zephir_check_call_status();
-			}
-			zephir_read_property(&_92$$67, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
-			ZEPHIR_CPY_WRT(&errorHandler, &_92$$67);
-			if (zephir_is_true(&errorHandler)) {
-				if (UNEXPECTED(!(zephir_is_callable(&errorHandler)))) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Error handler is not callable", "phalcon/Mvc/Micro.zep", 751);
+			ZEPHIR_CPY_WRT(&e, &_86);
+			zephir_read_property(&_87$$67, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+			if (Z_TYPE_P(&_87$$67) != IS_NULL) {
+				zephir_read_property(&_88$$68, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+				ZEPHIR_INIT_VAR(&_89$$68);
+				ZVAL_STRING(&_89$$68, "micro:beforeException");
+				ZEPHIR_CALL_METHOD(&returnedValue, &_88$$68, "fire", NULL, 0, &_89$$68, this_ptr, &e);
+				zephir_check_call_status();
+			}
+			zephir_read_property(&_90$$67, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
+			if (Z_TYPE_P(&_90$$67) != IS_NULL) {
+				zephir_read_property(&_91$$69, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
+				if (UNEXPECTED(!(zephir_is_callable(&_91$$69)))) {
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Error handler is not callable", "phalcon/Mvc/Micro.zep", 726);
 					return;
 				}
+				zephir_read_property(&_92$$69, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
 				ZEPHIR_INIT_VAR(&_93$$69);
 				zephir_create_array(&_93$$69, 1, 0);
 				zephir_array_fast_append(&_93$$69, &e);
 				ZEPHIR_INIT_NVAR(&returnedValue);
-				ZEPHIR_CALL_USER_FUNC_ARRAY(&returnedValue, &errorHandler, &_93$$69);
+				ZEPHIR_CALL_USER_FUNC_ARRAY(&returnedValue, &_92$$69, &_93$$69);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&returnedValue) == IS_OBJECT) {
 					if (!(zephir_instance_of_ev(&returnedValue, phalcon_http_responseinterface_ce))) {
-						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 764);
+						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 739);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				} else {
 					if (!ZEPHIR_IS_FALSE_IDENTICAL(&returnedValue)) {
-						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 768);
+						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 743);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				}
 			} else {
 				if (!ZEPHIR_IS_FALSE_IDENTICAL(&returnedValue)) {
-					zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 773);
+					zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 748);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -102034,7 +102026,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	if (zephir_is_true(&_0)) {
 		zephir_read_property(&_94$$77, this_ptr, ZEND_STRL("responseHandler"), PH_NOISY_CC | PH_READONLY);
 		if (UNEXPECTED(!(zephir_is_callable(&_94$$77)))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Response handler is not callable or is not defined", "phalcon/Mvc/Micro.zep", 786);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Response handler is not callable or is not defined", "phalcon/Mvc/Micro.zep", 761);
 			return;
 		}
 		zephir_read_property(&_95$$77, this_ptr, ZEND_STRL("responseHandler"), PH_NOISY_CC | PH_READONLY);
@@ -102061,13 +102053,15 @@ static PHP_METHOD(Phalcon_Mvc_Micro, handle)
 		if (_98$$79) {
 			_98$$79 = zephir_instance_of_ev(&returnedValue, phalcon_http_responseinterface_ce);
 		}
-		if (_98$$79) {
-			ZEPHIR_CALL_METHOD(&_99$$82, &returnedValue, "issent", NULL, 0);
+		_99$$79 = _98$$79;
+		if (_99$$79) {
+			ZEPHIR_CALL_METHOD(&_100$$79, &returnedValue, "issent", NULL, 0);
+			zephir_check_call_status();
+			_99$$79 = !zephir_is_true(&_100$$79);
+		}
+		if (_99$$79) {
+			ZEPHIR_CALL_METHOD(NULL, &returnedValue, "send", NULL, 0);
 			zephir_check_call_status();
-			if (!(zephir_is_true(&_99$$82))) {
-				ZEPHIR_CALL_METHOD(NULL, &returnedValue, "send", NULL, 0);
-				zephir_check_call_status();
-			}
 		}
 	}
 	RETURN_CCTOR(&returnedValue);
@@ -102077,13 +102071,14 @@ static PHP_METHOD(Phalcon_Mvc_Micro, hasService)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *serviceName_param = NULL, container, _0;
+	zval *serviceName_param = NULL, _0, _2, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -102106,15 +102101,15 @@ static PHP_METHOD(Phalcon_Mvc_Micro, hasService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 418, &serviceName);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "has", NULL, 0, &serviceName);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -102249,13 +102244,13 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount)
 	ZEPHIR_CALL_METHOD(&mainHandler, collection, "gethandler", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(ZEPHIR_IS_EMPTY(&mainHandler))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Collection requires a main handler", "phalcon/Mvc/Micro.zep", 909);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Collection requires a main handler", "phalcon/Mvc/Micro.zep", 876);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&handlers, collection, "gethandlers", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!(zephir_fast_count_int(&handlers)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "There are no handlers to mount", "phalcon/Mvc/Micro.zep", 915);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "There are no handlers to mount", "phalcon/Mvc/Micro.zep", 882);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_0, collection, "islazy", NULL, 0);
@@ -102263,37 +102258,37 @@ static 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, 419, &mainHandler);
+		ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 416, &mainHandler);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler);
 	}
 	ZEPHIR_CALL_METHOD(&prefix, collection, "getprefix", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Micro.zep", 973);
+	zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Micro.zep", 940);
 	if (Z_TYPE_P(&handlers) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&handlers), _1)
 		{
 			ZEPHIR_INIT_NVAR(&handler);
 			ZVAL_COPY(&handler, _1);
 			if (UNEXPECTED(Z_TYPE_P(&handler) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 936);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 903);
 				return;
 			}
 			ZEPHIR_OBS_NVAR(&methods);
-			zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 939);
+			zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 906);
 			ZEPHIR_OBS_NVAR(&pattern);
-			zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 940);
+			zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 907);
 			ZEPHIR_OBS_NVAR(&subHandler);
-			zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 941);
+			zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 908);
 			ZEPHIR_OBS_NVAR(&name);
-			zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 942);
+			zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 909);
 			ZEPHIR_INIT_NVAR(&realHandler);
 			zephir_create_array(&realHandler, 2, 0);
 			zephir_array_fast_append(&realHandler, &lazyHandler);
 			zephir_array_fast_append(&realHandler, &subHandler);
 			if (!(ZEPHIR_IS_EMPTY(&prefix))) {
-				if (ZEPHIR_IS_STRING(&pattern, "/")) {
+				if (ZEPHIR_IS_STRING_IDENTICAL(&pattern, "/")) {
 					ZEPHIR_CPY_WRT(&prefixedPattern, &prefix);
 				} else {
 					ZEPHIR_INIT_NVAR(&prefixedPattern);
@@ -102306,7 +102301,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount)
 			zephir_check_call_status();
 			_4$$7 = Z_TYPE_P(&methods) == IS_STRING;
 			if (_4$$7) {
-				_4$$7 = !ZEPHIR_IS_STRING(&methods, "");
+				_4$$7 = !ZEPHIR_IS_STRING_IDENTICAL(&methods, "");
 			}
 			_5$$7 = _4$$7;
 			if (!(_5$$7)) {
@@ -102333,24 +102328,24 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount)
 			ZEPHIR_CALL_METHOD(&handler, &handlers, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&handler) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 936);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 903);
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&methods);
-				zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 939);
+				zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 906);
 				ZEPHIR_OBS_NVAR(&pattern);
-				zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 940);
+				zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 907);
 				ZEPHIR_OBS_NVAR(&subHandler);
-				zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 941);
+				zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 908);
 				ZEPHIR_OBS_NVAR(&name);
-				zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 942);
+				zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 909);
 				ZEPHIR_INIT_NVAR(&_6$$15);
 				zephir_create_array(&_6$$15, 2, 0);
 				zephir_array_fast_append(&_6$$15, &lazyHandler);
 				zephir_array_fast_append(&_6$$15, &subHandler);
 				ZEPHIR_CPY_WRT(&realHandler, &_6$$15);
 				if (!(ZEPHIR_IS_EMPTY(&prefix))) {
-					if (ZEPHIR_IS_STRING(&pattern, "/")) {
+					if (ZEPHIR_IS_STRING_IDENTICAL(&pattern, "/")) {
 						ZEPHIR_CPY_WRT(&prefixedPattern, &prefix);
 					} else {
 						ZEPHIR_INIT_NVAR(&prefixedPattern);
@@ -102363,7 +102358,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount)
 				zephir_check_call_status();
 				_7$$15 = Z_TYPE_P(&methods) == IS_STRING;
 				if (_7$$15) {
-					_7$$15 = !ZEPHIR_IS_STRING(&methods, "");
+					_7$$15 = !ZEPHIR_IS_STRING_IDENTICAL(&methods, "");
 				}
 				_8$$15 = _7$$15;
 				if (!(_8$$15)) {
@@ -102831,14 +102826,16 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService)
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zend_bool shared;
-	zval *serviceName_param = NULL, *definition, definition_sub, *shared_param = NULL, container, _0;
+	zval *serviceName_param = NULL, *definition, definition_sub, *shared_param = NULL, _0, _2, _3, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
 	ZVAL_UNDEF(&definition_sub);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 3)
@@ -102869,20 +102866,20 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	if (shared) {
-		ZVAL_BOOL(&_0, 1);
+		ZVAL_BOOL(&_3, 1);
 	} else {
-		ZVAL_BOOL(&_0, 0);
+		ZVAL_BOOL(&_3, 0);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 420, &serviceName, definition, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "set", NULL, 0, &serviceName, definition, &_3);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -103013,15 +103010,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_Model, getTransaction)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "transaction");
-}
-
 static PHP_METHOD(Phalcon_Mvc_Model, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -103067,23 +103055,23 @@ static PHP_METHOD(Phalcon_Mvc_Model, __construct)
 	}
 
 
-	if (Z_TYPE_P(container) != IS_OBJECT) {
+	if (Z_TYPE_P(container) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(container, phalcon_di_di_ce, "getdefault", &_0, 0);
 		zephir_check_call_status();
 	}
-	if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 183);
+	if (Z_TYPE_P(container) == IS_NULL) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 182);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("container"), container);
-	if (Z_TYPE_P(modelsManager) != IS_OBJECT) {
+	if (Z_TYPE_P(modelsManager) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_2$$5);
 		ZVAL_STRING(&_2$$5, "modelsManager");
 		ZEPHIR_CALL_METHOD(&_1$$5, container, "getshared", NULL, 0, &_2$$5);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(modelsManager, &_1$$5);
-		if (UNEXPECTED(Z_TYPE_P(modelsManager) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 197);
+		if (Z_TYPE_P(modelsManager) == IS_NULL) {
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 195);
 			return;
 		}
 	}
@@ -103134,7 +103122,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call)
 	zephir_get_arrval(&arguments, arguments_param);
 
 
-	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 421, &method, &arguments);
+	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 417, &method, &arguments);
 	zephir_check_call_status();
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) {
 		RETURN_CCTOR(&records);
@@ -103158,7 +103146,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call)
 	ZEPHIR_CONCAT_SVSVS(&_3, "The method '", &method, "' doesn't exist on model '", &modelName, "'");
 	ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 29, &_3);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 266);
+	zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 264);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -103194,7 +103182,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic)
 	zephir_get_arrval(&arguments, arguments_param);
 
 
-	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 421, &method, &arguments);
+	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 417, &method, &arguments);
 	zephir_check_call_status();
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) {
 		RETURN_CCTOR(&records);
@@ -103207,7 +103195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic)
 	ZEPHIR_CONCAT_SVSVS(&_2, "The method '", &method, "' doesn't exist on model '", &modelName, "'");
 	ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 29, &_2);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 292);
+	zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 290);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -103267,7 +103255,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __get)
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
 		if (zephir_array_isset(&_1$$3, &lowerProperty)) {
 			zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
-			zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 324);
+			zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 322);
 			RETURN_CTOR(&_3$$4);
 		}
 		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getrelated", NULL, 0, &lowerProperty);
@@ -103521,7 +103509,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set)
 				if (ZEPHIR_IS_LONG(&_5$$7, 2) || ZEPHIR_IS_LONG(&_5$$7, 4)) {
 					ZEPHIR_INIT_VAR(&related);
 					array_init(&related);
-					zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 495);
+					zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 493);
 					if (Z_TYPE_P(value) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(value), _9$$10)
 						{
@@ -103529,7 +103517,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set)
 							ZVAL_COPY(&item, _9$$10);
 							if (Z_TYPE_P(&item) == IS_OBJECT) {
 								if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) {
-									zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 490);
+									zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 488);
 								}
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -103546,7 +103534,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set)
 							zephir_check_call_status();
 								if (Z_TYPE_P(&item) == IS_OBJECT) {
 									if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) {
-										zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 490);
+										zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 488);
 									}
 								}
 							ZEPHIR_CALL_METHOD(NULL, value, "next", NULL, 0);
@@ -103574,7 +103562,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set)
 
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 422, &property, value);
+	ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 418, &property, value);
 	zephir_check_call_status();
 	if (zephir_is_true(&_14)) {
 		RETVAL_ZVAL(value, 1, 0);
@@ -103594,7 +103582,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set)
 			ZEPHIR_CONCAT_SVS(&_18$$21, "Cannot access property '", &property, "' (not public).");
 			ZEPHIR_CALL_METHOD(NULL, &_17$$21, "__construct", NULL, 29, &_18$$21);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 524);
+			zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 522);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -103649,7 +103637,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&container) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 553);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 551);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
@@ -103659,7 +103647,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_2);
 	if (Z_TYPE_P(&manager) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 568);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 566);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager);
@@ -103667,7 +103655,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&properties);
 	if (zephir_array_isset_string_fetch(&properties, &data, SL("attributes"), 0)) {
-		zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 591);
+		zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 589);
 		if (Z_TYPE_P(&properties) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$6, _7$$6, _4$$6)
 			{
@@ -103834,7 +103822,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign)
 	if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&dataMapped);
 		array_init(&dataMapped);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 751);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 749);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -103891,7 +103879,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign)
 	}
 	ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 808);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 806);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -103902,7 +103890,7 @@ static 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, 423, &columnMap, &attribute);
+				ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 419, &columnMap, &attribute);
 				zephir_check_call_status();
 				ZEPHIR_CPY_WRT(&attribute, &_8$$13);
 			}
@@ -103916,7 +103904,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign)
 						ZEPHIR_CONCAT_SVS(&_11$$16, "Column '", &attribute, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_10$$16, "__construct", &_12, 29, &_11$$16);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 782);
+						zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 780);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -103934,7 +103922,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign)
 				}
 				_13$$18 = zephir_is_true(&disableAssignSetters);
 				if (!(_13$$18)) {
-					ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 422, &attributeField, &value);
+					ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 418, &attributeField, &value);
 					zephir_check_call_status();
 					_13$$18 = !zephir_is_true(&_14$$18);
 				}
@@ -103959,7 +103947,7 @@ static 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, 423, &columnMap, &attribute);
+					ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 419, &columnMap, &attribute);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&attribute, &_17$$23);
 				}
@@ -103973,7 +103961,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign)
 							ZEPHIR_CONCAT_SVS(&_19$$26, "Column '", &attribute, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_18$$26, "__construct", &_12, 29, &_19$$26);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 782);
+							zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 780);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -103991,7 +103979,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign)
 					}
 					_20$$28 = zephir_is_true(&disableAssignSetters);
 					if (!(_20$$28)) {
-						ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 422, &attributeField, &value);
+						ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 418, &attributeField, &value);
 						zephir_check_call_status();
 						_20$$28 = !zephir_is_true(&_21$$28);
 					}
@@ -104096,7 +104084,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 	ZVAL_LONG(&_0, dirtyState);
 	ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0);
 	zephir_check_call_status();
-	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 898);
+	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 896);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1)
 		{
@@ -104109,7 +104097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
 			if (UNEXPECTED(Z_TYPE_P(&key) != IS_STRING)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 888);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 886);
 				return;
 			}
 			zephir_update_property_zval_zval(&instance, &key, &value);
@@ -104128,7 +104116,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 			ZEPHIR_CALL_METHOD(&value, &data, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&key) != IS_STRING)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 888);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 886);
 					return;
 				}
 				zephir_update_property_zval_zval(&instance, &key, &value);
@@ -104220,7 +104208,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 	ZVAL_LONG(&_0, dirtyState);
 	ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0);
 	zephir_check_call_status();
-	zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1031);
+	zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1029);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1)
 		{
@@ -104259,7 +104247,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 							ZEPHIR_CONCAT_SVS(&_7$$9, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_6$$9, "__construct", &_8, 29, &_7$$9);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 958);
+							zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 956);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -104273,7 +104261,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 						ZEPHIR_CONCAT_SVS(&_10$$11, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_10$$11);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 967);
+						zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 965);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -104289,7 +104277,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 				_11$$3 = Z_TYPE_P(&value) != IS_NULL;
 			}
 			if (_11$$3) {
-				zephir_array_fetch_long(&_12$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 981);
+				zephir_array_fetch_long(&_12$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 979);
 				do {
 					if (ZEPHIR_IS_LONG(&_12$$13, 0) || ZEPHIR_IS_LONG(&_12$$13, 21) || ZEPHIR_IS_LONG(&_12$$13, 22) || ZEPHIR_IS_LONG(&_12$$13, 26)) {
 						ZVAL_LONG(&_13$$14, 10);
@@ -104312,7 +104300,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 				} while(0);
 
 			} else {
-				zephir_array_fetch_long(&_15$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1004);
+				zephir_array_fetch_long(&_15$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1002);
 				do {
 					if (ZEPHIR_IS_LONG(&_15$$18, 14) || ZEPHIR_IS_LONG(&_15$$18, 8) || ZEPHIR_IS_LONG(&_15$$18, 3) || ZEPHIR_IS_LONG(&_15$$18, 9) || ZEPHIR_IS_LONG(&_15$$18, 7) || ZEPHIR_IS_LONG(&_15$$18, 0) || ZEPHIR_IS_LONG(&_15$$18, 21) || ZEPHIR_IS_LONG(&_15$$18, 22) || ZEPHIR_IS_LONG(&_15$$18, 26)) {
 						ZEPHIR_INIT_NVAR(&castValue);
@@ -104325,7 +104313,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 
 			}
 			ZEPHIR_OBS_NVAR(&attributeName);
-			zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1023);
+			zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1021);
 			zephir_update_property_zval_zval(&instance, &attributeName, &castValue);
 			zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
@@ -104369,7 +104357,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 								ZEPHIR_CONCAT_SVS(&_18$$27, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_18$$27);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 958);
+								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 956);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -104383,7 +104371,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 							ZEPHIR_CONCAT_SVS(&_20$$29, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$29, "__construct", &_8, 29, &_20$$29);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 967);
+							zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 965);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -104399,7 +104387,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 					_21$$21 = Z_TYPE_P(&value) != IS_NULL;
 				}
 				if (_21$$21) {
-					zephir_array_fetch_long(&_22$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 981);
+					zephir_array_fetch_long(&_22$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 979);
 					do {
 						if (ZEPHIR_IS_LONG(&_22$$31, 0) || ZEPHIR_IS_LONG(&_22$$31, 21) || ZEPHIR_IS_LONG(&_22$$31, 22) || ZEPHIR_IS_LONG(&_22$$31, 26)) {
 							ZVAL_LONG(&_23$$32, 10);
@@ -104422,7 +104410,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 					} while(0);
 
 				} else {
-					zephir_array_fetch_long(&_24$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1004);
+					zephir_array_fetch_long(&_24$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1002);
 					do {
 						if (ZEPHIR_IS_LONG(&_24$$36, 14) || ZEPHIR_IS_LONG(&_24$$36, 8) || ZEPHIR_IS_LONG(&_24$$36, 3) || ZEPHIR_IS_LONG(&_24$$36, 9) || ZEPHIR_IS_LONG(&_24$$36, 7) || ZEPHIR_IS_LONG(&_24$$36, 0) || ZEPHIR_IS_LONG(&_24$$36, 21) || ZEPHIR_IS_LONG(&_24$$36, 22) || ZEPHIR_IS_LONG(&_24$$36, 26)) {
 							ZEPHIR_INIT_NVAR(&castValue);
@@ -104435,7 +104423,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 
 				}
 				ZEPHIR_OBS_NVAR(&attributeName);
-				zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1023);
+				zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1021);
 				zephir_update_property_zval_zval(&instance, &attributeName, &castValue);
 				zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &data, "next", NULL, 0);
@@ -104508,7 +104496,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 	}
 	ZEPHIR_INIT_VAR(&hydrateArray);
 	array_init(&hydrateArray);
-	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1115);
+	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1113);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2, _3, _0)
 		{
@@ -104529,7 +104517,7 @@ static 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, 423, columnMap, &key);
+					ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&key, &_5$$8);
 				}
@@ -104542,7 +104530,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 						ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_9, 29, &_8$$10);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1094);
+						zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1092);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -104550,7 +104538,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 				}
 				if (Z_TYPE_P(&attribute) == IS_ARRAY) {
 					ZEPHIR_OBS_NVAR(&attributeName);
-					zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1104);
+					zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1102);
 				} else {
 					ZEPHIR_CPY_WRT(&attributeName, &attribute);
 				}
@@ -104581,7 +104569,7 @@ static 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, 423, columnMap, &key);
+						ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 						zephir_check_call_status();
 						ZEPHIR_CPY_WRT(&key, &_11$$17);
 					}
@@ -104594,7 +104582,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 							ZEPHIR_CONCAT_SVS(&_13$$19, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$19, "__construct", &_9, 29, &_13$$19);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1094);
+							zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1092);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -104602,7 +104590,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 					}
 					if (Z_TYPE_P(&attribute) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&attributeName);
-						zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1104);
+						zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1102);
 					} else {
 						ZEPHIR_CPY_WRT(&attributeName, &attribute);
 					}
@@ -104651,7 +104639,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, collectRelatedToSave)
 	ZEPHIR_CPY_WRT(&related, &_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&dirtyRelated, &_1);
-	zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1156);
+	zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1154);
 	if (Z_TYPE_P(&related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&related), _4, _5, _2)
 		{
@@ -104777,7 +104765,7 @@ static 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, 424);
+	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 420);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1);
 	zephir_check_call_status();
@@ -104861,7 +104849,7 @@ static 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, 424);
+	ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 420);
 	zephir_check_call_status();
 	ZEPHIR_INIT_ZVAL_NREF(_0);
 	ZVAL_LONG(&_0, 3);
@@ -104870,7 +104858,7 @@ static 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, 425);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 421);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) {
 			RETURN_MM_BOOL(0);
@@ -104894,10 +104882,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 		ZVAL_NULL(&columnMap);
 	}
 	if (UNEXPECTED(!(zephir_fast_count_int(&primaryKeys)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 1309);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 1307);
 		return;
 	}
-	zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1357);
+	zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1355);
 	if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _3)
 		{
@@ -104911,7 +104899,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 				ZEPHIR_CONCAT_SVS(&_6$$9, "Column '", &primaryKey, "' have not defined a bind data type");
 				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_7, 29, &_6$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1323);
+				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1321);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -104924,7 +104912,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_9$$11, "Column '", &primaryKey, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_7, 29, &_9$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1333);
+					zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1331);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -104939,17 +104927,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 				ZEPHIR_CONCAT_SVS(&_11$$13, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set");
 				ZEPHIR_CALL_METHOD(NULL, &_10$$13, "__construct", &_7, 29, &_11$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1346);
+				zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1344);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1350);
 			ZEPHIR_CALL_METHOD(&_12$$8, &writeConnection, "escapeidentifier", &_13, 0, &primaryKey);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_14$$8);
 			ZEPHIR_CONCAT_VS(&_14$$8, &_12$$8, " = ?");
-			zephir_array_append(&conditions, &_14$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
-			zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1354);
+			zephir_array_append(&conditions, &_14$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
+			zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -104970,7 +104958,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_16$$15, "Column '", &primaryKey, "' have not defined a bind data type");
 					ZEPHIR_CALL_METHOD(NULL, &_15$$15, "__construct", &_7, 29, &_16$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1323);
+					zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1321);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -104983,7 +104971,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 						ZEPHIR_CONCAT_SVS(&_18$$17, "Column '", &primaryKey, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_17$$17, "__construct", &_7, 29, &_18$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1333);
+						zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1331);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -104998,17 +104986,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_20$$19, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set");
 					ZEPHIR_CALL_METHOD(NULL, &_19$$19, "__construct", &_7, 29, &_20$$19);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1346);
+					zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1344);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1350);
 				ZEPHIR_CALL_METHOD(&_21$$14, &writeConnection, "escapeidentifier", &_22, 0, &primaryKey);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_23$$14);
 				ZEPHIR_CONCAT_VS(&_23$$14, &_21$$14, " = ?");
-				zephir_array_append(&conditions, &_23$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
-				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1354);
+				zephir_array_append(&conditions, &_23$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
+				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
 			ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -105032,9 +105020,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete)
 			RETURN_MM_BOOL(1);
 		}
 	}
-	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -105049,7 +105037,7 @@ static 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, 428);
+		ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 424);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) {
 			RETURN_MM_BOOL(0);
@@ -105079,7 +105067,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, dump)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 429, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 425, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -105119,12 +105107,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, find)
 		ZEPHIR_INIT_VAR(&params);
 		array_init(&params);
 		if (Z_TYPE_P(parameters) != IS_NULL) {
-			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1618);
+			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1616);
 		}
 	} else {
 		ZEPHIR_CPY_WRT(&params, parameters);
 	}
-	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 430, &params);
+	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 426, &params);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0);
 	zephir_check_call_status();
@@ -105185,11 +105173,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, findFirst)
 		zephir_array_fast_append(&_1$$5, parameters);
 		ZEPHIR_CPY_WRT(&params, &_1$$5);
 	} else {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/Mvc/Model.zep", 1742);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/Mvc/Model.zep", 1740);
 		return;
 	}
 	ZVAL_LONG(&_3, 1);
-	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 430, &params, &_3);
+	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 426, &params, &_3);
 	zephir_check_call_status();
 	ZVAL_BOOL(&_3, 1);
 	ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3);
@@ -105314,7 +105302,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&snapshot, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 1828);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 1826);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0);
@@ -105330,7 +105318,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 	ZEPHIR_INIT_VAR(&changed);
 	array_init(&changed);
 	ZEPHIR_INIT_VAR(&_1);
-	zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1886);
+	zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1884);
 	if (Z_TYPE_P(&allAttributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _4, _5, _2)
 		{
@@ -105343,17 +105331,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 			ZEPHIR_INIT_NVAR(&_1);
 			ZVAL_COPY(&_1, _2);
 			if (!(zephir_array_isset(&snapshot, &name))) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1861);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1859);
 				continue;
 			}
 			ZEPHIR_OBS_NVAR(&value);
 			if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1871);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1869);
 				continue;
 			}
-			zephir_array_fetch(&_6$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1879);
+			zephir_array_fetch(&_6$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1877);
 			if (!ZEPHIR_IS_IDENTICAL(&value, &_6$$6)) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1880);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1878);
 				continue;
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -105371,17 +105359,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 			ZEPHIR_CALL_METHOD(&_1, &allAttributes, "current", NULL, 0);
 			zephir_check_call_status();
 				if (!(zephir_array_isset(&snapshot, &name))) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1861);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1859);
 					continue;
 				}
 				ZEPHIR_OBS_NVAR(&value);
 				if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1871);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1869);
 					continue;
 				}
-				zephir_array_fetch(&_7$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1879);
+				zephir_array_fetch(&_7$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1877);
 				if (!ZEPHIR_IS_IDENTICAL(&value, &_7$$10)) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1880);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1878);
 					continue;
 				}
 			ZEPHIR_CALL_METHOD(NULL, &allAttributes, "next", NULL, 0);
@@ -105462,7 +105450,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 		ZEPHIR_INIT_VAR(&filtered);
 		array_init(&filtered);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1943);
+		zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1941);
 		if (Z_TYPE_P(&_1$$3) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3)
 			{
@@ -105471,7 +105459,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 				ZEPHIR_CALL_METHOD(&_4$$4, &message, "getfield", NULL, 0);
 				zephir_check_call_status();
 				if (ZEPHIR_IS_EQUAL(&_4$$4, filter)) {
-					zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1939);
+					zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1937);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -105488,7 +105476,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 					ZEPHIR_CALL_METHOD(&_5$$6, &message, "getfield", NULL, 0);
 					zephir_check_call_status();
 					if (ZEPHIR_IS_EQUAL(&_5$$6, filter)) {
-						zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1939);
+						zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1937);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &_1$$3, "next", NULL, 0);
 				zephir_check_call_status();
@@ -105527,7 +105515,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData)
 
 	ZEPHIR_OBS_VAR(&metaData);
 	zephir_read_property(&metaData, this_ptr, ZEND_STRL("modelsMetaData"), PH_NOISY_CC);
-	if (Z_TYPE_P(&metaData) != IS_OBJECT) {
+	if (Z_TYPE_P(&metaData) == IS_NULL) {
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_0$$3);
 		ZEPHIR_INIT_VAR(&_2$$3);
@@ -105536,7 +105524,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&metaData, &_1$$3);
 		if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/Mvc/Model.zep", 1977);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/Mvc/Model.zep", 1975);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("modelsMetaData"), &metaData);
@@ -105564,26 +105552,27 @@ static PHP_METHOD(Phalcon_Mvc_Model, getOldSnapshotData)
 
 static PHP_METHOD(Phalcon_Mvc_Model, getReadConnection)
 {
-	zval transaction, _0;
+	zval _0, _2, _1$$3;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&transaction);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&transaction, &_0);
-	if (Z_TYPE_P(&transaction) == IS_OBJECT) {
-		ZEPHIR_RETURN_CALL_METHOD(&transaction, "getconnection", NULL, 0);
+	if (Z_TYPE_P(&_0) != IS_NULL) {
+		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_1$$3, "getconnection", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "getreadconnection", NULL, 0, this_ptr);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "getreadconnection", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -105661,7 +105650,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getRelated)
 		ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 29, &_3$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2056);
+		zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2050);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -105779,21 +105768,21 @@ static PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&oldSnapshot, &_0);
 	if (UNEXPECTED(!(ZEPHIR_GLOBAL(orm).update_snapshot_on_save))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly", "phalcon/Mvc/Model.zep", 2180);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly", "phalcon/Mvc/Model.zep", 2174);
 		return;
 	}
 	if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2186);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2180);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!ZEPHIR_IS_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/Mvc/Model.zep", 2195);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/Mvc/Model.zep", 2189);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&updated);
 	array_init(&updated);
-	zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2210);
+	zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2204);
 	if (Z_TYPE_P(&snapshot) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _3, _4, _1)
 		{
@@ -105807,11 +105796,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 			ZVAL_COPY(&value, _1);
 			_5$$6 = !(zephir_array_isset(&oldSnapshot, &name));
 			if (!(_5$$6)) {
-				zephir_array_fetch(&_6$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2205);
+				zephir_array_fetch(&_6$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2199);
 				_5$$6 = !ZEPHIR_IS_IDENTICAL(&value, &_6$$6);
 			}
 			if (_5$$6) {
-				zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2206);
+				zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2200);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -105829,11 +105818,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 			zephir_check_call_status();
 				_7$$8 = !(zephir_array_isset(&oldSnapshot, &name));
 				if (!(_7$$8)) {
-					zephir_array_fetch(&_8$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2205);
+					zephir_array_fetch(&_8$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2199);
 					_7$$8 = !ZEPHIR_IS_IDENTICAL(&value, &_8$$8);
 				}
 				if (_7$$8) {
-					zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2206);
+					zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2200);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &snapshot, "next", NULL, 0);
 			zephir_check_call_status();
@@ -105846,26 +105835,27 @@ static PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 
 static PHP_METHOD(Phalcon_Mvc_Model, getWriteConnection)
 {
-	zval transaction, _0;
+	zval _0, _2, _1$$3;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&transaction);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&transaction, &_0);
-	if (Z_TYPE_P(&transaction) == IS_OBJECT) {
-		ZEPHIR_RETURN_CALL_METHOD(&transaction, "getconnection", NULL, 0);
+	if (Z_TYPE_P(&_0) != IS_NULL) {
+		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_1$$3, "getconnection", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "getwriteconnection", NULL, 0, this_ptr);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "getwriteconnection", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -105929,7 +105919,7 @@ static 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, 431, fieldName, &changedFields);
+		ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 427, fieldName, &changedFields);
 		zephir_check_call_status();
 		if (allFields) {
 			RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName));
@@ -105993,7 +105983,7 @@ static 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, 431, fieldName, &updatedFields);
+		ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 427, fieldName, &updatedFields);
 		zephir_check_call_status();
 		if (allFields) {
 			RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName));
@@ -106143,12 +106133,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, query)
 			zephir_check_call_status();
 		}
 
-		ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 432, container);
+		ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 428, container);
 		zephir_check_call_status();
 	}
 	ZEPHIR_INIT_VAR(&_3);
 	zephir_get_called_class(&_3);
-	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 433, &_3);
+	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 429, &_3);
 	zephir_check_call_status();
 	RETURN_CCTOR(&criteria);
 }
@@ -106233,18 +106223,18 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!ZEPHIR_IS_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2465);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2455);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 434);
+	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 430);
 	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, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -106260,7 +106250,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh)
 		ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "has", NULL, 0, &metaData, &readConnection);
 		zephir_check_call_status();
 		if (UNEXPECTED(!zephir_is_true(&_2$$6))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2490);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2480);
 			return;
 		}
 		zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("uniqueKey"), PH_NOISY_CC | PH_READONLY);
@@ -106269,14 +106259,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("uniqueParams"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&uniqueParams, &_1);
 	if (UNEXPECTED(Z_TYPE_P(&uniqueParams) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2501);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2491);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&fields);
 	array_init(&fields);
 	ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 2516);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 2506);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -106285,7 +106275,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh)
 			ZEPHIR_INIT_NVAR(&_7$$9);
 			zephir_create_array(&_7$$9, 1, 0);
 			zephir_array_fast_append(&_7$$9, &attribute);
-			zephir_array_append(&fields, &_7$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2510);
+			zephir_array_append(&fields, &_7$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2500);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &_4, "rewind", NULL, 0);
@@ -106301,7 +106291,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh)
 				ZEPHIR_INIT_NVAR(&_8$$10);
 				zephir_create_array(&_8$$10, 1, 0);
 				zephir_array_fast_append(&_8$$10, &attribute);
-				zephir_array_append(&fields, &_8$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2510);
+				zephir_array_append(&fields, &_8$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2500);
 			ZEPHIR_CALL_METHOD(NULL, &_4, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -106381,7 +106371,7 @@ static 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, 424);
+	ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 420);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "prepareSave");
@@ -106397,9 +106387,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, save)
 			RETURN_MM_BOOL(0);
 		}
 	}
-	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -106409,7 +106399,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, save)
 	} else {
 		ZEPHIR_CPY_WRT(&table, &source);
 	}
-	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 434);
+	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 430);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection);
 	zephir_check_call_status();
@@ -106440,9 +106430,9 @@ static 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, 435, this_ptr, &_7$$11);
+			ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 431, this_ptr, &_7$$11);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2667);
+			zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2657);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -106595,8 +106585,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		}
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 2787);
+		if (Z_TYPE_P(&container) == IS_NULL) {
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 2776);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
@@ -106606,7 +106596,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&manager, &_2$$3);
 		if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 2803);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 2792);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager);
@@ -106614,7 +106604,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&properties);
 		if (zephir_array_isset_string_fetch(&properties, &attributes, SL("attributes"), 0)) {
-			zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2826);
+			zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2815);
 			if (Z_TYPE_P(&properties) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$7, _7$$7, _4$$7)
 				{
@@ -106844,7 +106834,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 	if (Z_TYPE_P(columnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&snapshot);
 		array_init(&snapshot);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2944);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2933);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -106868,7 +106858,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 						ZEPHIR_CONCAT_SVS(&_5$$7, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_6, 29, &_5$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2924);
+						zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2913);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -106884,7 +106874,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_6, 29, &_8$$10);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2935);
+							zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2924);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -106918,7 +106908,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_10$$14, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_9$$14, "__construct", &_6, 29, &_10$$14);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2924);
+							zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2913);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -106934,7 +106924,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 								ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_6, 29, &_12$$17);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2935);
+								zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2924);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -107007,7 +106997,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 	if (Z_TYPE_P(columnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&snapshot);
 		array_init(&snapshot);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 3009);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2998);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -107027,7 +107017,7 @@ static 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, 423, columnMap, &key);
+					ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&key, &_5$$6);
 				}
@@ -107040,7 +107030,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 						ZEPHIR_CONCAT_SVS(&_8$$8, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_7$$8, "__construct", &_9, 29, &_8$$8);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2989);
+						zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2978);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -107056,7 +107046,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_11$$11, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", &_9, 29, &_11$$11);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 3000);
+							zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 2989);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -107086,7 +107076,7 @@ static 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, 423, columnMap, &key);
+						ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 						zephir_check_call_status();
 						ZEPHIR_CPY_WRT(&key, &_13$$14);
 					}
@@ -107099,7 +107089,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_15$$16, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_14$$16, "__construct", &_9, 29, &_15$$16);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2989);
+							zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2978);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -107115,7 +107105,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 								ZEPHIR_CONCAT_SVS(&_17$$19, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_16$$19, "__construct", &_9, 29, &_17$$19);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 3000);
+								zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 2989);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -107157,6 +107147,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, setTransaction)
 	RETURN_THISW();
 }
 
+static PHP_METHOD(Phalcon_Mvc_Model, getTransaction)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "transaction");
+}
+
 static PHP_METHOD(Phalcon_Mvc_Model, setup)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -107408,7 +107407,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3281);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3275);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -107420,7 +107419,7 @@ static 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, 423, &columnMap, &attribute);
+					ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 419, &columnMap, &attribute);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&attribute, &_4$$5);
 				}
@@ -107433,7 +107432,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
 						ZEPHIR_CONCAT_SVS(&_7$$7, "Column '", &attribute, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", &_8, 29, &_7$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3259);
+						zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3253);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -107471,7 +107470,7 @@ static 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, 423, &columnMap, &attribute);
+						ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 419, &columnMap, &attribute);
 						zephir_check_call_status();
 						ZEPHIR_CPY_WRT(&attribute, &_10$$15);
 					}
@@ -107484,7 +107483,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
 							ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &attribute, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_8, 29, &_12$$17);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3259);
+							zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3253);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -107537,7 +107536,7 @@ static 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, 434);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 430);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "has", NULL, 0, &metaData, &_2$$3);
 		zephir_check_call_status();
@@ -107665,7 +107664,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 	ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	error = 0;
-	zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3492);
+	zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3486);
 	if (Z_TYPE_P(&belongsTo) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1)
 		{
@@ -107680,7 +107679,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 			action = 1;
 			if (zephir_array_isset_string(&foreignKey, SL("action"))) {
 				ZEPHIR_OBS_NVAR(&_3$$5);
-				zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3383);
+				zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3377);
 				action = zephir_get_intval(&_3$$5);
 			}
 			if (action != 1) {
@@ -107700,7 +107699,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 			ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&fields) == IS_ARRAY) {
-				zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3426);
+				zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3420);
 				if (Z_TYPE_P(&fields) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _8$$7, _9$$7, _6$$7)
 					{
@@ -107714,11 +107713,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 						ZVAL_COPY(&field, _6$$7);
 						ZEPHIR_OBS_NVAR(&value);
 						zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-						zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+						zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 						ZEPHIR_INIT_NVAR(&_11$$8);
 						ZEPHIR_CONCAT_SVSV(&_11$$8, "[", &_10$$8, "] = ?", &position);
-						zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-						zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+						zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+						zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 						if (Z_TYPE_P(&value) == IS_NULL) {
 							numberNull++;
 						}
@@ -107738,11 +107737,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 						zephir_check_call_status();
 							ZEPHIR_OBS_NVAR(&value);
 							zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-							zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+							zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 							ZEPHIR_INIT_NVAR(&_13$$10);
 							ZEPHIR_CONCAT_SVSV(&_13$$10, "[", &_12$$10, "] = ?", &position);
-							zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+							zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 							if (Z_TYPE_P(&value) == IS_NULL) {
 								numberNull++;
 							}
@@ -107758,15 +107757,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC);
 				ZEPHIR_INIT_NVAR(&_14$$12);
 				ZEPHIR_CONCAT_SVS(&_14$$12, "[", &referencedFields, "] = ?0");
-				zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3430);
-				zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3431);
+				zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3424);
+				zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3425);
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					validateWithNulls = 1;
 				}
 			}
 			ZEPHIR_OBS_NVAR(&extraConditions);
 			if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) {
-				zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3442);
+				zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3436);
 			}
 			if (validateWithNulls) {
 				ZEPHIR_OBS_NVAR(&allowNulls);
@@ -107832,7 +107831,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				action = 1;
 				if (zephir_array_isset_string(&foreignKey, SL("action"))) {
 					ZEPHIR_OBS_NVAR(&_24$$24);
-					zephir_array_fetch_string(&_24$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3383);
+					zephir_array_fetch_string(&_24$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3377);
 					action = zephir_get_intval(&_24$$24);
 				}
 				if (action != 1) {
@@ -107852,7 +107851,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&fields) == IS_ARRAY) {
-					zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3426);
+					zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3420);
 					if (Z_TYPE_P(&fields) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _29$$26, _30$$26, _27$$26)
 						{
@@ -107866,11 +107865,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 							ZVAL_COPY(&field, _27$$26);
 							ZEPHIR_OBS_NVAR(&value);
 							zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-							zephir_array_fetch(&_31$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+							zephir_array_fetch(&_31$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 							ZEPHIR_INIT_NVAR(&_32$$27);
 							ZEPHIR_CONCAT_SVSV(&_32$$27, "[", &_31$$27, "] = ?", &position);
-							zephir_array_append(&conditions, &_32$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+							zephir_array_append(&conditions, &_32$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 							if (Z_TYPE_P(&value) == IS_NULL) {
 								numberNull++;
 							}
@@ -107890,11 +107889,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 							zephir_check_call_status();
 								ZEPHIR_OBS_NVAR(&value);
 								zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-								zephir_array_fetch(&_33$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3418);
+								zephir_array_fetch(&_33$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 								ZEPHIR_INIT_NVAR(&_34$$29);
 								ZEPHIR_CONCAT_SVSV(&_34$$29, "[", &_33$$29, "] = ?", &position);
-								zephir_array_append(&conditions, &_34$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3418);
-								zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3419);
+								zephir_array_append(&conditions, &_34$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+								zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 								if (Z_TYPE_P(&value) == IS_NULL) {
 									numberNull++;
 								}
@@ -107910,15 +107909,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 					zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC);
 					ZEPHIR_INIT_NVAR(&_35$$31);
 					ZEPHIR_CONCAT_SVS(&_35$$31, "[", &referencedFields, "] = ?0");
-					zephir_array_append(&conditions, &_35$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3430);
-					zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3431);
+					zephir_array_append(&conditions, &_35$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3424);
+					zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3425);
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						validateWithNulls = 1;
 					}
 				}
 				ZEPHIR_OBS_NVAR(&extraConditions);
 				if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) {
-					zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3442);
+					zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3436);
 				}
 				if (validateWithNulls) {
 					ZEPHIR_OBS_NVAR(&allowNulls);
@@ -108010,7 +108009,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3568);
+	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3562);
 	if (Z_TYPE_P(&relations) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
 		{
@@ -108028,7 +108027,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 			}
 			if (_3$$3) {
 				ZEPHIR_OBS_NVAR(&_4$$5);
-				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3542);
+				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3536);
 				action = zephir_get_intval(&_4$$5);
 			}
 			if (action != 2) {
@@ -108067,7 +108066,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 				}
 				if (_7$$9) {
 					ZEPHIR_OBS_NVAR(&_8$$11);
-					zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3542);
+					zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3536);
 					action = zephir_get_intval(&_8$$11);
 				}
 				if (action != 2) {
@@ -108130,7 +108129,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 	ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	error = 0;
-	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3654);
+	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3648);
 	if (Z_TYPE_P(&relations) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
 		{
@@ -108148,7 +108147,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 			}
 			if (_3$$3) {
 				ZEPHIR_OBS_NVAR(&_4$$5);
-				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3613);
+				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3607);
 				action = zephir_get_intval(&_4$$5);
 			}
 			if (action != 1) {
@@ -108204,7 +108203,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 				}
 				if (_13$$9) {
 					ZEPHIR_OBS_NVAR(&_14$$11);
-					zephir_array_fetch_string(&_14$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3613);
+					zephir_array_fetch_string(&_14$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3607);
 					action = zephir_get_intval(&_14$$11);
 				}
 				if (action != 1) {
@@ -108375,7 +108374,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		ZEPHIR_INIT_NVAR(&columnMap);
 		ZVAL_NULL(&columnMap);
 	}
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3776);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3770);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1)
 		{
@@ -108390,7 +108389,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 					ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &field, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 29, &_4$$7);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3710);
+					zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3704);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -108406,9 +108405,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							_6$$11 = zephir_array_isset(&defaultValues, &field);
 						}
 						if (_6$$11) {
-							zephir_array_fetch(&_7$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3727);
+							zephir_array_fetch(&_7$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3721);
 							zephir_array_update_zval(&snapshot, &attributeField, &_7$$12, PH_COPY | PH_SEPARATE);
-							zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3728);
+							zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3722);
 							zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_8$$12, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(&_9$$12, connection, "supportsdefaultvalue", &_10, 0);
 							zephir_check_call_status();
@@ -108428,18 +108427,18 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							ZEPHIR_CONCAT_SVS(&_13$$15, "Column '", &field, "' have not defined a bind data type");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$15, "__construct", &_5, 29, &_13$$15);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3745);
+							zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3739);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3748);
-						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3749);
-						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3750);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3742);
+						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3743);
+						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3744);
 					} else {
 						if (zephir_array_isset(&defaultValues, &field)) {
-							zephir_array_fetch(&_14$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3753);
+							zephir_array_fetch(&_14$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3747);
 							zephir_array_update_zval(&snapshot, &attributeField, &_14$$17, PH_COPY | PH_SEPARATE);
-							zephir_array_fetch(&_15$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3754);
+							zephir_array_fetch(&_15$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3748);
 							zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_15$$17, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(&_16$$17, connection, "supportsdefaultvalue", &_17, 0);
 							zephir_check_call_status();
@@ -108448,13 +108447,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							}
 							ZEPHIR_CALL_METHOD(&_18$$17, connection, "getdefaultvalue", &_19, 0);
 							zephir_check_call_status();
-							zephir_array_append(&values, &_18$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+							zephir_array_append(&values, &_18$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
 						} else {
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3762);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3756);
 							zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 						}
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
-						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3767);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3761);
 					}
 				}
 			}
@@ -108479,7 +108478,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 						ZEPHIR_CONCAT_SVS(&_21$$22, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_20$$22, "__construct", &_5, 29, &_21$$22);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3710);
+						zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3704);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -108495,9 +108494,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								_22$$26 = zephir_array_isset(&defaultValues, &field);
 							}
 							if (_22$$26) {
-								zephir_array_fetch(&_23$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3727);
+								zephir_array_fetch(&_23$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3721);
 								zephir_array_update_zval(&snapshot, &attributeField, &_23$$27, PH_COPY | PH_SEPARATE);
-								zephir_array_fetch(&_24$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3728);
+								zephir_array_fetch(&_24$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3722);
 								zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_24$$27, PH_COPY | PH_SEPARATE);
 								ZEPHIR_CALL_METHOD(&_25$$27, connection, "supportsdefaultvalue", &_26, 0);
 								zephir_check_call_status();
@@ -108517,18 +108516,18 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								ZEPHIR_CONCAT_SVS(&_29$$30, "Column '", &field, "' have not defined a bind data type");
 								ZEPHIR_CALL_METHOD(NULL, &_28$$30, "__construct", &_5, 29, &_29$$30);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3745);
+								zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3739);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3748);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3749);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3750);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3742);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3743);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3744);
 						} else {
 							if (zephir_array_isset(&defaultValues, &field)) {
-								zephir_array_fetch(&_30$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3753);
+								zephir_array_fetch(&_30$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3747);
 								zephir_array_update_zval(&snapshot, &attributeField, &_30$$32, PH_COPY | PH_SEPARATE);
-								zephir_array_fetch(&_31$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3754);
+								zephir_array_fetch(&_31$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3748);
 								zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_31$$32, PH_COPY | PH_SEPARATE);
 								ZEPHIR_CALL_METHOD(&_32$$32, connection, "supportsdefaultvalue", &_33, 0);
 								zephir_check_call_status();
@@ -108537,13 +108536,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								}
 								ZEPHIR_CALL_METHOD(&_34$$32, connection, "getdefaultvalue", &_35, 0);
 								zephir_check_call_status();
-								zephir_array_append(&values, &_34$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+								zephir_array_append(&values, &_34$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
 							} else {
-								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3762);
+								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3756);
 								zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 							}
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
-							zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3767);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+							zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3761);
 						}
 					}
 				}
@@ -108559,7 +108558,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		zephir_check_call_status();
 		useExplicitIdentity = zephir_get_boolval(&_36$$35);
 		if (useExplicitIdentity) {
-			zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3786);
+			zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3780);
 		}
 		if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
 			ZEPHIR_OBS_NVAR(&attributeField);
@@ -108570,7 +108569,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 				ZEPHIR_CONCAT_SVS(&_38$$38, "Identity column '", identityField, "' isn't part of the column map");
 				ZEPHIR_CALL_METHOD(NULL, &_37$$38, "__construct", &_5, 29, &_38$$38);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3796);
+				zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3790);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -108585,12 +108584,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 			}
 			if (_39$$40) {
 				if (useExplicitIdentity) {
-					zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3808);
-					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3808);
+					zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3802);
+					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3802);
 				}
 			} else {
 				if (!(useExplicitIdentity)) {
-					zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3816);
+					zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3810);
 				}
 				ZEPHIR_OBS_NVAR(&bindType);
 				if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0)))) {
@@ -108600,23 +108599,23 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 					ZEPHIR_CONCAT_SVS(&_41$$45, "Identity column '", identityField, "' isn\'t part of the table columns");
 					ZEPHIR_CALL_METHOD(NULL, &_40$$45, "__construct", &_5, 29, &_41$$45);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3825);
+					zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3819);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3828);
-				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3829);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3822);
+				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3823);
 			}
 		} else {
 			if (useExplicitIdentity) {
-				zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
-				zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834);
+				zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3827);
+				zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3828);
 			}
 		}
 	}
 	if (Z_TYPE_P(table) == IS_ARRAY) {
-		zephir_array_fetch_long(&_42$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3843);
-		zephir_array_fetch_long(&_43$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3843);
+		zephir_array_fetch_long(&_42$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3837);
+		zephir_array_fetch_long(&_43$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3837);
 		ZEPHIR_INIT_VAR(&_44$$48);
 		ZEPHIR_CONCAT_VSV(&_44$$48, &_42$$48, ".", &_43$$48);
 		ZEPHIR_CPY_WRT(table, &_44$$48);
@@ -108637,9 +108636,9 @@ static 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, 427);
+				ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 				zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+				ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&sequenceName);
 				if (ZEPHIR_IS_EMPTY(&schema)) {
@@ -108662,7 +108661,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		zephir_update_property_zval(this_ptr, ZEND_STRL("uniqueParams"), &__$null);
 	}
 	if (zephir_is_true(&success)) {
-		zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3904);
+		zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3898);
 		if (Z_TYPE_P(&unsetDefaultValues) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&unsetDefaultValues), _51$$56, _52$$56, _49$$56)
 			{
@@ -108713,11 +108712,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 {
 	zval _17$$28, _18$$28, _30$$53, _31$$53;
 	zval _41;
-	zend_bool changed = 0, useDynamicUpdate = 0, _42, _43, _11$$22, _13$$22, _25$$47, _27$$47;
+	zend_bool changed = 0, useDynamicUpdate = 0, _43, _44, _11$$22, _13$$22, _25$$47, _27$$47;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL, *_15 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *metaData, metaData_sub, *connection, connection_sub, *table = NULL, table_sub, __$null, automaticAttributes, attributeField, bindSkip, bindDataTypes, bindType, bindTypes, columnMap, dataType, dataTypes, field, fields, manager, nonPrimary, newSnapshot, success, primaryKeys, snapshot, snapshotValue, uniqueKey, uniqueParams, uniqueTypes, value, values, updateValue, _0, _1, *_2, _3, _4$$10, _5$$10, _7$$13, _8$$13, _9$$23, _10$$23, _12$$24, _14$$27, _16$$27, _19$$35, _20$$35, _21$$38, _22$$38, _23$$48, _24$$48, _26$$49, _28$$52, _29$$52, *_32$$59, _33$$59, _34$$63, _35$$63, _36$$69, _37$$69, _38$$73, _39$$73, _40$$73, _44$$75, _45$$76;
+	zval *metaData, metaData_sub, *connection, connection_sub, *table = NULL, table_sub, __$null, automaticAttributes, attributeField, bindSkip, bindDataTypes, bindType, bindTypes, columnMap, dataType, dataTypes, field, fields, manager, nonPrimary, newSnapshot, success, primaryKeys, snapshot, snapshotValue, uniqueKey, uniqueParams, value, values, updateValue, _0, _1, *_2, _3, _42, _4$$10, _5$$10, _7$$13, _8$$13, _9$$23, _10$$23, _12$$24, _14$$27, _16$$27, _19$$35, _20$$35, _21$$38, _22$$38, _23$$48, _24$$48, _26$$49, _28$$52, _29$$52, *_32$$59, _33$$59, _34$$63, _35$$63, _36$$69, _37$$69, _38$$73, _39$$73, _40$$73, _45$$75, _46$$76;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&metaData_sub);
@@ -108744,13 +108743,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	ZVAL_UNDEF(&snapshotValue);
 	ZVAL_UNDEF(&uniqueKey);
 	ZVAL_UNDEF(&uniqueParams);
-	ZVAL_UNDEF(&uniqueTypes);
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&values);
 	ZVAL_UNDEF(&updateValue);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_42);
 	ZVAL_UNDEF(&_4$$10);
 	ZVAL_UNDEF(&_5$$10);
 	ZVAL_UNDEF(&_7$$13);
@@ -108777,8 +108776,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	ZVAL_UNDEF(&_38$$73);
 	ZVAL_UNDEF(&_39$$73);
 	ZVAL_UNDEF(&_40$$73);
-	ZVAL_UNDEF(&_44$$75);
-	ZVAL_UNDEF(&_45$$76);
+	ZVAL_UNDEF(&_45$$75);
+	ZVAL_UNDEF(&_46$$76);
 	ZVAL_UNDEF(&_41);
 	ZVAL_UNDEF(&_17$$28);
 	ZVAL_UNDEF(&_18$$28);
@@ -108836,7 +108835,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_INIT_NVAR(&columnMap);
 		ZVAL_NULL(&columnMap);
 	}
-	zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4093);
+	zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4087);
 	if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _2)
 		{
@@ -108852,7 +108851,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_5$$10, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", &_6, 29, &_5$$10);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3969);
+						zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3963);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -108869,16 +108868,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 					ZEPHIR_CONCAT_SVS(&_8$$13, "Column '", &field, "' have not defined a bind data type");
 					ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", &_6, 29, &_8$$13);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3983);
+					zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3977);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&value);
 				if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 					if (!(useDynamicUpdate)) {
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3995);
-						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3996);
-						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3997);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3989);
+						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3990);
+						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3991);
 					} else {
 						ZEPHIR_OBS_NVAR(&snapshotValue);
 						if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0))) {
@@ -108898,7 +108897,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 										ZEPHIR_CONCAT_SVS(&_10$$23, "Column '", &field, "' have not defined a data type");
 										ZEPHIR_CALL_METHOD(NULL, &_9$$23, "__construct", &_6, 29, &_10$$23);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 4022);
+										zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 4016);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -108946,17 +108945,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							}
 						}
 						if (changed) {
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4073);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4074);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4075);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4067);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4068);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4069);
 						}
 					}
 					zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4083);
-					zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4084);
-					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4085);
+					zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
+					zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
+					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -108981,7 +108980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							ZEPHIR_CONCAT_SVS(&_20$$35, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$35, "__construct", &_6, 29, &_20$$35);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_19$$35, "phalcon/Mvc/Model.zep", 3969);
+							zephir_throw_exception_debug(&_19$$35, "phalcon/Mvc/Model.zep", 3963);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -108998,16 +108997,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_22$$38, "Column '", &field, "' have not defined a bind data type");
 						ZEPHIR_CALL_METHOD(NULL, &_21$$38, "__construct", &_6, 29, &_22$$38);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_21$$38, "phalcon/Mvc/Model.zep", 3983);
+						zephir_throw_exception_debug(&_21$$38, "phalcon/Mvc/Model.zep", 3977);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&value);
 					if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 						if (!(useDynamicUpdate)) {
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3995);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3996);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3997);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3989);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3990);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3991);
 						} else {
 							ZEPHIR_OBS_NVAR(&snapshotValue);
 							if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0))) {
@@ -109027,7 +109026,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 											ZEPHIR_CONCAT_SVS(&_24$$48, "Column '", &field, "' have not defined a data type");
 											ZEPHIR_CALL_METHOD(NULL, &_23$$48, "__construct", &_6, 29, &_24$$48);
 											zephir_check_call_status();
-											zephir_throw_exception_debug(&_23$$48, "phalcon/Mvc/Model.zep", 4022);
+											zephir_throw_exception_debug(&_23$$48, "phalcon/Mvc/Model.zep", 4016);
 											ZEPHIR_MM_RESTORE();
 											return;
 										}
@@ -109075,17 +109074,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 								}
 							}
 							if (changed) {
-								zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4073);
-								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4074);
-								zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4075);
+								zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4067);
+								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4068);
+								zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4069);
 							}
 						}
 						zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 					} else {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4083);
-						zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4084);
-						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4085);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
+						zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
+						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
 					}
 				}
 			ZEPHIR_CALL_METHOD(NULL, &nonPrimary, "next", NULL, 0);
@@ -109103,18 +109102,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	ZEPHIR_CPY_WRT(&uniqueKey, &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("uniqueParams"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&uniqueParams, &_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&uniqueTypes, &_0);
 	if (Z_TYPE_P(&uniqueParams) != IS_ARRAY) {
 		ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr);
 		zephir_check_call_status();
 		if (UNEXPECTED(!(zephir_fast_count_int(&primaryKeys)))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 4117);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 4110);
 			return;
 		}
 		ZEPHIR_INIT_NVAR(&uniqueParams);
 		array_init(&uniqueParams);
-		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4144);
+		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4137);
 		if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _32$$59)
 			{
@@ -109129,7 +109126,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_35$$63, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_34$$63, "__construct", &_6, 29, &_35$$63);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_34$$63, "phalcon/Mvc/Model.zep", 4130);
+						zephir_throw_exception_debug(&_34$$63, "phalcon/Mvc/Model.zep", 4123);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -109139,10 +109136,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 				ZEPHIR_OBS_NVAR(&value);
 				if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
+					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4131);
 				} else {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4141);
+					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4134);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -109165,7 +109162,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							ZEPHIR_CONCAT_SVS(&_37$$69, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_36$$69, "__construct", &_6, 29, &_37$$69);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_36$$69, "phalcon/Mvc/Model.zep", 4130);
+							zephir_throw_exception_debug(&_36$$69, "phalcon/Mvc/Model.zep", 4123);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -109175,10 +109172,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 					ZEPHIR_OBS_NVAR(&value);
 					if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
+						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4131);
 					} else {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4141);
+						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4134);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 				zephir_check_call_status();
@@ -109187,8 +109184,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_INIT_NVAR(&field);
 	}
 	if (Z_TYPE_P(table) == IS_ARRAY) {
-		zephir_array_fetch_long(&_38$$73, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4150);
-		zephir_array_fetch_long(&_39$$73, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4150);
+		zephir_array_fetch_long(&_38$$73, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4143);
+		zephir_array_fetch_long(&_39$$73, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4143);
 		ZEPHIR_INIT_VAR(&_40$$73);
 		ZEPHIR_CONCAT_VSV(&_40$$73, &_38$$73, ".", &_39$$73);
 		ZEPHIR_CPY_WRT(table, &_40$$73);
@@ -109197,29 +109194,31 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	zephir_create_array(&_41, 3, 0);
 	zephir_array_update_string(&_41, SL("conditions"), &uniqueKey, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&_41, SL("bind"), &uniqueParams, PH_COPY | PH_SEPARATE);
-	zephir_array_update_string(&_41, SL("bindTypes"), &uniqueTypes, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_VAR(&_42);
+	zephir_read_property(&_42, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC);
+	zephir_array_update_string(&_41, SL("bindTypes"), &_42, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_METHOD(&success, connection, "update", NULL, 0, table, &fields, &values, &_41, &bindTypes);
 	zephir_check_call_status();
-	_42 = zephir_is_true(&success);
-	if (_42) {
+	_43 = zephir_is_true(&success);
+	if (_43) {
 		ZEPHIR_CALL_METHOD(&_1, &manager, "iskeepingsnapshots", NULL, 0, this_ptr);
 		zephir_check_call_status();
-		_42 = zephir_is_true(&_1);
+		_43 = zephir_is_true(&_1);
 	}
-	_43 = _42;
-	if (_43) {
-		_43 = ZEPHIR_GLOBAL(orm).update_snapshot_on_save;
+	_44 = _43;
+	if (_44) {
+		_44 = ZEPHIR_GLOBAL(orm).update_snapshot_on_save;
 	}
-	if (_43) {
+	if (_44) {
 		if (Z_TYPE_P(&snapshot) == IS_ARRAY) {
 			zephir_update_property_zval(this_ptr, ZEND_STRL("oldSnapshot"), &snapshot);
-			ZEPHIR_INIT_VAR(&_44$$75);
-			zephir_fast_array_merge(&_44$$75, &snapshot, &newSnapshot);
-			zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &_44$$75);
+			ZEPHIR_INIT_VAR(&_45$$75);
+			zephir_fast_array_merge(&_45$$75, &snapshot, &newSnapshot);
+			zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &_45$$75);
 		} else {
-			ZEPHIR_INIT_VAR(&_45$$76);
-			array_init(&_45$$76);
-			zephir_update_property_zval(this_ptr, ZEND_STRL("oldSnapshot"), &_45$$76);
+			ZEPHIR_INIT_VAR(&_46$$76);
+			array_init(&_46$$76);
+			zephir_update_property_zval(this_ptr, ZEND_STRL("oldSnapshot"), &_46$$76);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &newSnapshot);
 		}
 	}
@@ -109319,7 +109318,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 		array_init(&uniqueParams);
 		ZEPHIR_INIT_NVAR(&uniqueTypes);
 		array_init(&uniqueTypes);
-		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4274);
+		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4267);
 		if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _1$$3)
 			{
@@ -109334,7 +109333,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 						ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 29, &_4$$9);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4233);
+						zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4226);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -109352,9 +109351,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 					if (_6$$11) {
 						numberEmpty++;
 					}
-					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4254);
+					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4247);
 				} else {
-					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4256);
+					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4249);
 					numberEmpty++;
 				}
 				ZEPHIR_OBS_NVAR(&type);
@@ -109365,16 +109364,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 					ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' isn't part of the table columns");
 					ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_5, 29, &_8$$14);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4263);
+					zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4256);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4266);
+				zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4259);
 				ZEPHIR_CALL_METHOD(&_9$$7, connection, "escapeidentifier", &_10, 0, &field);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_11$$7);
 				ZEPHIR_CONCAT_VS(&_11$$7, &_9$$7, " = ?");
-				zephir_array_append(&wherePk, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4267);
+				zephir_array_append(&wherePk, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -109396,7 +109395,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 							ZEPHIR_CONCAT_SVS(&_13$$17, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$17, "__construct", &_5, 29, &_13$$17);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4233);
+							zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4226);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -109414,9 +109413,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 						if (_14$$19) {
 							numberEmpty++;
 						}
-						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4254);
+						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4247);
 					} else {
-						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4256);
+						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4249);
 						numberEmpty++;
 					}
 					ZEPHIR_OBS_NVAR(&type);
@@ -109427,16 +109426,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 						ZEPHIR_CONCAT_SVS(&_16$$22, "Column '", &field, "' isn't part of the table columns");
 						ZEPHIR_CALL_METHOD(NULL, &_15$$22, "__construct", &_5, 29, &_16$$22);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4263);
+						zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4256);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4266);
+					zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4259);
 					ZEPHIR_CALL_METHOD(&_17$$15, connection, "escapeidentifier", &_18, 0, &field);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_19$$15);
 					ZEPHIR_CONCAT_VS(&_19$$15, &_17$$15, " = ?");
-					zephir_array_append(&wherePk, &_19$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4267);
+					zephir_array_append(&wherePk, &_19$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
 				ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -109468,9 +109467,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 		zephir_read_property(&_22$$27, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&uniqueTypes, &_22$$27);
 	}
-	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -109487,7 +109486,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
 	ZVAL_NULL(&_25);
 	ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_24, &_25, &uniqueParams, &uniqueTypes);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_26, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4328);
+	zephir_array_fetch_string(&_26, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4321);
 	if (zephir_is_true(&_26)) {
 		ZEPHIR_INIT_ZVAL_NREF(_27$$30);
 		ZVAL_LONG(&_27$$30, 0);
@@ -109681,7 +109680,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, groupResult)
 		ZEPHIR_INIT_VAR(&params);
 		array_init(&params);
 		if (Z_TYPE_P(parameters) != IS_NULL) {
-			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4433);
+			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4426);
 		}
 	} else {
 		ZEPHIR_CPY_WRT(&params, parameters);
@@ -109725,10 +109724,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, groupResult)
 	}
 	if (zephir_array_isset_string(&params, SL("bind"))) {
 		ZEPHIR_OBS_NVAR(&bindParams);
-		zephir_array_fetch_string(&bindParams, &params, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4476);
+		zephir_array_fetch_string(&bindParams, &params, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4469);
 		if (zephir_array_isset_string(&params, SL("bindTypes"))) {
 			ZEPHIR_OBS_NVAR(&bindTypes);
-			zephir_array_fetch_string(&bindTypes, &params, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4479);
+			zephir_array_fetch_string(&bindTypes, &params, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4472);
 		}
 	}
 	ZEPHIR_OBS_VAR(&cache);
@@ -109831,7 +109830,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, invokeFinder)
 		ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument");
 		ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 29, &_4$$7);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4558);
+		zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4551);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -109863,7 +109862,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, invokeFinder)
 				ZEPHIR_CONCAT_SVS(&_6$$13, "Cannot resolve attribute '", &extraMethod, "' in the model");
 				ZEPHIR_CALL_METHOD(NULL, &_5$$13, "__construct", NULL, 29, &_6$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4595);
+				zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4588);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -110045,7 +110044,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
 		}
 	}
 	if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) {
-		ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 436);
+		ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 432);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) {
 			RETURN_MM_BOOL(0);
@@ -110076,7 +110075,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
 			ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr);
 			zephir_check_call_status();
 			error = 0;
-			zephir_is_iterable(&notNull, 0, "phalcon/Mvc/Model.zep", 4832);
+			zephir_is_iterable(&notNull, 0, "phalcon/Mvc/Model.zep", 4825);
 			if (Z_TYPE_P(&notNull) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&notNull), _4$$11)
 				{
@@ -110092,7 +110091,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
 								ZEPHIR_CONCAT_SVS(&_7$$19, "Column '", &field, "' isn't part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_6$$19, "__construct", &_8, 29, &_7$$19);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4756);
+								zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4749);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -110117,7 +110116,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
 											if (_10$$27) {
 												_11$$27 = !(zephir_array_isset(&defaultValues, &field));
 												if (!(_11$$27)) {
-													zephir_array_fetch(&_12$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4786);
+													zephir_array_fetch(&_12$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4779);
 													_11$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_12$$27);
 												}
 												_10$$27 = _11$$27;
@@ -110180,7 +110179,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
 									ZEPHIR_CONCAT_SVS(&_18$$39, "Column '", &field, "' isn't part of the column map");
 									ZEPHIR_CALL_METHOD(NULL, &_17$$39, "__construct", &_8, 29, &_18$$39);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4756);
+									zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4749);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -110205,7 +110204,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
 												if (_20$$47) {
 													_21$$47 = !(zephir_array_isset(&defaultValues, &field));
 													if (!(_21$$47)) {
-														zephir_array_fetch(&_22$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4786);
+														zephir_array_fetch(&_22$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4779);
 														_21$$47 = !ZEPHIR_IS_IDENTICAL(&value, &_22$$47);
 													}
 													_20$$47 = _21$$47;
@@ -110403,7 +110402,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_1);
-	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5012);
+	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5005);
 	if (Z_TYPE_P(related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _4, _5, _2)
 		{
@@ -110430,7 +110429,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, &_8$$6);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4953);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4946);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -110445,7 +110444,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_11, 0, &_10$$7);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4965);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4958);
 						return;
 					}
 					zephir_read_property(&_12$$5, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
@@ -110458,7 +110457,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 					if (_13$$5) {
 						ZEPHIR_CALL_METHOD(&_15$$8, &record, "getmessages", NULL, 0);
 						zephir_check_call_status();
-						zephir_is_iterable(&_15$$8, 0, "phalcon/Mvc/Model.zep", 4998);
+						zephir_is_iterable(&_15$$8, 0, "phalcon/Mvc/Model.zep", 4991);
 						if (Z_TYPE_P(&_15$$8) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_15$$8), _16$$8)
 							{
@@ -110542,7 +110541,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 							}
 							ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_27, 0, &_26$$16);
 							zephir_check_call_status();
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4953);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4946);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -110557,7 +110556,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 							}
 							ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_29, 0, &_28$$17);
 							zephir_check_call_status();
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4965);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4958);
 							return;
 						}
 						zephir_read_property(&_30$$15, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
@@ -110570,7 +110569,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						if (_31$$15) {
 							ZEPHIR_CALL_METHOD(&_33$$18, &record, "getmessages", NULL, 0);
 							zephir_check_call_status();
-							zephir_is_iterable(&_33$$18, 0, "phalcon/Mvc/Model.zep", 4998);
+							zephir_is_iterable(&_33$$18, 0, "phalcon/Mvc/Model.zep", 4991);
 							if (Z_TYPE_P(&_33$$18) == IS_ARRAY) {
 								ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_33$$18), _34$$18)
 								{
@@ -110818,7 +110817,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5261);
+	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5254);
 	if (Z_TYPE_P(related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _1)
 		{
@@ -110851,7 +110850,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					}
 					ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, &_9$$6);
 					zephir_check_call_status();
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5074);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5067);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -110868,7 +110867,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					}
 					ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_12, 0, &_11$$7);
 					zephir_check_call_status();
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5084);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5077);
 					return;
 				}
 				if (Z_TYPE_P(&record) == IS_OBJECT) {
@@ -110893,7 +110892,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CONCAT_SVS(&_16$$10, "The column '", &columns, "' needs to be present in the model");
 					ZEPHIR_CALL_METHOD(NULL, &_15$$10, "__construct", &_17, 29, &_16$$10);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 5101);
+					zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 5094);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -110908,7 +110907,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0);
 					zephir_check_call_status();
 				}
-				zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5247);
+				zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5240);
 				if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _19$$4)
 					{
@@ -110923,7 +110922,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						if (!(zephir_is_true(&_21$$12))) {
 							ZEPHIR_CALL_METHOD(&_22$$14, &recordAfter, "getmessages", NULL, 0);
 							zephir_check_call_status();
-							zephir_is_iterable(&_22$$14, 0, "phalcon/Mvc/Model.zep", 5160);
+							zephir_is_iterable(&_22$$14, 0, "phalcon/Mvc/Model.zep", 5153);
 							if (Z_TYPE_P(&_22$$14) == IS_ARRAY) {
 								ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_22$$14), _23$$14)
 								{
@@ -111006,7 +111005,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_36$$19))) {
 								ZEPHIR_CALL_METHOD(&_37$$22, &intermediateModel, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_37$$22, 0, "phalcon/Mvc/Model.zep", 5241);
+								zephir_is_iterable(&_37$$22, 0, "phalcon/Mvc/Model.zep", 5234);
 								if (Z_TYPE_P(&_37$$22) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_37$$22), _38$$22)
 									{
@@ -111078,7 +111077,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_44$$27))) {
 								ZEPHIR_CALL_METHOD(&_45$$29, &recordAfter, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_45$$29, 0, "phalcon/Mvc/Model.zep", 5160);
+								zephir_is_iterable(&_45$$29, 0, "phalcon/Mvc/Model.zep", 5153);
 								if (Z_TYPE_P(&_45$$29) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_45$$29), _46$$29)
 									{
@@ -111161,7 +111160,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_58$$34))) {
 									ZEPHIR_CALL_METHOD(&_59$$37, &intermediateModel, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_59$$37, 0, "phalcon/Mvc/Model.zep", 5241);
+									zephir_is_iterable(&_59$$37, 0, "phalcon/Mvc/Model.zep", 5234);
 									if (Z_TYPE_P(&_59$$37) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_59$$37), _60$$37)
 										{
@@ -111232,7 +111231,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CONCAT_SVSVS(&_69$$43, "There are no defined relations for the model '", &className, "' using alias '", &name, "'");
 					ZEPHIR_CALL_METHOD(NULL, &_68$$43, "__construct", &_17, 29, &_69$$43);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5253);
+					zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5246);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -111272,7 +111271,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_75, 0, &_74$$47);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5074);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5067);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -111289,7 +111288,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_77, 0, &_76$$48);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5084);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5077);
 						return;
 					}
 					if (Z_TYPE_P(&record) == IS_OBJECT) {
@@ -111315,7 +111314,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CONCAT_SVS(&_82$$51, "The column '", &columns, "' needs to be present in the model");
 						ZEPHIR_CALL_METHOD(NULL, &_81$$51, "__construct", &_17, 29, &_82$$51);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 5101);
+						zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 5094);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -111330,7 +111329,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0);
 						zephir_check_call_status();
 					}
-					zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5247);
+					zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5240);
 					if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _84$$45)
 						{
@@ -111345,7 +111344,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_86$$53))) {
 								ZEPHIR_CALL_METHOD(&_87$$55, &recordAfter, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_87$$55, 0, "phalcon/Mvc/Model.zep", 5160);
+								zephir_is_iterable(&_87$$55, 0, "phalcon/Mvc/Model.zep", 5153);
 								if (Z_TYPE_P(&_87$$55) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_87$$55), _88$$55)
 									{
@@ -111428,7 +111427,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_100$$60))) {
 									ZEPHIR_CALL_METHOD(&_101$$63, &intermediateModel, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_101$$63, 0, "phalcon/Mvc/Model.zep", 5241);
+									zephir_is_iterable(&_101$$63, 0, "phalcon/Mvc/Model.zep", 5234);
 									if (Z_TYPE_P(&_101$$63) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_101$$63), _102$$63)
 										{
@@ -111500,7 +111499,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_108$$68))) {
 									ZEPHIR_CALL_METHOD(&_109$$70, &recordAfter, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_109$$70, 0, "phalcon/Mvc/Model.zep", 5160);
+									zephir_is_iterable(&_109$$70, 0, "phalcon/Mvc/Model.zep", 5153);
 									if (Z_TYPE_P(&_109$$70) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_109$$70), _110$$70)
 										{
@@ -111583,7 +111582,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 									if (!(zephir_is_true(&_122$$75))) {
 										ZEPHIR_CALL_METHOD(&_123$$78, &intermediateModel, "getmessages", NULL, 0);
 										zephir_check_call_status();
-										zephir_is_iterable(&_123$$78, 0, "phalcon/Mvc/Model.zep", 5241);
+										zephir_is_iterable(&_123$$78, 0, "phalcon/Mvc/Model.zep", 5234);
 										if (Z_TYPE_P(&_123$$78) == IS_ARRAY) {
 											ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_123$$78), _124$$78)
 											{
@@ -111654,7 +111653,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CONCAT_SVSVS(&_133$$84, "There are no defined relations for the model '", &className, "' using alias '", &name, "'");
 						ZEPHIR_CALL_METHOD(NULL, &_132$$84, "__construct", &_17, 29, &_133$$84);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5253);
+						zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5246);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -111704,7 +111703,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5294);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5287);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -112309,7 +112308,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5753);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5746);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -112370,7 +112369,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5788);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5781);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -112541,7 +112540,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_array_keys(&_0, columnMap);
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5924);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5917);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -112584,7 +112583,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
 
 zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type)
 {
-		zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8;
+		zval _0, _2, _4, _6, _8, _10, _12, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8, _13$$9;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
@@ -112592,12 +112591,14 @@ zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_ty
 	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_8);
 	ZVAL_UNDEF(&_10);
+	ZVAL_UNDEF(&_12);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_3$$4);
 	ZVAL_UNDEF(&_5$$5);
 	ZVAL_UNDEF(&_7$$6);
 	ZVAL_UNDEF(&_9$$7);
 	ZVAL_UNDEF(&_11$$8);
+	ZVAL_UNDEF(&_13$$9);
 	
 
 		ZEPHIR_MM_GROW();
@@ -112605,41 +112606,47 @@ zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_ty
 	{
 		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("uniqueParams"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("uniqueTypes"), 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("uniqueParams"), &_1$$3);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("uniqueTypes"), &_1$$3);
 		}
-		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("uniqueParams"), 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("snapshot"), &_3$$4);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("uniqueParams"), &_3$$4);
 		}
-		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_4) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_5$$5);
 			array_init(&_5$$5);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("oldSnapshot"), &_5$$5);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("snapshot"), &_5$$5);
 		}
-		zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("related"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_6) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_7$$6);
 			array_init(&_7$$6);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("related"), &_7$$6);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("oldSnapshot"), &_7$$6);
 		}
-		zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("related"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_8) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_9$$7);
 			array_init(&_9$$7);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("errorMessages"), &_9$$7);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("related"), &_9$$7);
 		}
-		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_10) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_11$$8);
 			array_init(&_11$$8);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("dirtyRelated"), &_11$$8);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("errorMessages"), &_11$$8);
+		}
+		zephir_read_property_ex(&_12, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_12) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_13$$9);
+			array_init(&_13$$9);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("dirtyRelated"), &_13$$9);
 		}
 		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
@@ -112764,74 +112771,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "keyRouteNames");
-}
-
-static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *keyRouteNames_param = NULL;
-	zval keyRouteNames;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&keyRouteNames);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ARRAY(keyRouteNames)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &keyRouteNames_param);
-	zephir_get_arrval(&keyRouteNames, keyRouteNames_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteNames"), &keyRouteNames);
-	RETURN_THIS();
-}
-
-static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "keyRouteIds");
-}
-
-static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *keyRouteIds_param = NULL;
-	zval keyRouteIds;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&keyRouteIds);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ARRAY(keyRouteIds)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &keyRouteIds_param);
-	zephir_get_arrval(&keyRouteIds, keyRouteIds_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteIds"), &keyRouteIds);
-	RETURN_THIS();
-}
-
 static PHP_METHOD(Phalcon_Mvc_Router, __construct)
 {
 	zval routes, _1$$3, _3$$3;
@@ -112881,7 +112820,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, __construct)
 		ZVAL_STRING(&_2$$3, "#^/([\\w0-9\\_\\-]+)[/]{0,1}$#u");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 97, &_2$$3, &_1$$3);
 		zephir_check_call_status();
-		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 171);
+		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 170);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		object_init_ex(&_2$$3, phalcon_mvc_router_route_ce);
 		ZEPHIR_INIT_VAR(&_3$$3);
@@ -112893,7 +112832,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, __construct)
 		ZVAL_STRING(&_4$$3, "#^/([\\w0-9\\_\\-]+)/([\\w0-9\\.\\_]+)(/.*)*$#u");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 97, &_4$$3, &_3$$3);
 		zephir_check_call_status();
-		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 180);
+		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 179);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("routes"), &routes);
 	ZEPHIR_MM_RESTORE();
@@ -113547,7 +113486,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, attach)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("routes"), &_0$$4);
 			break;
 		}
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/Mvc/Router.zep", 459);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/Mvc/Router.zep", 494);
 		return;
 	} while(0);
 
@@ -113598,6 +113537,54 @@ static PHP_METHOD(Phalcon_Mvc_Router, getControllerName)
 	RETURN_MEMBER(getThis(), "controller");
 }
 
+static PHP_METHOD(Phalcon_Mvc_Router, getDefaults)
+{
+	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&_0);
+
+
+	ZEPHIR_MM_GROW();
+
+	zephir_create_array(return_value, 5, 0);
+	ZEPHIR_OBS_VAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultNamespace"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("namespace"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("module"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultController"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("controller"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultAction"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("action"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultParams"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("params"), &_0, PH_COPY | PH_SEPARATE);
+	RETURN_MM();
+}
+
+static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "keyRouteNames");
+}
+
+static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "keyRouteIds");
+}
+
 static PHP_METHOD(Phalcon_Mvc_Router, getMatchedRoute)
 {
 	zval *this_ptr = getThis();
@@ -113677,11 +113664,11 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteById)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("keyRouteIds"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset_fetch(&key, &_0, id, 0)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 549);
+		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 614);
 		RETURN_CTOR(&_2$$3);
 	}
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 561);
+	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 626);
 	if (Z_TYPE_P(&_3) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_3), _6, _7, _4)
 		{
@@ -113772,11 +113759,11 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteByName)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("keyRouteNames"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset_fetch(&key, &_0, &name, 0)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 576);
+		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 641);
 		RETURN_CTOR(&_2$$3);
 	}
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 591);
+	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 656);
 	if (Z_TYPE_P(&_3) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_3), _6, _7, _4)
 		{
@@ -113977,7 +113964,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("removeExtraSlashes"), PH_NOISY_CC | PH_READONLY);
 	_2 = zephir_is_true(&_0);
 	if (_2) {
-		_2 = !ZEPHIR_IS_STRING(&uri, "/");
+		_2 = !ZEPHIR_IS_STRING_IDENTICAL(&uri, "/");
 	}
 	if (_2) {
 		ZEPHIR_INIT_VAR(&_3$$3);
@@ -114011,14 +113998,14 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("matchedRoute"), &__$null);
 	zephir_read_property(&_4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&eventsManager, &_4);
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
+	if (Z_TYPE_P(&eventsManager) != IS_NULL) {
 		ZEPHIR_INIT_VAR(&_5$$6);
 		ZVAL_STRING(&_5$$6, "router:beforeCheckRoutes");
 		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_5$$6, this_ptr);
 		zephir_check_call_status();
 	}
 	zephir_read_property(&_4, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Router.zep", 888);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Router.zep", 948);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(&_4), _6)
 		{
@@ -114034,8 +114021,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (Z_TYPE_P(&request) == IS_NULL) {
 					zephir_read_property(&_8$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&container, &_8$$9);
-					if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 676);
+					if (Z_TYPE_P(&container) == IS_NULL) {
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 739);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&_10$$9);
@@ -114057,8 +114044,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (Z_TYPE_P(&request) == IS_NULL) {
 					zephir_read_property(&_13$$13, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&container, &_13$$13);
-					if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 705);
+					if (Z_TYPE_P(&container) == IS_NULL) {
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 766);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&_15$$13);
@@ -114074,11 +114061,11 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (!(zephir_is_true(&currentHostName))) {
 					continue;
 				}
-				if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 729)) {
-					if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 730))) {
+				if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 790)) {
+					if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 791))) {
 						ZEPHIR_INIT_NVAR(&regexHostName);
 						ZEPHIR_CONCAT_SV(&regexHostName, "#^", &hostname);
-						if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 733))) {
+						if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 794))) {
 							zephir_concat_self_str(&regexHostName, SL("(:[[:digit:]]+)?"));
 						}
 						zephir_concat_self_str(&regexHostName, SL("$#i"));
@@ -114104,7 +114091,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 			}
 			ZEPHIR_CALL_METHOD(&pattern, &route, "getcompiledpattern", NULL, 0);
 			zephir_check_call_status();
-			if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 761)) {
+			if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 822)) {
 				ZEPHIR_INIT_NVAR(&routeFound);
 				zephir_preg_match(&routeFound, &pattern, &handledUri, &matches, 0, 0 , 0 );
 			} else {
@@ -114122,7 +114109,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 				zephir_check_call_status();
 				if (Z_TYPE_P(&beforeMatch) != IS_NULL) {
 					if (UNEXPECTED(!(zephir_is_callable(&beforeMatch)))) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 784);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 844);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&_21$$28);
@@ -114149,7 +114136,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (Z_TYPE_P(&matches) == IS_ARRAY) {
 					ZEPHIR_CALL_METHOD(&converters, &route, "getconverters", NULL, 0);
 					zephir_check_call_status();
-					zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 876);
+					zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 936);
 					if (Z_TYPE_P(&paths) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _26$$33, _27$$33, _24$$33)
 						{
@@ -114168,7 +114155,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 								ZEPHIR_CONCAT_SV(&_29$$35, "Wrong key in paths: ", &part);
 								ZEPHIR_CALL_METHOD(NULL, &_28$$35, "__construct", &_30, 29, &_29$$35);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_28$$35, "phalcon/Mvc/Router.zep", 824);
+								zephir_throw_exception_debug(&_28$$35, "phalcon/Mvc/Router.zep", 884);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -114234,7 +114221,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 									ZEPHIR_CONCAT_SV(&_37$$46, "Wrong key in paths: ", &part);
 									ZEPHIR_CALL_METHOD(NULL, &_36$$46, "__construct", &_30, 29, &_37$$46);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_36$$46, "phalcon/Mvc/Router.zep", 824);
+									zephir_throw_exception_debug(&_36$$46, "phalcon/Mvc/Router.zep", 884);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -114312,8 +114299,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (Z_TYPE_P(&request) == IS_NULL) {
 						zephir_read_property(&_43$$58, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 						ZEPHIR_CPY_WRT(&container, &_43$$58);
-						if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 676);
+						if (Z_TYPE_P(&container) == IS_NULL) {
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 739);
 							return;
 						}
 						ZEPHIR_INIT_NVAR(&_45$$58);
@@ -114335,8 +114322,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (Z_TYPE_P(&request) == IS_NULL) {
 						zephir_read_property(&_48$$62, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 						ZEPHIR_CPY_WRT(&container, &_48$$62);
-						if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 705);
+						if (Z_TYPE_P(&container) == IS_NULL) {
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 766);
 							return;
 						}
 						ZEPHIR_INIT_NVAR(&_50$$62);
@@ -114352,11 +114339,11 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (!(zephir_is_true(&currentHostName))) {
 						continue;
 					}
-					if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 729)) {
-						if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 730))) {
+					if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 790)) {
+						if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 791))) {
 							ZEPHIR_INIT_NVAR(&regexHostName);
 							ZEPHIR_CONCAT_SV(&regexHostName, "#^", &hostname);
-							if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 733))) {
+							if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 794))) {
 								zephir_concat_self_str(&regexHostName, SL("(:[[:digit:]]+)?"));
 							}
 							zephir_concat_self_str(&regexHostName, SL("$#i"));
@@ -114382,7 +114369,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 				}
 				ZEPHIR_CALL_METHOD(&pattern, &route, "getcompiledpattern", NULL, 0);
 				zephir_check_call_status();
-				if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 761)) {
+				if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 822)) {
 					ZEPHIR_INIT_NVAR(&routeFound);
 					zephir_preg_match(&routeFound, &pattern, &handledUri, &matches, 0, 0 , 0 );
 				} else {
@@ -114400,7 +114387,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 					zephir_check_call_status();
 					if (Z_TYPE_P(&beforeMatch) != IS_NULL) {
 						if (UNEXPECTED(!(zephir_is_callable(&beforeMatch)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 784);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 844);
 							return;
 						}
 						ZEPHIR_INIT_NVAR(&_56$$77);
@@ -114427,7 +114414,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (Z_TYPE_P(&matches) == IS_ARRAY) {
 						ZEPHIR_CALL_METHOD(&converters, &route, "getconverters", NULL, 0);
 						zephir_check_call_status();
-						zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 876);
+						zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 936);
 						if (Z_TYPE_P(&paths) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _61$$82, _62$$82, _59$$82)
 							{
@@ -114446,7 +114433,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 									ZEPHIR_CONCAT_SV(&_64$$84, "Wrong key in paths: ", &part);
 									ZEPHIR_CALL_METHOD(NULL, &_63$$84, "__construct", &_30, 29, &_64$$84);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_63$$84, "phalcon/Mvc/Router.zep", 824);
+									zephir_throw_exception_debug(&_63$$84, "phalcon/Mvc/Router.zep", 884);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -114512,7 +114499,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle)
 										ZEPHIR_CONCAT_SV(&_71$$95, "Wrong key in paths: ", &part);
 										ZEPHIR_CALL_METHOD(NULL, &_70$$95, "__construct", &_30, 29, &_71$$95);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_70$$95, "phalcon/Mvc/Router.zep", 824);
+										zephir_throw_exception_debug(&_70$$95, "phalcon/Mvc/Router.zep", 884);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -114709,13 +114696,13 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount)
 	ZEPHIR_CALL_METHOD(&groupRoutes, group, "getroutes", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!(zephir_fast_count_int(&groupRoutes)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/Mvc/Router.zep", 1009);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/Mvc/Router.zep", 1069);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&beforeMatch, group, "getbeforematch", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&beforeMatch) != IS_NULL) {
-		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1021);
+		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1081);
 		if (Z_TYPE_P(&groupRoutes) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&groupRoutes), _2$$5)
 			{
@@ -114746,7 +114733,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount)
 	ZEPHIR_CALL_METHOD(&hostname, group, "gethostname", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&hostname) != IS_NULL) {
-		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1030);
+		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1090);
 		if (Z_TYPE_P(&groupRoutes) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&groupRoutes), _4$$8)
 			{
@@ -114805,7 +114792,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, notFound)
 		_0 = Z_TYPE_P(paths) != IS_STRING;
 	}
 	if (UNEXPECTED(_0)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/Mvc/Router.zep", 1052);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/Mvc/Router.zep", 1112);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("notFoundPaths"), paths);
@@ -115023,54 +115010,74 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaults)
 	RETURN_THIS();
 }
 
-static PHP_METHOD(Phalcon_Mvc_Router, getDefaults)
+static PHP_METHOD(Phalcon_Mvc_Router, setEventsManager)
+{
+	zval *eventsManager, eventsManager_sub;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&eventsManager_sub);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	zephir_fetch_params_without_memory_grow(1, 0, &eventsManager);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("eventsManager"), eventsManager);
+}
+
+static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames)
 {
-	zval _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *routeNames_param = NULL;
+	zval routeNames;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&routeNames);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_ARRAY(routeNames)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
 
 
 	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &routeNames_param);
+	zephir_get_arrval(&routeNames, routeNames_param);
 
-	zephir_create_array(return_value, 5, 0);
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultNamespace"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("namespace"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("module"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultController"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("controller"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultAction"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("action"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultParams"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("params"), &_0, PH_COPY | PH_SEPARATE);
-	RETURN_MM();
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteNames"), &routeNames);
+	RETURN_THIS();
 }
 
-static PHP_METHOD(Phalcon_Mvc_Router, setEventsManager)
+static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds)
 {
-	zval *eventsManager, eventsManager_sub;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *routeIds_param = NULL;
+	zval routeIds;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&eventsManager_sub);
+	ZVAL_UNDEF(&routeIds);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce)
+		Z_PARAM_ARRAY(routeIds)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &eventsManager);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &routeIds_param);
+	zephir_get_arrval(&routeIds, routeIds_param);
 
 
-	zephir_update_property_zval(this_ptr, ZEND_STRL("eventsManager"), eventsManager);
+	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteIds"), &routeIds);
+	RETURN_THIS();
 }
 
 static PHP_METHOD(Phalcon_Mvc_Router, wasMatched)
@@ -115414,7 +115421,7 @@ static PHP_METHOD(Phalcon_Mvc_Url, get)
 		zephir_check_call_status();
 	}
 	if (zephir_is_true(args)) {
-		ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 490, args);
+		ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 486, args);
 		zephir_check_call_status();
 		_20$$16 = Z_TYPE_P(&queryString) == IS_STRING;
 		if (_20$$16) {
@@ -115527,21 +115534,19 @@ static PHP_METHOD(Phalcon_Mvc_Url, getStatic)
 
 static PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri)
 {
-	zval staticBaseUri, _0;
+	zval _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&staticBaseUri);
 	ZVAL_UNDEF(&_0);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("staticBaseUri"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&staticBaseUri, &_0);
-	if (Z_TYPE_P(&staticBaseUri) != IS_NULL) {
-		RETURN_CCTOR(&staticBaseUri);
+	if (Z_TYPE_P(&_0) != IS_NULL) {
+		RETURN_MM_MEMBER(getThis(), "staticBaseUri");
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbaseuri", NULL, 0);
 	zephir_check_call_status();
@@ -115739,33 +115744,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_View)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "currentRenderLevel");
-}
-
-static PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "registeredEngines");
-}
-
-static PHP_METHOD(Phalcon_Mvc_View, getRenderLevel)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "renderLevel");
-}
-
 static PHP_METHOD(Phalcon_Mvc_View, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -116044,7 +116022,7 @@ static PHP_METHOD(Phalcon_Mvc_View, finish)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 	zephir_check_call_status();
 	RETURN_THIS();
 }
@@ -116122,6 +116100,33 @@ static PHP_METHOD(Phalcon_Mvc_View, getControllerName)
 	RETURN_MEMBER(getThis(), "controllerName");
 }
 
+static PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "currentRenderLevel");
+}
+
+static PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "registeredEngines");
+}
+
+static PHP_METHOD(Phalcon_Mvc_View, getRenderLevel)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "renderLevel");
+}
+
 static PHP_METHOD(Phalcon_Mvc_View, getEventsManager)
 {
 	zval *this_ptr = getThis();
@@ -116444,14 +116449,14 @@ static PHP_METHOD(Phalcon_Mvc_View, has)
 	}
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "getviewsdirs", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&_2, 0, "phalcon/Mvc/View.zep", 573);
+	zephir_is_iterable(&_2, 0, "phalcon/Mvc/View.zep", 597);
 	if (Z_TYPE_P(&_2) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3)
 		{
 			ZEPHIR_INIT_NVAR(&viewsDir);
 			ZVAL_COPY(&viewsDir, _3);
 			ZEPHIR_INIT_NVAR(&_5$$4);
-			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 571);
+			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 595);
 			if (Z_TYPE_P(&engines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _8$$4, _9$$4, _6$$4)
 				{
@@ -116506,7 +116511,7 @@ static PHP_METHOD(Phalcon_Mvc_View, has)
 			ZEPHIR_CALL_METHOD(&viewsDir, &_2, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_12$$9);
-				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 571);
+				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 595);
 				if (Z_TYPE_P(&engines) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _15$$9, _16$$9, _13$$9)
 					{
@@ -116665,18 +116670,18 @@ static PHP_METHOD(Phalcon_Mvc_View, pick)
 	} else {
 		ZEPHIR_INIT_VAR(&layout);
 		ZVAL_NULL(&layout);
-		if (zephir_memnstr_str(renderView, SL("/"), "phalcon/Mvc/View.zep", 675)) {
+		if (zephir_memnstr_str(renderView, SL("/"), "phalcon/Mvc/View.zep", 699)) {
 			ZEPHIR_INIT_VAR(&parts);
 			zephir_fast_explode_str(&parts, SL("/"), renderView, LONG_MAX);
 			ZEPHIR_OBS_NVAR(&layout);
-			zephir_array_fetch_long(&layout, &parts, 0, PH_NOISY, "phalcon/Mvc/View.zep", 677);
+			zephir_array_fetch_long(&layout, &parts, 0, PH_NOISY, "phalcon/Mvc/View.zep", 701);
 		}
 		ZEPHIR_INIT_VAR(&_0$$4);
 		zephir_create_array(&_0$$4, 1, 0);
 		zephir_array_fast_append(&_0$$4, renderView);
 		ZEPHIR_CPY_WRT(&pickView, &_0$$4);
 		if (Z_TYPE_P(&layout) != IS_NULL) {
-			zephir_array_append(&pickView, &layout, PH_SEPARATE, "phalcon/Mvc/View.zep", 683);
+			zephir_array_append(&pickView, &layout, PH_SEPARATE, "phalcon/Mvc/View.zep", 707);
 		}
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("pickView"), &pickView);
@@ -117213,17 +117218,17 @@ static PHP_METHOD(Phalcon_Mvc_View, setViewsDir)
 		_0 = Z_TYPE_P(viewsDir) != IS_ARRAY;
 	}
 	if (_0) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory must be a string or an array", "phalcon/Mvc/View.zep", 956);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory must be a string or an array", "phalcon/Mvc/View.zep", 980);
 		return;
 	}
 	if (Z_TYPE_P(viewsDir) == IS_STRING) {
-		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 492, viewsDir);
+		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 488, viewsDir);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDirs"), &_1$$4);
 	} else {
 		ZEPHIR_INIT_VAR(&newViewsDir);
 		array_init(&newViewsDir);
-		zephir_is_iterable(viewsDir, 0, "phalcon/Mvc/View.zep", 974);
+		zephir_is_iterable(viewsDir, 0, "phalcon/Mvc/View.zep", 998);
 		if (Z_TYPE_P(viewsDir) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(viewsDir), _4$$5, _5$$5, _2$$5)
 			{
@@ -117236,10 +117241,10 @@ static PHP_METHOD(Phalcon_Mvc_View, setViewsDir)
 				ZEPHIR_INIT_NVAR(&directory);
 				ZVAL_COPY(&directory, _2$$5);
 				if (Z_TYPE_P(&directory) != IS_STRING) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 968);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 992);
 					return;
 				}
-				ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 492, &directory);
+				ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 488, &directory);
 				zephir_check_call_status();
 				zephir_array_update_zval(&newViewsDir, &position, &_6$$6, PH_COPY | PH_SEPARATE);
 			} ZEND_HASH_FOREACH_END();
@@ -117257,10 +117262,10 @@ static PHP_METHOD(Phalcon_Mvc_View, setViewsDir)
 				ZEPHIR_CALL_METHOD(&directory, viewsDir, "current", NULL, 0);
 				zephir_check_call_status();
 					if (Z_TYPE_P(&directory) != IS_STRING) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 968);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 992);
 						return;
 					}
-					ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 492, &directory);
+					ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 488, &directory);
 					zephir_check_call_status();
 					zephir_array_update_zval(&newViewsDir, &position, &_7$$8, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CALL_METHOD(NULL, viewsDir, "next", NULL, 0);
@@ -117448,13 +117453,13 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 	array_init(&viewEnginePaths);
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getviewsdirs", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&_1, 0, "phalcon/Mvc/View.zep", 1080);
+	zephir_is_iterable(&_1, 0, "phalcon/Mvc/View.zep", 1104);
 	if (Z_TYPE_P(&_1) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1), _2)
 		{
 			ZEPHIR_INIT_NVAR(&viewsDir);
 			ZVAL_COPY(&viewsDir, _2);
-			ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 493, &viewPath);
+			ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 489, &viewPath);
 			zephir_check_call_status();
 			if (!(zephir_is_true(&_4$$3))) {
 				ZEPHIR_INIT_NVAR(&viewsDirPath);
@@ -117462,7 +117467,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 			} else {
 				ZEPHIR_CPY_WRT(&viewsDirPath, &viewPath);
 			}
-			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1075);
+			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1099);
 			if (Z_TYPE_P(&engines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _8$$3, _9$$3, _6$$3)
 				{
@@ -117505,7 +117510,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 						}
 						RETURN_MM_NULL();
 					}
-					zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+					zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 				} ZEND_HASH_FOREACH_END();
 			} else {
 				ZEPHIR_CALL_METHOD(NULL, &engines, "rewind", NULL, 0);
@@ -117551,7 +117556,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 							}
 							RETURN_MM_NULL();
 						}
-						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 					ZEPHIR_CALL_METHOD(NULL, &engines, "next", NULL, 0);
 					zephir_check_call_status();
 				}
@@ -117570,7 +117575,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 			}
 			ZEPHIR_CALL_METHOD(&viewsDir, &_1, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 493, &viewPath);
+				ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 489, &viewPath);
 				zephir_check_call_status();
 				if (!(zephir_is_true(&_24$$16))) {
 					ZEPHIR_INIT_NVAR(&viewsDirPath);
@@ -117578,7 +117583,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 				} else {
 					ZEPHIR_CPY_WRT(&viewsDirPath, &viewPath);
 				}
-				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1075);
+				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1099);
 				if (Z_TYPE_P(&engines) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _27$$16, _28$$16, _25$$16)
 					{
@@ -117621,7 +117626,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 							}
 							RETURN_MM_NULL();
 						}
-						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 					} ZEND_HASH_FOREACH_END();
 				} else {
 					ZEPHIR_CALL_METHOD(NULL, &engines, "rewind", NULL, 0);
@@ -117667,7 +117672,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 								}
 								RETURN_MM_NULL();
 							}
-							zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+							zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 						ZEPHIR_CALL_METHOD(NULL, &engines, "next", NULL, 0);
 						zephir_check_call_status();
 					}
@@ -117693,7 +117698,7 @@ static PHP_METHOD(Phalcon_Mvc_View, engineRender)
 		ZEPHIR_CONCAT_SVS(&_45$$30, "View '", &viewPath, "' was not found in any of the views directory");
 		ZEPHIR_CALL_METHOD(NULL, &_44$$30, "__construct", NULL, 29, &_45$$30);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_44$$30, "phalcon/Mvc/View.zep", 1089);
+		zephir_throw_exception_debug(&_44$$30, "phalcon/Mvc/View.zep", 1113);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -117726,7 +117731,7 @@ static PHP_METHOD(Phalcon_Mvc_View, isAbsolutePath)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "PHP_OS");
-	if (ZEPHIR_IS_STRING(&_0, "WINNT")) {
+	if (ZEPHIR_IS_STRING_IDENTICAL(&_0, "WINNT")) {
 		_1$$3 = zephir_fast_strlen_ev(&path) >= 3;
 		if (_1$$3) {
 			_2$$3 = ZEPHIR_STRING_OFFSET(&path, 1);
@@ -117794,15 +117799,15 @@ static PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines)
 		if (ZEPHIR_IS_EMPTY(&registeredEngines)) {
 			ZEPHIR_INIT_VAR(&_2$$4);
 			object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce);
-			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 494, this_ptr, &di);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 490, this_ptr, &di);
 			zephir_check_call_status();
 			zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE);
 		} else {
 			if (Z_TYPE_P(&di) != IS_OBJECT) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access application services", "phalcon/Mvc/View.zep", 1132);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access application services", "phalcon/Mvc/View.zep", 1156);
 				return;
 			}
-			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View.zep", 1169);
+			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View.zep", 1193);
 			if (Z_TYPE_P(&registeredEngines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&registeredEngines), _5$$5, _6$$5, _3$$5)
 				{
@@ -117834,7 +117839,7 @@ static PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines)
 							ZEPHIR_CONCAT_SV(&_12$$12, "Invalid template engine registration for extension: ", &extension);
 							ZEPHIR_CALL_METHOD(NULL, &_11$$12, "__construct", &_13, 29, &_12$$12);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_11$$12, "phalcon/Mvc/View.zep", 1160);
+							zephir_throw_exception_debug(&_11$$12, "phalcon/Mvc/View.zep", 1184);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -117879,7 +117884,7 @@ static PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines)
 								ZEPHIR_CONCAT_SV(&_19$$18, "Invalid template engine registration for extension: ", &extension);
 								ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_13, 29, &_19$$18);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View.zep", 1160);
+								zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View.zep", 1184);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -118006,7 +118011,7 @@ static PHP_METHOD(Phalcon_Mvc_View, processRender)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("currentRenderLevel"), &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("disabled"), PH_NOISY_CC | PH_READONLY);
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&_0)) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 495);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 491);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_1$$3);
 		RETURN_MM_BOOL(0);
@@ -118038,7 +118043,7 @@ static PHP_METHOD(Phalcon_Mvc_View, processRender)
 		ZEPHIR_CPY_WRT(&renderView, &_3$$7);
 	} else {
 		ZEPHIR_OBS_NVAR(&renderView);
-		zephir_array_fetch_long(&renderView, &pickView, 0, PH_NOISY, "phalcon/Mvc/View.zep", 1247);
+		zephir_array_fetch_long(&renderView, &pickView, 0, PH_NOISY, "phalcon/Mvc/View.zep", 1271);
 		if (Z_TYPE_P(&layoutName) == IS_NULL) {
 			ZEPHIR_OBS_VAR(&pickViewAction);
 			if (zephir_array_isset_long_fetch(&pickViewAction, &pickView, 1, 0)) {
@@ -118064,7 +118069,7 @@ static PHP_METHOD(Phalcon_Mvc_View, processRender)
 			RETURN_MM_BOOL(0);
 		}
 	}
-	ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 495);
+	ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 491);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_8);
 	silence = 1;
@@ -118096,7 +118101,7 @@ static PHP_METHOD(Phalcon_Mvc_View, processRender)
 				zephir_read_property(&_11$$17, this_ptr, ZEND_STRL("templatesBefore"), PH_NOISY_CC | PH_READONLY);
 				ZEPHIR_CPY_WRT(&templatesBefore, &_11$$17);
 				silence = 0;
-				zephir_is_iterable(&templatesBefore, 0, "phalcon/Mvc/View.zep", 1323);
+				zephir_is_iterable(&templatesBefore, 0, "phalcon/Mvc/View.zep", 1347);
 				if (Z_TYPE_P(&templatesBefore) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&templatesBefore), _12$$17)
 					{
@@ -118164,7 +118169,7 @@ static PHP_METHOD(Phalcon_Mvc_View, processRender)
 				zephir_read_property(&_20$$23, this_ptr, ZEND_STRL("templatesAfter"), PH_NOISY_CC | PH_READONLY);
 				ZEPHIR_CPY_WRT(&templatesAfter, &_20$$23);
 				silence = 0;
-				zephir_is_iterable(&templatesAfter, 0, "phalcon/Mvc/View.zep", 1359);
+				zephir_is_iterable(&templatesAfter, 0, "phalcon/Mvc/View.zep", 1383);
 				if (Z_TYPE_P(&templatesAfter) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&templatesAfter), _21$$23)
 					{
@@ -118985,24 +118990,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Binder)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "boundModels");
-}
-
-static PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "originalValues");
-}
-
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, __construct)
 {
 	zval *cache = NULL, cache_sub, __$null;
@@ -119186,6 +119173,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, findBoundModel)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "boundModels");
+}
+
+static PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "originalValues");
+}
+
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, getCache)
 {
 	zval *this_ptr = getThis();
@@ -119320,7 +119325,7 @@ static 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, 439, handler, &methodName);
+		ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 435, handler, &methodName);
 		zephir_check_call_status();
 	} else {
 		object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction")));
@@ -119333,7 +119338,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&paramsKeys);
 	zephir_array_keys(&paramsKeys, &params);
-	zephir_is_iterable(&methodParams, 0, "phalcon/Mvc/Model/Binder.zep", 223);
+	zephir_is_iterable(&methodParams, 0, "phalcon/Mvc/Model/Binder.zep", 243);
 	if (Z_TYPE_P(&methodParams) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methodParams), _3, _4, _1)
 		{
@@ -119353,16 +119358,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 			ZEPHIR_CALL_METHOD(&className, &reflectionClass, "getname", NULL, 0);
 			zephir_check_call_status();
 			if (!(zephir_array_isset(&params, &paramKey))) {
-				zephir_array_fetch(&_5$$7, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 175);
+				zephir_array_fetch(&_5$$7, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 195);
 				ZEPHIR_CPY_WRT(&paramKey, &_5$$7);
 			}
 			ZEPHIR_INIT_NVAR(&boundModel);
 			ZVAL_NULL(&boundModel);
 			ZEPHIR_OBS_NVAR(&paramValue);
-			zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179);
+			zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199);
 			ZEPHIR_INIT_NVAR(&_6$$5);
 			ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model");
-			ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 440, &className, &_6$$5);
+			ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 436, &className, &_6$$5);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) {
 				if (Z_TYPE_P(&realClasses) == IS_NULL) {
@@ -119376,7 +119381,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 						ZEPHIR_CALL_METHOD(&realClasses, handler, "getmodelname", NULL, 0);
 						zephir_check_call_status();
 					} else {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 191);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 211);
 						return;
 					}
 				}
@@ -119389,7 +119394,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 						ZEPHIR_CONCAT_SVS(&_11$$14, "You should provide model class name for ", &paramKey, " parameter");
 						ZEPHIR_CALL_METHOD(NULL, &_10$$14, "__construct", &_12, 29, &_11$$14);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$14, "phalcon/Mvc/Model/Binder.zep", 199);
+						zephir_throw_exception_debug(&_10$$14, "phalcon/Mvc/Model/Binder.zep", 219);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -119400,7 +119405,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 					ZEPHIR_CALL_METHOD(&boundModel, this_ptr, "findboundmodel", &_13, 0, &paramValue, &className);
 					zephir_check_call_status();
 				} else {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 209);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 229);
 					return;
 				}
 			} else if (zephir_is_true(&_7$$5)) {
@@ -119435,16 +119440,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 				ZEPHIR_CALL_METHOD(&className, &reflectionClass, "getname", NULL, 0);
 				zephir_check_call_status();
 				if (!(zephir_array_isset(&params, &paramKey))) {
-					zephir_array_fetch(&_14$$21, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 175);
+					zephir_array_fetch(&_14$$21, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 195);
 					ZEPHIR_CPY_WRT(&paramKey, &_14$$21);
 				}
 				ZEPHIR_INIT_NVAR(&boundModel);
 				ZVAL_NULL(&boundModel);
 				ZEPHIR_OBS_NVAR(&paramValue);
-				zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179);
+				zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199);
 				ZEPHIR_INIT_NVAR(&_15$$19);
 				ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model");
-				ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 440, &className, &_15$$19);
+				ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 436, &className, &_15$$19);
 				zephir_check_call_status();
 				if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) {
 					if (Z_TYPE_P(&realClasses) == IS_NULL) {
@@ -119458,7 +119463,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 							ZEPHIR_CALL_METHOD(&realClasses, handler, "getmodelname", NULL, 0);
 							zephir_check_call_status();
 						} else {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 191);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 211);
 							return;
 						}
 					}
@@ -119471,7 +119476,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 							ZEPHIR_CONCAT_SVS(&_19$$28, "You should provide model class name for ", &paramKey, " parameter");
 							ZEPHIR_CALL_METHOD(NULL, &_18$$28, "__construct", &_12, 29, &_19$$28);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$28, "phalcon/Mvc/Model/Binder.zep", 199);
+							zephir_throw_exception_debug(&_18$$28, "phalcon/Mvc/Model/Binder.zep", 219);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -119482,7 +119487,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 						ZEPHIR_CALL_METHOD(&boundModel, this_ptr, "findboundmodel", &_13, 0, &paramValue, &className);
 						zephir_check_call_status();
 					} else {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 209);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 229);
 						return;
 					}
 				} else if (zephir_is_true(&_16$$19)) {
@@ -120260,19 +120265,19 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput)
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 432, container);
+	ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 428, 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, 441, &_16$$16);
+		ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 437, &_16$$16);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 442, &bind);
+		ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 438, &bind);
 		zephir_check_call_status();
 	}
-	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 433, &modelName);
+	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 429, &modelName);
 	zephir_check_call_status();
 	RETURN_CCTOR(&criteria);
 }
@@ -121628,7 +121633,7 @@ static 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, 443, &_2, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_2, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -121738,7 +121743,7 @@ static 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, 443, &_1, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_1, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -121872,9 +121877,9 @@ static 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, 443, &_1, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_1, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 440, intermediateFields, &intermediateModel, intermediateReferencedFields);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -121983,7 +121988,7 @@ static 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, 443, &_2, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_2, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -122117,9 +122122,9 @@ static 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, 443, &_1, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_1, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 440, intermediateFields, &intermediateModel, intermediateReferencedFields);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -123438,7 +123443,7 @@ static 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", 1401);
-		ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, parameters);
+		ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 441, &extraParameters, parameters);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3);
 		zephir_check_call_status();
@@ -123569,10 +123574,10 @@ static 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, 445, &findParams, parameters);
+	ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "mergefindparameters", NULL, 441, &findParams, parameters);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&extraParameters) == IS_ARRAY) {
-		ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, &findArguments);
+		ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 441, &extraParameters, &findArguments);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CPY_WRT(&findParams, &findArguments);
@@ -124066,7 +124071,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasBelongsTo)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "belongsTo");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -124115,7 +124120,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasMany)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasMany");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -124164,7 +124169,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasManyToMany)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasManyToMany");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -124213,7 +124218,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOne)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasOne");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -124262,7 +124267,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOneThrough)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasOneThrough");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -127304,15 +127309,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Query)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "transaction");
-}
-
 static PHP_METHOD(Phalcon_Mvc_Model_Query, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -127571,22 +127567,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute)
 	ZEPHIR_CPY_WRT(&type, &_0);
 	do {
 		if (ZEPHIR_IS_LONG(&type, 309)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeselect", NULL, 448, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeselect", NULL, 444, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 306)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeinsert", NULL, 449, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeinsert", NULL, 445, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 300)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeupdate", NULL, 450, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeupdate", NULL, 446, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 303)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executedelete", NULL, 451, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executedelete", NULL, 447, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
@@ -127746,7 +127742,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql)
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("bindParams"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("bindTypes"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_BOOL(&_3$$3, 1);
-		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "executeselect", NULL, 448, &intermediate, &_1$$3, &_2$$3, &_3$$3);
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "executeselect", NULL, 444, &intermediate, &_1$$3, &_2$$3, &_3$$3);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -127772,6 +127768,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getUniqueRow)
 	RETURN_MEMBER(getThis(), "uniqueRow");
 }
 
+static PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "transaction");
+}
+
 static PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 {
 	zval intermediate, phql, ast, irPhql, uniqueId, type, _0, _2$$5, _3$$7, _4$$13, _5$$13;
@@ -127815,7 +127820,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 			zephir_read_static_property_ce(&_2$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY);
 			if (zephir_array_isset_fetch(&irPhql, &_2$$5, &uniqueId, 0)) {
 				if (Z_TYPE_P(&irPhql) == IS_ARRAY) {
-					zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 567);
+					zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 579);
 					zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_3$$7);
 					RETURN_CCTOR(&irPhql);
 				}
@@ -127827,22 +127832,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &type);
 			do {
 				if (ZEPHIR_IS_LONG(&type, 309)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 452);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 448);
 					zephir_check_call_status();
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&type, 306)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 453);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 449);
 					zephir_check_call_status();
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&type, 300)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 454);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 450);
 					zephir_check_call_status();
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&type, 303)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 455);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 451);
 					zephir_check_call_status();
 					break;
 				}
@@ -127852,7 +127857,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 				ZEPHIR_CONCAT_SVSV(&_5$$13, "Unknown statement ", &type, ", when preparing: ", &phql);
 				ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 29, &_5$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 601);
+				zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 613);
 				ZEPHIR_MM_RESTORE();
 				return;
 			} while(0);
@@ -127860,7 +127865,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 		}
 	}
 	if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 607);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 619);
 		return;
 	}
 	if (Z_TYPE_P(&uniqueId) == IS_LONG) {
@@ -127986,7 +127991,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, setDI)
 	ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 671);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 683);
 		return;
 	}
 	ZEPHIR_INIT_NVAR(&_0);
@@ -127994,7 +127999,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, setDI)
 	ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 677);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 689);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager);
@@ -128178,13 +128183,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 
 
 	ZEPHIR_OBS_VAR(&models);
-	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 745);
+	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 757);
 	if (UNEXPECTED(zephir_array_isset_long(&models, 1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 750);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 762);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 753);
+	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 765);
 	ZEPHIR_OBS_VAR(&model);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) {
@@ -128192,12 +128197,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 		ZEPHIR_CALL_METHOD(&model, &_1$$4, "load", NULL, 0, &modelName);
 		zephir_check_call_status();
 	}
-	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 456, &model, &intermediate, &bindParams, &bindTypes);
+	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 452, &model, &intermediate, &bindParams, &bindTypes);
 	zephir_check_call_status();
 	if (!(zephir_fast_count_int(&records))) {
 		object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 		ZVAL_BOOL(&_2$$5, 1);
-		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_2$$5);
+		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_2$$5);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -128222,7 +128227,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 			zephir_check_call_status();
 			object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 			ZVAL_BOOL(&_7$$7, 0);
-			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_7$$7, &record);
+			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_7$$7, &record);
 			zephir_check_call_status();
 			RETURN_MM();
 		}
@@ -128233,7 +128238,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 	zephir_check_call_status();
 	object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 	ZVAL_BOOL(&_9, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_9);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_9);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -128312,7 +128317,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 
 
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 834);
+	zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 846);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_OBS_VAR(&model);
@@ -128341,16 +128346,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 		}
 	}
 	ZEPHIR_OBS_VAR(&values);
-	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 869);
+	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 881);
 	if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 878);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 890);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&insertValues);
 	array_init(&insertValues);
-	zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 949);
+	zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 961);
 	if (Z_TYPE_P(&values) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2)
 		{
@@ -128363,8 +128368,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _2);
 			ZEPHIR_OBS_NVAR(&exprValue);
-			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888);
-			zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890);
+			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 900);
+			zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 902);
 			do {
 				if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) {
 					ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue);
@@ -128393,7 +128398,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 						ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list");
 						ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 914);
+						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 926);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -128409,7 +128414,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 			} while(0);
 
 			ZEPHIR_OBS_NVAR(&fieldName);
-			zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927);
+			zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 939);
 			_18$$8 = automaticFields;
 			if (_18$$8) {
 				_18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY;
@@ -128423,7 +128428,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 					ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 29, &_20$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 937);
+					zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 949);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -128446,8 +128451,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 			ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&exprValue);
-				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 888);
-				zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 890);
+				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 900);
+				zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 902);
 				do {
 					if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) {
 						ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue);
@@ -128476,7 +128481,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 							ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list");
 							ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 29, &_28$$21);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 914);
+							zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 926);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -128492,7 +128497,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 				} while(0);
 
 				ZEPHIR_OBS_NVAR(&fieldName);
-				zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 927);
+				zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 939);
 				_31$$17 = automaticFields;
 				if (_31$$17) {
 					_31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY;
@@ -128506,7 +128511,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 						ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 29, &_33$$24);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 937);
+						zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 949);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -128527,7 +128532,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 	object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 	ZEPHIR_CALL_METHOD(&_34, &insertModel, "create", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_34, &insertModel);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_34, &insertModel);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -128679,8 +128684,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	ZEPHIR_INIT_VAR(&connectionTypes);
 	array_init(&connectionTypes);
 	ZEPHIR_OBS_VAR(&models);
-	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 986);
-	zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1014);
+	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 998);
+	zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1026);
 	if (Z_TYPE_P(&models) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1)
 		{
@@ -128700,7 +128705,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 				zephir_check_call_status();
 				zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE);
 				if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1021);
 					return;
 				}
 			}
@@ -128730,7 +128735,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					zephir_check_call_status();
 					zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE);
 					if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1009);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1021);
 						return;
 					}
 				}
@@ -128740,23 +128745,23 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	}
 	ZEPHIR_INIT_NVAR(&modelName);
 	ZEPHIR_OBS_VAR(&columns);
-	zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1014);
+	zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1026);
 	haveObjects = 0;
 	haveScalars = 0;
 	isComplex = 0;
 	numberObjects = 0;
 	ZEPHIR_CPY_WRT(&columns1, &columns);
-	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1042);
+	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1054);
 	if (Z_TYPE_P(&columns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10)
 		{
 			ZEPHIR_INIT_NVAR(&column);
 			ZVAL_COPY(&column, _10);
 			if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1038);
 				return;
 			}
-			zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029);
+			zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1041);
 			if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) {
 				if (!(zephir_array_isset_string(&column, SL("balias")))) {
 					isComplex = 1;
@@ -128779,10 +128784,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 			ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1026);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1038);
 					return;
 				}
-				zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1029);
+				zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1041);
 				if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) {
 					if (!(zephir_array_isset_string(&column, SL("balias")))) {
 						isComplex = 1;
@@ -128820,7 +128825,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	array_init(&simpleColumnMap);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&metaData, &_0);
-	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1148);
+	zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1160);
 	if (Z_TYPE_P(&columns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14)
 		{
@@ -128833,11 +128838,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 			ZEPHIR_INIT_NVAR(&column);
 			ZVAL_COPY(&column, _14);
 			ZEPHIR_OBS_NVAR(&sqlColumn);
-			zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065);
-			zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068);
+			zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1077);
+			zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1080);
 			if (ZEPHIR_IS_STRING(&_18$$28, "object")) {
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069);
+				zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1081);
 				ZEPHIR_OBS_NVAR(&instance);
 				zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 				if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) {
@@ -128855,7 +128860,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 						ZEPHIR_INIT_NVAR(&columnMap);
 						ZVAL_NULL(&columnMap);
 					}
-					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105);
+					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1117);
 					if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31)
 						{
@@ -128868,7 +128873,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							ZEPHIR_INIT_NVAR(&_26$$34);
 							ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute);
 							zephir_array_fast_append(&_25$$34, &_26$$34);
-							zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+							zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 						} ZEND_HASH_FOREACH_END();
 					} else {
 						ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -128888,7 +128893,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								ZEPHIR_INIT_NVAR(&_28$$35);
 								ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute);
 								zephir_array_fast_append(&_27$$35, &_28$$35);
-								zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+								zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 							zephir_check_call_status();
 						}
@@ -128906,7 +128911,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 						zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots"));
 					}
 				} else {
-					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122);
+					zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1134);
 					if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37)
 						{
@@ -128916,7 +128921,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_create_array(&_34$$38, 2, 0);
 							zephir_array_fast_append(&_34$$38, &attribute);
 							zephir_array_fast_append(&_34$$38, &sqlColumn);
-							zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+							zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 						} ZEND_HASH_FOREACH_END();
 					} else {
 						ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -128933,7 +128938,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_35$$39, 2, 0);
 								zephir_array_fast_append(&_35$$39, &attribute);
 								zephir_array_fast_append(&_35$$39, &sqlColumn);
-								zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+								zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 							zephir_check_call_status();
 						}
@@ -128956,7 +128961,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					zephir_array_fast_append(&_37$$42, &aliasCopy);
 					ZEPHIR_CPY_WRT(&columnAlias, &_37$$42);
 				}
-				zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133);
+				zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145);
 			}
 			_38$$28 = !isComplex;
 			if (_38$$28) {
@@ -128985,11 +128990,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 			ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&sqlColumn);
-				zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1065);
-				zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1068);
+				zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1077);
+				zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1080);
 				if (ZEPHIR_IS_STRING(&_39$$46, "object")) {
 					ZEPHIR_OBS_NVAR(&modelName);
-					zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1069);
+					zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1081);
 					ZEPHIR_OBS_NVAR(&instance);
 					zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 					if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) {
@@ -129007,7 +129012,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							ZEPHIR_INIT_NVAR(&columnMap);
 							ZVAL_NULL(&columnMap);
 						}
-						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1105);
+						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1117);
 						if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49)
 							{
@@ -129020,7 +129025,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								ZEPHIR_INIT_NVAR(&_47$$52);
 								ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute);
 								zephir_array_fast_append(&_46$$52, &_47$$52);
-								zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+								zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 							} ZEND_HASH_FOREACH_END();
 						} else {
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -129040,7 +129045,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 									ZEPHIR_INIT_NVAR(&_49$$53);
 									ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute);
 									zephir_array_fast_append(&_48$$53, &_49$$53);
-									zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1098);
+									zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1110);
 								ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 								zephir_check_call_status();
 							}
@@ -129058,7 +129063,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots"));
 						}
 					} else {
-						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1122);
+						zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1134);
 						if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55)
 							{
@@ -129068,7 +129073,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_55$$56, 2, 0);
 								zephir_array_fast_append(&_55$$56, &attribute);
 								zephir_array_fast_append(&_55$$56, &sqlColumn);
-								zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+								zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 							} ZEND_HASH_FOREACH_END();
 						} else {
 							ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0);
@@ -129085,7 +129090,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 									zephir_create_array(&_56$$57, 2, 0);
 									zephir_array_fast_append(&_56$$57, &attribute);
 									zephir_array_fast_append(&_56$$57, &sqlColumn);
-									zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1120);
+									zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1132);
 								ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0);
 								zephir_check_call_status();
 							}
@@ -129107,7 +129112,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 						zephir_array_fast_append(&_58$$60, &aliasCopy);
 						ZEPHIR_CPY_WRT(&columnAlias, &_58$$60);
 					}
-					zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1133);
+					zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145);
 				}
 				_59$$46 = !isComplex;
 				if (_59$$46) {
@@ -129132,7 +129137,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	ZEPHIR_INIT_VAR(&bindCounts);
 	array_init(&bindCounts);
 	zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE);
-	zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1169);
+	zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1181);
 	if (Z_TYPE_P(&bindParams) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60)
 		{
@@ -129190,7 +129195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 	ZEPHIR_INIT_NVAR(&wildcard);
 	ZEPHIR_INIT_VAR(&processedTypes);
 	array_init(&processedTypes);
-	zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1182);
+	zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1194);
 	if (Z_TYPE_P(&bindTypes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66)
 		{
@@ -129295,7 +129300,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					array_init(&simpleColumnMap);
 					ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject);
 					zephir_check_call_status();
-					zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1270);
+					zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1282);
 					if (Z_TYPE_P(&_74$$90) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90)
 						{
@@ -129305,7 +129310,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_create_array(&_77$$91, 2, 0);
 							zephir_array_fast_append(&_77$$91, &attribute);
 							ZEPHIR_OBS_NVAR(&_78$$91);
-							zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268);
+							zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280);
 							zephir_array_fast_append(&_77$$91, &_78$$91);
 							zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE);
 						} ZEND_HASH_FOREACH_END();
@@ -129324,7 +129329,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_79$$92, 2, 0);
 								zephir_array_fast_append(&_79$$92, &attribute);
 								ZEPHIR_OBS_NVAR(&_80$$92);
-								zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1268);
+								zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280);
 								zephir_array_fast_append(&_79$$92, &_80$$92);
 								zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0);
@@ -129334,7 +129339,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					ZEPHIR_INIT_NVAR(&attribute);
 				} else {
 					array_init(&simpleColumnMap);
-					zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1279);
+					zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1291);
 					if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93)
 						{
@@ -129350,7 +129355,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 							zephir_create_array(&_85$$94, 2, 0);
 							zephir_array_fast_append(&_85$$94, &attribute);
 							ZEPHIR_OBS_NVAR(&_86$$94);
-							zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277);
+							zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1289);
 							zephir_array_fast_append(&_85$$94, &_86$$94);
 							zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE);
 						} ZEND_HASH_FOREACH_END();
@@ -129371,7 +129376,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 								zephir_create_array(&_87$$95, 2, 0);
 								zephir_array_fast_append(&_87$$95, &attribute);
 								ZEPHIR_OBS_NVAR(&_88$$95);
-								zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1277);
+								zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1289);
 								zephir_array_fast_append(&_87$$95, &_88$$95);
 								zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0);
@@ -129401,13 +129406,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found");
 					ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 29, &_92$$98);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1295);
+					zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1307);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				ZEPHIR_INIT_VAR(&_93$$97);
 				ZVAL_STRING(&_93$$97, "Phalcon\\Mvc\\Model\\ResultsetInterface");
-				ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 440, &resultsetClassName, &_93$$97);
+				ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 436, &resultsetClassName, &_93$$97);
 				zephir_check_call_status();
 				if (UNEXPECTED(!zephir_is_true(&_94$$97))) {
 					ZEPHIR_INIT_VAR(&_95$$99);
@@ -129416,7 +129421,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 					ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface");
 					ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 29, &_96$$99);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1301);
+					zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1313);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -129440,12 +129445,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 		} else {
 			ZVAL_BOOL(&_98$$83, 0);
 		}
-		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 458, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83);
+		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 454, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
 	object_init_ex(return_value, phalcon_mvc_model_resultset_complex_ce);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 459, &columns1, &resultData, &cache);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 455, &columns1, &resultData, &cache);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -129523,13 +129528,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 
 
 	ZEPHIR_OBS_VAR(&models);
-	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1349);
+	zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1361);
 	if (UNEXPECTED(zephir_array_isset_long(&models, 1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1354);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1366);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1357);
+	zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1369);
 	ZEPHIR_OBS_VAR(&model);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) {
@@ -129542,14 +129547,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 	ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&fields);
-	zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1376);
+	zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1388);
 	ZEPHIR_OBS_VAR(&values);
-	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1377);
+	zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1389);
 	ZEPHIR_INIT_VAR(&updateValues);
 	array_init(&updateValues);
 	ZEPHIR_CPY_WRT(&selectBindParams, &bindParams);
 	ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes);
-	zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1449);
+	zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1461);
 	if (Z_TYPE_P(&fields) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2)
 		{
@@ -129562,17 +129567,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 			ZEPHIR_INIT_NVAR(&field);
 			ZVAL_COPY(&field, _2);
 			ZEPHIR_OBS_NVAR(&value);
-			zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392);
+			zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1404);
 			ZEPHIR_OBS_NVAR(&exprValue);
-			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393);
+			zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1405);
 			if (zephir_array_isset_string(&field, SL("balias"))) {
 				ZEPHIR_OBS_NVAR(&fieldName);
-				zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396);
+				zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1408);
 			} else {
 				ZEPHIR_OBS_NVAR(&fieldName);
-				zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398);
+				zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1410);
 			}
-			zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401);
+			zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1413);
 			do {
 				if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) {
 					ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue);
@@ -129601,7 +129606,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 						ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list");
 						ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 29, &_13$$11);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1424);
+						zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1436);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -129610,7 +129615,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&_6$$5, 277)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1445);
 					return;
 				}
 				ZEPHIR_INIT_NVAR(&updateValue);
@@ -129638,17 +129643,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 			ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&value);
-				zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1392);
+				zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1404);
 				ZEPHIR_OBS_NVAR(&exprValue);
-				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1393);
+				zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1405);
 				if (zephir_array_isset_string(&field, SL("balias"))) {
 					ZEPHIR_OBS_NVAR(&fieldName);
-					zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396);
+					zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1408);
 				} else {
 					ZEPHIR_OBS_NVAR(&fieldName);
-					zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1398);
+					zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1410);
 				}
-				zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1401);
+				zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1413);
 				do {
 					if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) {
 						ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue);
@@ -129677,7 +129682,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 							ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list");
 							ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 29, &_25$$20);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1424);
+							zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1436);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -129686,7 +129691,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 						break;
 					}
 					if (ZEPHIR_IS_LONG(&_18$$14, 277)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1433);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1445);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&updateValue);
@@ -129705,12 +129710,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 	}
 	ZEPHIR_INIT_NVAR(&field);
 	ZEPHIR_INIT_NVAR(&number);
-	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 456, &model, &intermediate, &selectBindParams, &selectBindTypes);
+	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 452, &model, &intermediate, &selectBindParams, &selectBindTypes);
 	zephir_check_call_status();
 	if (!(zephir_fast_count_int(&records))) {
 		object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 		ZVAL_BOOL(&_28$$23, 1);
-		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_28$$23);
+		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_28$$23);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -129737,7 +129742,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 			zephir_check_call_status();
 			object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 			ZVAL_BOOL(&_33$$25, 0);
-			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_33$$25, &record);
+			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_33$$25, &record);
 			zephir_check_call_status();
 			RETURN_MM();
 		}
@@ -129748,7 +129753,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 	zephir_check_call_status();
 	object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 	ZVAL_BOOL(&_35, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_35);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_35);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -129776,13 +129781,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument)
 	ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param);
 
 
-	zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1511);
+	zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1523);
 	if (ZEPHIR_IS_LONG(&_0, 352)) {
 		zephir_create_array(return_value, 1, 0);
 		add_assoc_stringl_ex(return_value, SL("type"), SL("all"));
 		RETURN_MM();
 	}
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 460, &argument);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 456, &argument);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -129832,8 +129837,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 
 	ZEPHIR_INIT_VAR(&whenClauses);
 	array_init(&whenClauses);
-	zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1529);
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1544);
+	zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1541);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1556);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -129843,24 +129848,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 				ZEPHIR_INIT_NVAR(&_3$$4);
 				zephir_create_array(&_3$$4, 3, 0);
 				add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when"));
-				zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533);
-				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_5$$4);
+				zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1545);
+				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 456, &_5$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE);
-				zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534);
-				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_7$$4);
+				zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
+				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 456, &_7$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535);
+				zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1547);
 			} else {
 				ZEPHIR_INIT_NVAR(&_8$$5);
 				zephir_create_array(&_8$$5, 2, 0);
 				add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else"));
-				zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539);
-				ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 460, &_10$$5);
+				zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1551);
+				ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 456, &_10$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540);
+				zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1552);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -129878,24 +129883,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 					ZEPHIR_INIT_NVAR(&_11$$7);
 					zephir_create_array(&_11$$7, 3, 0);
 					add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when"));
-					zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1533);
-					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_13$$7);
+					zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1545);
+					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 456, &_13$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE);
-					zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1534);
-					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_14$$7);
+					zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
+					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 456, &_14$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1535);
+					zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1547);
 				} else {
 					ZEPHIR_INIT_NVAR(&_15$$8);
 					zephir_create_array(&_15$$8, 2, 0);
 					add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else"));
-					zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1539);
-					ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 460, &_17$$8);
+					zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1551);
+					ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 456, &_17$$8);
 					zephir_check_call_status();
 					zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1540);
+					zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1552);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0);
 			zephir_check_call_status();
@@ -129904,8 +129909,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 	ZEPHIR_INIT_NVAR(&whenExpr);
 	zephir_create_array(return_value, 3, 0);
 	add_assoc_stringl_ex(return_value, SL("type"), SL("case"));
-	zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
-	ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 460, &_19);
+	zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1558);
+	ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 456, &_19);
 	zephir_check_call_status();
 	zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(return_value, SL("when-clauses"), &whenClauses, PH_COPY | PH_SEPARATE);
@@ -130061,7 +130066,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				} else {
 					ZVAL_BOOL(&_0$$5, 0);
 				}
-				ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 460, &exprLeft, &_0$$5);
+				ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 456, &exprLeft, &_0$$5);
 				zephir_check_call_status();
 			}
 			ZEPHIR_OBS_VAR(&exprRight);
@@ -130071,7 +130076,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				} else {
 					ZVAL_BOOL(&_1$$6, 0);
 				}
-				ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 460, &exprRight, &_1$$6);
+				ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 456, &exprRight, &_1$$6);
 				zephir_check_call_status();
 			}
 		}
@@ -130156,7 +130161,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 355)) {
-				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 461, &expr);
+				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 457, &expr);
 				zephir_check_call_status();
 				break;
 			}
@@ -130252,7 +130257,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_18$$25, 2, 0);
 				add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal"));
 				ZEPHIR_OBS_VAR(&_19$$25);
-				zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1762);
+				zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1774);
 				zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CPY_WRT(&exprReturn, &_18$$25);
 				break;
@@ -130275,9 +130280,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 260)) {
 				ZEPHIR_OBS_VAR(&value);
-				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1783);
+				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1795);
 				if (quoting) {
-					if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1790)) {
+					if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1802)) {
 						ZEPHIR_INIT_VAR(&escapedValue);
 						phalcon_orm_singlequotes(&escapedValue, &value);
 					} else {
@@ -130300,7 +130305,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_23$$33, 2, 0);
 				add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder"));
 				ZEPHIR_INIT_VAR(&_24$$33);
-				zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1811);
+				zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1823);
 				ZEPHIR_INIT_VAR(&_26$$33);
 				ZVAL_STRING(&_26$$33, "?");
 				ZEPHIR_INIT_VAR(&_27$$33);
@@ -130314,7 +130319,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				ZEPHIR_INIT_VAR(&_28$$34);
 				zephir_create_array(&_28$$34, 2, 0);
 				add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder"));
-				zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1820);
+				zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1832);
 				ZEPHIR_INIT_VAR(&_30$$34);
 				ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34);
 				zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE);
@@ -130323,14 +130328,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 277)) {
 				ZEPHIR_OBS_NVAR(&value);
-				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1825);
-				if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1827)) {
+				zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1837);
+				if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1839)) {
 					ZEPHIR_INIT_VAR(&valueParts);
 					zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX);
 					ZEPHIR_OBS_VAR(&name);
-					zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1829);
+					zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1841);
 					ZEPHIR_OBS_VAR(&bindType);
-					zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1830);
+					zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1842);
 					do {
 						if (ZEPHIR_IS_STRING(&bindType, "str")) {
 							ZEPHIR_INIT_VAR(&_31$$37);
@@ -130420,7 +130425,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 								ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name);
 								ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 29, &_51$$44);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1900);
+								zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1912);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -130431,7 +130436,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 								ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name);
 								ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 29, &_53$$45);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1906);
+								zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1918);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -130442,7 +130447,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 								ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name);
 								ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 29, &_55$$46);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1912);
+								zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1924);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -130463,7 +130468,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 						ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType);
 						ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 29, &_59$$47);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1927);
+						zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1939);
 						ZEPHIR_MM_RESTORE();
 						return;
 					} while(0);
@@ -130645,18 +130650,18 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_79$$66, 2, 0);
 				add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal"));
 				ZEPHIR_OBS_VAR(&_80$$66);
-				zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2103);
+				zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2115);
 				zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CPY_WRT(&exprReturn, &_79$$66);
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 350)) {
-				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 462, &expr);
+				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 458, &expr);
 				zephir_check_call_status();
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 409)) {
-				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 463, &expr);
+				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 459, &expr);
 				zephir_check_call_status();
 				break;
 			}
@@ -130665,7 +130670,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_81$$69, 2, 0);
 				add_assoc_stringl_ex(&_81$$69, SL("type"), SL("select"));
 				ZVAL_BOOL(&_83$$69, 1);
-				ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 452, &expr, &_83$$69);
+				ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 448, &expr, &_83$$69);
 				zephir_check_call_status();
 				zephir_array_update_string(&_81$$69, SL("value"), &_82$$69, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CPY_WRT(&exprReturn, &_81$$69);
@@ -130677,7 +130682,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType);
 			ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 29, &_85$$70);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2126);
+			zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2138);
 			ZEPHIR_MM_RESTORE();
 			return;
 		} while(0);
@@ -130685,22 +130690,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 		RETURN_CCTOR(&exprReturn);
 	}
 	if (zephir_array_isset_string(&expr, SL("domain"))) {
-		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 461, &expr);
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 457, &expr);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
 	if (zephir_array_isset_long(&expr, 0)) {
 		ZEPHIR_INIT_VAR(&listItems);
 		array_init(&listItems);
-		zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2149);
+		zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2161);
 		if (Z_TYPE_P(&expr) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72)
 			{
 				ZEPHIR_INIT_NVAR(&exprListItem);
 				ZVAL_COPY(&exprListItem, _86$$72);
-				ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 460, &exprListItem);
+				ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 456, &exprListItem);
 				zephir_check_call_status();
-				zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146);
+				zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0);
@@ -130713,9 +130718,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				}
 				ZEPHIR_CALL_METHOD(&exprListItem, &expr, "current", NULL, 0);
 				zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 460, &exprListItem);
+					ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 456, &exprListItem);
 					zephir_check_call_status();
-					zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2146);
+					zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158);
 				ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -130726,7 +130731,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 		zephir_array_fast_append(return_value, &listItems);
 		RETURN_MM();
 	}
-	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2155);
+	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2167);
 	return;
 }
 
@@ -130775,15 +130780,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 		if (zephir_array_isset_long(&arguments, 0)) {
 			ZEPHIR_INIT_VAR(&functionArgs);
 			array_init(&functionArgs);
-			zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2181);
+			zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2193);
 			if (Z_TYPE_P(&arguments) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6)
 				{
 					ZEPHIR_INIT_NVAR(&argument);
 					ZVAL_COPY(&argument, _0$$6);
-					ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 464, &argument);
+					ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 460, &argument);
 					zephir_check_call_status();
-					zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179);
+					zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191);
 				} ZEND_HASH_FOREACH_END();
 			} else {
 				ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0);
@@ -130796,9 +130801,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 					}
 					ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0);
 					zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 464, &argument);
+						ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 460, &argument);
 						zephir_check_call_status();
-						zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2179);
+						zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191);
 					ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
 					zephir_check_call_status();
 				}
@@ -130807,7 +130812,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 		} else {
 			ZEPHIR_INIT_VAR(&_5$$9);
 			zephir_create_array(&_5$$9, 1, 0);
-			ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 464, &arguments);
+			ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 460, &arguments);
 			zephir_check_call_status();
 			zephir_array_fast_append(&_5$$9, &_6$$9);
 			ZEPHIR_CPY_WRT(&functionArgs, &_5$$9);
@@ -130816,7 +130821,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 			zephir_create_array(return_value, 4, 0);
 			add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall"));
 			ZEPHIR_OBS_VAR(&_7$$10);
-			zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2191);
+			zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2203);
 			zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE);
 			zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE);
 			ZEPHIR_INIT_VAR(&_8$$10);
@@ -130827,7 +130832,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 			zephir_create_array(return_value, 3, 0);
 			add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall"));
 			ZEPHIR_OBS_VAR(&_9$$11);
-			zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2198);
+			zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2210);
 			zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE);
 			zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE);
 			RETURN_MM();
@@ -130836,7 +130841,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 	zephir_create_array(return_value, 2, 0);
 	add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall"));
 	ZEPHIR_OBS_VAR(&_10);
-	zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2207);
+	zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2219);
 	zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE);
 	RETURN_MM();
 }
@@ -130874,15 +130879,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 	if (zephir_array_isset_long(&group, 0)) {
 		ZEPHIR_INIT_VAR(&groupParts);
 		array_init(&groupParts);
-		zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2227);
+		zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2239);
 		if (Z_TYPE_P(&group) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3)
 			{
 				ZEPHIR_INIT_NVAR(&groupItem);
 				ZVAL_COPY(&groupItem, _0$$3);
-				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 460, &groupItem);
+				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 456, &groupItem);
 				zephir_check_call_status();
-				zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225);
+				zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0);
@@ -130895,9 +130900,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 				}
 				ZEPHIR_CALL_METHOD(&groupItem, &group, "current", NULL, 0);
 				zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 460, &groupItem);
+					ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 456, &groupItem);
 					zephir_check_call_status();
-					zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2225);
+					zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237);
 				ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -130906,7 +130911,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 	} else {
 		ZEPHIR_INIT_VAR(&_5$$6);
 		zephir_create_array(&_5$$6, 1, 0);
-		ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 460, &group);
+		ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 456, &group);
 		zephir_check_call_status();
 		zephir_array_fast_append(&_5$$6, &_6$$6);
 		ZEPHIR_CPY_WRT(&groupParts, &_5$$6);
@@ -130945,13 +130950,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getLimitClause)
 	array_init(&limit);
 	ZEPHIR_OBS_VAR(&number);
 	if (zephir_array_isset_string_fetch(&number, &limitClause, SL("number"), 0)) {
-		ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 460, &number);
+		ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 456, &number);
 		zephir_check_call_status();
 		zephir_array_update_string(&limit, SL("number"), &_0$$3, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&offset);
 	if (zephir_array_isset_string_fetch(&offset, &limitClause, SL("offset"), 0)) {
-		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 460, &offset);
+		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 456, &offset);
 		zephir_check_call_status();
 		zephir_array_update_string(&limit, SL("offset"), &_1$$4, PH_COPY | PH_SEPARATE);
 	}
@@ -130990,10 +130995,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin)
 
 	ZEPHIR_OBS_VAR(&qualified);
 	if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) {
-		zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2263);
+		zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2275);
 		if (ZEPHIR_IS_LONG(&_0$$3, 355)) {
 			ZEPHIR_OBS_VAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2264);
+			zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2276);
 			ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -131008,7 +131013,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin)
 			RETURN_MM();
 		}
 	}
-	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2279);
+	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2291);
 	return;
 }
 
@@ -131040,7 +131045,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType)
 
 	ZEPHIR_OBS_VAR(&type);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2290);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2302);
 		return;
 	}
 	do {
@@ -131068,7 +131073,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType)
 	ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1);
 	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_2);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2312);
+	zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2324);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -131238,7 +131243,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_OBS_VAR(&tables);
-	zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2348);
+	zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2360);
 	if (!(zephir_array_isset_long(&tables, 0))) {
 		ZEPHIR_INIT_VAR(&selectTables);
 		zephir_create_array(&selectTables, 1, 0);
@@ -131247,7 +131252,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 		ZEPHIR_CPY_WRT(&selectTables, &tables);
 	}
 	ZEPHIR_OBS_VAR(&joins);
-	zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2356);
+	zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2368);
 	if (!(zephir_array_isset_long(&joins, 0))) {
 		ZEPHIR_INIT_VAR(&selectJoins);
 		zephir_create_array(&selectJoins, 1, 0);
@@ -131255,32 +131260,32 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	} else {
 		ZEPHIR_CPY_WRT(&selectJoins, &joins);
 	}
-	zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2507);
+	zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2519);
 	if (Z_TYPE_P(&selectJoins) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1)
 		{
 			ZEPHIR_INIT_NVAR(&joinItem);
 			ZVAL_COPY(&joinItem, _1);
-			ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem);
+			ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 461, &manager, &joinItem);
 			zephir_check_call_status();
 			ZEPHIR_OBS_NVAR(&source);
-			zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370);
+			zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2382);
 			ZEPHIR_OBS_NVAR(&schema);
-			zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371);
+			zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2383);
 			ZEPHIR_OBS_NVAR(&model);
-			zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372);
+			zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2384);
 			ZEPHIR_OBS_NVAR(&realModelName);
-			zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373);
+			zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
 			ZEPHIR_INIT_NVAR(&completeSource);
 			zephir_create_array(&completeSource, 2, 0);
 			zephir_array_fast_append(&completeSource, &source);
 			zephir_array_fast_append(&completeSource, &schema);
-			ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 466, &joinItem);
+			ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 462, &joinItem);
 			zephir_check_call_status();
 			ZEPHIR_OBS_NVAR(&aliasExpr);
 			if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) {
 				ZEPHIR_OBS_NVAR(&alias);
-				zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
+				zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2397);
 				if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) {
 					ZEPHIR_INIT_NVAR(&_5$$9);
 					object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce);
@@ -131289,11 +131294,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 29, &_7$$9);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2393);
+					zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2405);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399);
+				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2411);
 				zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE);
@@ -131312,7 +131317,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11);
 					ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_11$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2452);
+					zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2464);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -131339,27 +131344,27 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			}
 			ZEPHIR_CALL_METHOD(&joinItem, &selectJoins, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem);
+				ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 461, &manager, &joinItem);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&source);
-				zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370);
+				zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2382);
 				ZEPHIR_OBS_NVAR(&schema);
-				zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371);
+				zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2383);
 				ZEPHIR_OBS_NVAR(&model);
-				zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2372);
+				zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2384);
 				ZEPHIR_OBS_NVAR(&realModelName);
-				zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373);
+				zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
 				ZEPHIR_INIT_NVAR(&_12$$12);
 				zephir_create_array(&_12$$12, 2, 0);
 				zephir_array_fast_append(&_12$$12, &source);
 				zephir_array_fast_append(&_12$$12, &schema);
 				ZEPHIR_CPY_WRT(&completeSource, &_12$$12);
-				ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 466, &joinItem);
+				ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 462, &joinItem);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&aliasExpr);
 				if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) {
 					ZEPHIR_OBS_NVAR(&alias);
-					zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2385);
+					zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2397);
 					if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) {
 						ZEPHIR_INIT_NVAR(&_13$$14);
 						object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce);
@@ -131368,11 +131373,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14);
 						ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_15$$14);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2393);
+						zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2405);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2399);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2411);
 					zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE);
@@ -131391,7 +131396,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16);
 						ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 29, &_18$$16);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2452);
+						zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2464);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -131417,7 +131422,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances);
-	zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2527);
+	zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2539);
 	if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19)
 		{
@@ -131431,7 +131436,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			ZVAL_COPY(&joinItem, _19);
 			ZEPHIR_OBS_NVAR(&joinExpr);
 			if (zephir_array_isset_string_fetch(&joinExpr, &joinItem, SL("conditions"), 0)) {
-				ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 460, &joinExpr);
+				ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 456, &joinExpr);
 				zephir_check_call_status();
 				zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_23$$18, PH_COPY | PH_SEPARATE);
 			}
@@ -131451,7 +131456,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&joinExpr);
 				if (zephir_array_isset_string_fetch(&joinExpr, &joinItem, SL("conditions"), 0)) {
-					ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 460, &joinExpr);
+					ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 456, &joinExpr);
 					zephir_check_call_status();
 					zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_25$$20, PH_COPY | PH_SEPARATE);
 				}
@@ -131464,7 +131469,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
 		ZEPHIR_INIT_VAR(&_26$$21);
-		zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2539);
+		zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2551);
 		if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21)
 			{
@@ -131477,11 +131482,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				ZEPHIR_INIT_NVAR(&_26$$21);
 				ZVAL_COPY(&_26$$21, _27$$21);
 				ZEPHIR_OBS_NVAR(&joinType);
-				zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529);
+				zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2541);
 				ZEPHIR_OBS_NVAR(&joinSource);
-				zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530);
+				zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2542);
 				ZEPHIR_OBS_NVAR(&preCondition);
-				zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531);
+				zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2543);
 				ZEPHIR_INIT_NVAR(&_31$$22);
 				zephir_create_array(&_31$$22, 3, 0);
 				zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE);
@@ -131490,7 +131495,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				zephir_create_array(&_32$$22, 1, 0);
 				zephir_array_fast_append(&_32$$22, &preCondition);
 				zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536);
+				zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2548);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0);
@@ -131506,11 +131511,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&joinType);
-					zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529);
+					zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2541);
 					ZEPHIR_OBS_NVAR(&joinSource);
-					zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2530);
+					zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2542);
 					ZEPHIR_OBS_NVAR(&preCondition);
-					zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2531);
+					zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2543);
 					ZEPHIR_INIT_NVAR(&_33$$23);
 					zephir_create_array(&_33$$23, 3, 0);
 					zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE);
@@ -131519,7 +131524,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					zephir_create_array(&_34$$23, 1, 0);
 					zephir_array_fast_append(&_34$$23, &preCondition);
 					zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2536);
+					zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2548);
 				ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -131530,15 +131535,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	}
 	ZEPHIR_INIT_NVAR(&fromModels);
 	array_init(&fromModels);
-	zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2554);
+	zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2566);
 	if (Z_TYPE_P(&selectTables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35)
 		{
 			ZEPHIR_INIT_NVAR(&tableItem);
 			ZVAL_COPY(&tableItem, _35);
-			zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548);
+			zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2560);
 			ZEPHIR_OBS_NVAR(&_38$$24);
-			zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548);
+			zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560);
 			zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -131552,9 +131557,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			}
 			ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2548);
+				zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2560);
 				ZEPHIR_OBS_NVAR(&_40$$25);
-				zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2548);
+				zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560);
 				zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0);
 			zephir_check_call_status();
@@ -131562,7 +131567,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 	}
 	ZEPHIR_INIT_NVAR(&tableItem);
 	ZEPHIR_INIT_VAR(&_41);
-	zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2674);
+	zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2686);
 	if (Z_TYPE_P(&fromModels) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42)
 		{
@@ -131574,7 +131579,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			}
 			ZEPHIR_INIT_NVAR(&_41);
 			ZVAL_COPY(&_41, _42);
-			zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672);
+			zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2684);
 			if (Z_TYPE_P(&joinModels) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26)
 				{
@@ -131587,13 +131592,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_INIT_NVAR(&joinModel);
 					ZVAL_COPY(&joinModel, _46$$26);
 					ZEPHIR_OBS_NVAR(&joinSource);
-					zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+					zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 					ZEPHIR_OBS_NVAR(&joinType);
-					zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+					zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 					ZEPHIR_OBS_NVAR(&preCondition);
 					if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 						ZEPHIR_OBS_NVAR(&modelNameAlias);
-						zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+						zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 						ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias);
 						zephir_check_call_status();
 						if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -131608,34 +131613,34 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31);
 									ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 29, &_54$$31);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2599);
+									zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2611);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
 								ZEPHIR_OBS_NVAR(&relation);
-								zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+								zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 							}
 						}
 						if (Z_TYPE_P(&relation) == IS_OBJECT) {
 							ZEPHIR_OBS_NVAR(&modelAlias);
-							zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+							zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 							ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0);
 							zephir_check_call_status();
 							if (!(zephir_is_true(&_55$$32))) {
-								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 								zephir_check_call_status();
 							} else {
-								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 								zephir_check_call_status();
 							}
 							if (zephir_array_isset_long(&sqlJoin, 0)) {
-								zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+								zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 								if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35)
 									{
 										ZEPHIR_INIT_NVAR(&sqlJoinItem);
 										ZVAL_COPY(&sqlJoinItem, _58$$35);
-										zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+										zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 									} ZEND_HASH_FOREACH_END();
 								} else {
 									ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -131648,14 +131653,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										}
 										ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 										zephir_check_call_status();
-											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 										ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 										zephir_check_call_status();
 									}
 								}
 								ZEPHIR_INIT_NVAR(&sqlJoinItem);
 							} else {
-								zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+								zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 							}
 						} else {
 							ZEPHIR_INIT_NVAR(&_60$$39);
@@ -131665,7 +131670,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							ZEPHIR_INIT_NVAR(&_61$$39);
 							array_init(&_61$$39);
 							zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+							zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 						}
 					} else {
 						ZEPHIR_INIT_NVAR(&_62$$40);
@@ -131676,7 +131681,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						zephir_create_array(&_63$$40, 1, 0);
 						zephir_array_fast_append(&_63$$40, &preCondition);
 						zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+						zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 					}
 				} ZEND_HASH_FOREACH_END();
 			} else {
@@ -131693,13 +131698,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 					ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0);
 					zephir_check_call_status();
 						ZEPHIR_OBS_NVAR(&joinSource);
-						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 						ZEPHIR_OBS_NVAR(&joinType);
-						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 						ZEPHIR_OBS_NVAR(&preCondition);
 						if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 							ZEPHIR_OBS_NVAR(&modelNameAlias);
-							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias);
 							zephir_check_call_status();
 							if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -131714,34 +131719,34 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45);
 										ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 29, &_68$$45);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2599);
+										zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2611);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
 									ZEPHIR_OBS_NVAR(&relation);
-									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 								}
 							}
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
 								ZEPHIR_OBS_NVAR(&modelAlias);
-								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 								ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0);
 								zephir_check_call_status();
 								if (!(zephir_is_true(&_69$$46))) {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								} else {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								}
 								if (zephir_array_isset_long(&sqlJoin, 0)) {
-									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 									if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49)
 										{
 											ZEPHIR_INIT_NVAR(&sqlJoinItem);
 											ZVAL_COPY(&sqlJoinItem, _70$$49);
-											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 										} ZEND_HASH_FOREACH_END();
 									} else {
 										ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -131754,14 +131759,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 											}
 											ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 											zephir_check_call_status();
-												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 											ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 											zephir_check_call_status();
 										}
 									}
 									ZEPHIR_INIT_NVAR(&sqlJoinItem);
 								} else {
-									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 								}
 							} else {
 								ZEPHIR_INIT_NVAR(&_72$$53);
@@ -131771,7 +131776,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								ZEPHIR_INIT_NVAR(&_73$$53);
 								array_init(&_73$$53);
 								zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+								zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 							}
 						} else {
 							ZEPHIR_INIT_NVAR(&_74$$54);
@@ -131782,7 +131787,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							zephir_create_array(&_75$$54, 1, 0);
 							zephir_array_fast_append(&_75$$54, &preCondition);
 							zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+							zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 						}
 					ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0);
 					zephir_check_call_status();
@@ -131804,7 +131809,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2672);
+				zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2684);
 				if (Z_TYPE_P(&joinModels) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55)
 					{
@@ -131817,13 +131822,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_INIT_NVAR(&joinModel);
 						ZVAL_COPY(&joinModel, _76$$55);
 						ZEPHIR_OBS_NVAR(&joinSource);
-						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+						zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 						ZEPHIR_OBS_NVAR(&joinType);
-						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+						zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 						ZEPHIR_OBS_NVAR(&preCondition);
 						if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 							ZEPHIR_OBS_NVAR(&modelNameAlias);
-							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+							zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias);
 							zephir_check_call_status();
 							if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -131838,34 +131843,34 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 										ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60);
 										ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 29, &_84$$60);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2599);
+										zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2611);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
 									ZEPHIR_OBS_NVAR(&relation);
-									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+									zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 								}
 							}
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
 								ZEPHIR_OBS_NVAR(&modelAlias);
-								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+								zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 								ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0);
 								zephir_check_call_status();
 								if (!(zephir_is_true(&_85$$61))) {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								} else {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								}
 								if (zephir_array_isset_long(&sqlJoin, 0)) {
-									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+									zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 									if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64)
 										{
 											ZEPHIR_INIT_NVAR(&sqlJoinItem);
 											ZVAL_COPY(&sqlJoinItem, _86$$64);
-											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+											zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 										} ZEND_HASH_FOREACH_END();
 									} else {
 										ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -131878,14 +131883,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 											}
 											ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 											zephir_check_call_status();
-												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 											ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 											zephir_check_call_status();
 										}
 									}
 									ZEPHIR_INIT_NVAR(&sqlJoinItem);
 								} else {
-									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+									zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 								}
 							} else {
 								ZEPHIR_INIT_NVAR(&_88$$68);
@@ -131895,7 +131900,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								ZEPHIR_INIT_NVAR(&_89$$68);
 								array_init(&_89$$68);
 								zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+								zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 							}
 						} else {
 							ZEPHIR_INIT_NVAR(&_90$$69);
@@ -131906,7 +131911,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							zephir_create_array(&_91$$69, 1, 0);
 							zephir_array_fast_append(&_91$$69, &preCondition);
 							zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+							zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 						}
 					} ZEND_HASH_FOREACH_END();
 				} else {
@@ -131923,13 +131928,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 						ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0);
 						zephir_check_call_status();
 							ZEPHIR_OBS_NVAR(&joinSource);
-							zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2559);
+							zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571);
 							ZEPHIR_OBS_NVAR(&joinType);
-							zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2564);
+							zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576);
 							ZEPHIR_OBS_NVAR(&preCondition);
 							if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) {
 								ZEPHIR_OBS_NVAR(&modelNameAlias);
-								zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2573);
+								zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2585);
 								ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias);
 								zephir_check_call_status();
 								if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) {
@@ -131944,34 +131949,34 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 											ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74);
 											ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 29, &_96$$74);
 											zephir_check_call_status();
-											zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2599);
+											zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2611);
 											ZEPHIR_MM_RESTORE();
 											return;
 										}
 										ZEPHIR_OBS_NVAR(&relation);
-										zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2605);
+										zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2617);
 									}
 								}
 								if (Z_TYPE_P(&relation) == IS_OBJECT) {
 									ZEPHIR_OBS_NVAR(&modelAlias);
-									zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2616);
+									zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2628);
 									ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0);
 									zephir_check_call_status();
 									if (!(zephir_is_true(&_97$$75))) {
-										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 										zephir_check_call_status();
 									} else {
-										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 										zephir_check_call_status();
 									}
 									if (zephir_array_isset_long(&sqlJoin, 0)) {
-										zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2646);
+										zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2658);
 										if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) {
 											ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78)
 											{
 												ZEPHIR_INIT_NVAR(&sqlJoinItem);
 												ZVAL_COPY(&sqlJoinItem, _98$$78);
-												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+												zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 											} ZEND_HASH_FOREACH_END();
 										} else {
 											ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0);
@@ -131984,14 +131989,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 												}
 												ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0);
 												zephir_check_call_status();
-													zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2644);
+													zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656);
 												ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0);
 												zephir_check_call_status();
 											}
 										}
 										ZEPHIR_INIT_NVAR(&sqlJoinItem);
 									} else {
-										zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647);
+										zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2659);
 									}
 								} else {
 									ZEPHIR_INIT_NVAR(&_100$$82);
@@ -132001,7 +132006,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									ZEPHIR_INIT_NVAR(&_101$$82);
 									array_init(&_101$$82);
 									zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE);
-									zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2658);
+									zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2670);
 								}
 							} else {
 								ZEPHIR_INIT_NVAR(&_102$$83);
@@ -132012,7 +132017,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								zephir_create_array(&_103$$83, 1, 0);
 								zephir_array_fast_append(&_103$$83, &preCondition);
 								zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2669);
+								zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2681);
 							}
 						ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0);
 						zephir_check_call_status();
@@ -132137,7 +132142,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 	ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&fields) == IS_ARRAY) {
-		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2791);
+		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2803);
 		if (Z_TYPE_P(&fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3)
 			{
@@ -132157,12 +132162,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 					ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 29, &_7$$5);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2758);
+					zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2770);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&intermediateField);
-				zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764);
+				zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2776);
 				ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition);
 				zephir_create_array(&sqlEqualsJoinCondition, 4, 0);
 				add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op"));
@@ -132172,7 +132177,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 				add_assoc_long_ex(&_10$$4, SL("type"), 355);
 				zephir_array_update_string(&_10$$4, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_10$$4, SL("name"), &field, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 461, &_10$$4);
+				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 457, &_10$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_9$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_INIT_NVAR(&_12$$4);
@@ -132180,7 +132185,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 				add_assoc_stringl_ex(&_12$$4, SL("type"), SL("qualified"));
 				zephir_array_update_string(&_12$$4, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_12$$4, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 461, &_12$$4);
+				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 457, &_12$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_9$$4, PH_COPY | PH_SEPARATE);
 			} ZEND_HASH_FOREACH_END();
@@ -132205,12 +132210,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 						ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7);
 						ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 29, &_15$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2758);
+						zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2770);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&intermediateField);
-					zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2764);
+					zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2776);
 					ZEPHIR_INIT_NVAR(&_16$$6);
 					zephir_create_array(&_16$$6, 4, 0);
 					add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op"));
@@ -132220,7 +132225,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 					add_assoc_long_ex(&_18$$6, SL("type"), 355);
 					zephir_array_update_string(&_18$$6, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_18$$6, SL("name"), &field, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 461, &_18$$6);
+					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 457, &_18$$6);
 					zephir_check_call_status();
 					zephir_array_update_string(&_16$$6, SL("left"), &_17$$6, PH_COPY | PH_SEPARATE);
 					ZEPHIR_INIT_NVAR(&_19$$6);
@@ -132228,7 +132233,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 					add_assoc_stringl_ex(&_19$$6, SL("type"), SL("qualified"));
 					zephir_array_update_string(&_19$$6, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_19$$6, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 461, &_19$$6);
+					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 457, &_19$$6);
 					zephir_check_call_status();
 					zephir_array_update_string(&_16$$6, SL("right"), &_17$$6, PH_COPY | PH_SEPARATE);
 					ZEPHIR_CPY_WRT(&sqlEqualsJoinCondition, &_16$$6);
@@ -132260,7 +132265,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_long_ex(&_25$$8, SL("type"), 355);
 		zephir_array_update_string(&_25$$8, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_25$$8, SL("name"), &fields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_25$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_25$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("left"), &_24$$8, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_26$$8);
@@ -132268,7 +132273,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_stringl_ex(&_26$$8, SL("type"), SL("qualified"));
 		zephir_array_update_string(&_26$$8, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_26$$8, SL("name"), &intermediateFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_26$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_26$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("right"), &_24$$8, PH_COPY | PH_SEPARATE);
 		zephir_array_fast_append(&_22$$8, &_23$$8);
@@ -132289,7 +132294,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_long_ex(&_27$$8, SL("type"), 355);
 		zephir_array_update_string(&_27$$8, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_27$$8, SL("name"), &intermediateReferencedFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_27$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_27$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("left"), &_24$$8, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_28$$8);
@@ -132297,7 +132302,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_stringl_ex(&_28$$8, SL("type"), SL("qualified"));
 		zephir_array_update_string(&_28$$8, SL("domain"), &referencedModelName, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_28$$8, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_28$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_28$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("right"), &_24$$8, PH_COPY | PH_SEPARATE);
 		zephir_array_fast_append(&_22$$8, &_23$$8);
@@ -132357,14 +132362,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 	}
 	ZEPHIR_INIT_VAR(&orderParts);
 	array_init(&orderParts);
-	zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2900);
+	zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2912);
 	if (Z_TYPE_P(&orderColumns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0)
 		{
 			ZEPHIR_INIT_NVAR(&orderItem);
 			ZVAL_COPY(&orderItem, _0);
-			zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882);
-			ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_2$$5);
+			zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2894);
+			ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 456, &_2$$5);
 			zephir_check_call_status();
 			if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) {
 				if (ZEPHIR_IS_LONG(&orderSort, 327)) {
@@ -132389,7 +132394,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 				zephir_array_fast_append(&_7$$9, &orderPartExpr);
 				ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9);
 			}
-			zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897);
+			zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2909);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0);
@@ -132402,8 +132407,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 			}
 			ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2882);
-				ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_8$$10);
+				zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2894);
+				ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 456, &_8$$10);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&orderSort);
 				if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 0)) {
@@ -132430,7 +132435,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 					zephir_array_fast_append(&_13$$14, &orderPartExpr);
 					ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14);
 				}
-				zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2897);
+				zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2909);
 			ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -132514,13 +132519,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 
 
 	ZEPHIR_OBS_VAR(&columnName);
-	zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2914);
+	zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2926);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&nestingLevel, &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset(&_0, &nestingLevel)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2922);
+		zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2934);
 		ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3);
 	} else {
 		ZEPHIR_INIT_NVAR(&sqlColumnAliases);
@@ -132530,7 +132535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 	if (_3) {
 		_4 = !(zephir_array_isset_string(&expr, SL("domain")));
 		if (!(_4)) {
-			zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2927);
+			zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2939);
 			_4 = ZEPHIR_IS_EMPTY(&_5);
 		}
 		_3 = _4;
@@ -132556,7 +132561,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 			ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7);
 			ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 29, &_10$$7);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2948);
+			zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2960);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -132572,7 +132577,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 				ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9);
 				ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 29, &_14$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2967);
+				zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2979);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -132592,7 +132597,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 				ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12);
 				ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 29, &_17$$12);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2979);
+				zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2991);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -132604,7 +132609,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 		ZEPHIR_INIT_VAR(&hasModel);
 		ZVAL_BOOL(&hasModel, 0);
 		zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3013);
+		zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3025);
 		if (Z_TYPE_P(&_18$$14) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14)
 			{
@@ -132622,7 +132627,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 						ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17);
 						ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 29, &_25$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3002);
+						zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3014);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -132652,7 +132657,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 							ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20);
 							ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 29, &_30$$20);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3002);
+							zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3014);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -132671,14 +132676,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 			ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21);
 			ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 29, &_33$$21);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3016);
+			zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3028);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&models, &_34$$14);
 		if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3027);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3039);
 			return;
 		}
 		ZEPHIR_INIT_VAR(&className);
@@ -132692,7 +132697,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 			ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23);
 			ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 29, &_37$$23);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3038);
+			zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3050);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -132713,7 +132718,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified)
 				ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27);
 				ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 29, &_40$$27);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3057);
+				zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3069);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -132795,7 +132800,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection)
 		ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3101);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3113);
 			return;
 		}
 		RETURN_CCTOR(&connection);
@@ -132862,10 +132867,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords)
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE);
 	ZEPHIR_OBS_VAR(&_4);
-	zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3131);
+	zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3143);
 	zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE);
 	ZEPHIR_OBS_NVAR(&_4);
-	zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3133);
+	zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3145);
 	zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE);
 	ZEPHIR_OBS_VAR(&whereConditions);
 	if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) {
@@ -132877,17 +132882,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords)
 	}
 	ZEPHIR_INIT_VAR(&query);
 	object_init_ex(&query, phalcon_mvc_model_query_ce);
-	ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 469);
+	ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 465);
 	zephir_check_call_status();
 	zephir_read_property(&_5, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 470, &_5);
+	ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 466, &_5);
 	zephir_check_call_status();
 	ZVAL_LONG(&_6, 309);
-	ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 471, &_6);
+	ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 467, &_6);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 472, &selectIr);
+	ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 468, &selectIr);
 	zephir_check_call_status();
-	ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 473, &bindParams, &bindTypes);
+	ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 469, &bindParams, &bindTypes);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -132950,7 +132955,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 
 	ZEPHIR_OBS_VAR(&columnType);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3173);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3185);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&sqlColumns);
@@ -132959,7 +132964,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 	zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0);
 	if (ZEPHIR_IS_LONG(&columnType, 352)) {
 		zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3203);
+		zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3215);
 		if (Z_TYPE_P(&_0$$4) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4)
 			{
@@ -132981,10 +132986,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 				zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE);
 				if (Z_TYPE_P(&eager) != IS_NULL) {
 					zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-					zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197);
+					zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3209);
 					zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE);
 				}
-				zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200);
+				zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3212);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0);
@@ -133010,10 +133015,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 					ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7);
 					if (Z_TYPE_P(&eager) != IS_NULL) {
 						zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-						zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3197);
+						zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3209);
 						zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE);
 					}
-					zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3200);
+					zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3212);
 				ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -133023,14 +133028,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		RETURN_CTOR(&sqlColumns);
 	}
 	if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3207);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3219);
 		return;
 	}
 	if (ZEPHIR_IS_LONG(&columnType, 353)) {
 		zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10);
 		ZEPHIR_OBS_VAR(&columnDomain);
-		zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3219);
+		zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3231);
 		ZEPHIR_OBS_NVAR(&source);
 		if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) {
 			ZEPHIR_INIT_VAR(&_12$$11);
@@ -133040,7 +133045,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 			ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11);
 			ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3224);
+			zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3236);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -133050,7 +133055,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10);
 		ZEPHIR_OBS_NVAR(&modelName);
-		zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3238);
+		zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3250);
 		if (Z_TYPE_P(&preparedAlias) != IS_STRING) {
 			if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) {
 				ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 73, &modelName);
@@ -133068,10 +133073,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10);
 		if (Z_TYPE_P(&eager) != IS_NULL) {
 			zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-			zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3265);
+			zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3277);
 			zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE);
 		}
-		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3268);
+		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3280);
 		RETURN_CTOR(&sqlColumns);
 	}
 	if (ZEPHIR_IS_LONG(&columnType, 354)) {
@@ -133080,8 +133085,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar"));
 		ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16);
 		ZEPHIR_OBS_VAR(&columnData);
-		zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3282);
-		ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 460, &columnData);
+		zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3294);
+		ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 456, &columnData);
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&balias);
 		if (zephir_array_isset_string_fetch(&balias, &sqlExprColumn, SL("balias"), 0)) {
@@ -133090,11 +133095,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		}
 		if (Z_TYPE_P(&eager) != IS_NULL) {
 			zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE);
-			zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3295);
+			zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3307);
 			zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE);
 		}
 		zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE);
-		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3299);
+		zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3311);
 		RETURN_CTOR(&sqlColumns);
 	}
 	ZEPHIR_INIT_VAR(&_19);
@@ -133103,7 +133108,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 	ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType);
 	ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 29, &_20);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3304);
+	zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3316);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -133197,7 +133202,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 		add_assoc_long_ex(&_3$$3, SL("type"), 355);
 		zephir_array_update_string(&_3$$3, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_3$$3, SL("name"), &fields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 461, &_3$$3);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 457, &_3$$3);
 		zephir_check_call_status();
 		zephir_array_update_string(&_1$$3, SL("left"), &_2$$3, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_4$$3);
@@ -133205,7 +133210,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 		add_assoc_stringl_ex(&_4$$3, SL("type"), SL("qualified"));
 		zephir_array_update_string(&_4$$3, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_4$$3, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 461, &_4$$3);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 457, &_4$$3);
 		zephir_check_call_status();
 		zephir_array_update_string(&_1$$3, SL("right"), &_2$$3, PH_COPY | PH_SEPARATE);
 		zephir_array_fast_append(&_0$$3, &_1$$3);
@@ -133213,7 +133218,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 	} else {
 		ZEPHIR_INIT_VAR(&sqlJoinPartialConditions);
 		array_init(&sqlJoinPartialConditions);
-		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3394);
+		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3406);
 		if (Z_TYPE_P(&fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4)
 			{
@@ -133234,7 +133239,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6);
 					ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 29, &_11$$6);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3366);
+					zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3378);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -133247,7 +133252,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 				add_assoc_long_ex(&_15$$5, SL("type"), 355);
 				zephir_array_update_string(&_15$$5, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_15$$5, SL("name"), &field, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 461, &_15$$5);
+				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 457, &_15$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_13$$5, SL("left"), &_14$$5, PH_COPY | PH_SEPARATE);
 				ZEPHIR_INIT_NVAR(&_16$$5);
@@ -133255,10 +133260,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 				add_assoc_stringl_ex(&_16$$5, SL("type"), SL("qualified"));
 				zephir_array_update_string(&_16$$5, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_16$$5, SL("name"), &referencedField, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 461, &_16$$5);
+				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 457, &_16$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391);
+				zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3403);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0);
@@ -133282,7 +133287,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 						ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8);
 						ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 29, &_19$$8);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3366);
+						zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3378);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -133295,7 +133300,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					add_assoc_long_ex(&_22$$7, SL("type"), 355);
 					zephir_array_update_string(&_22$$7, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_22$$7, SL("name"), &field, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 461, &_22$$7);
+					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 457, &_22$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_20$$7, SL("left"), &_21$$7, PH_COPY | PH_SEPARATE);
 					ZEPHIR_INIT_NVAR(&_23$$7);
@@ -133303,10 +133308,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					add_assoc_stringl_ex(&_23$$7, SL("type"), SL("qualified"));
 					zephir_array_update_string(&_23$$7, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_23$$7, SL("name"), &referencedField, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 461, &_23$$7);
+					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 457, &_23$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3391);
+					zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3403);
 				ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -133351,7 +133356,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getTable)
 
 	ZEPHIR_OBS_VAR(&modelName);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3416);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3428);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName);
@@ -133435,7 +133440,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection)
 		ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3454);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3466);
 			return;
 		}
 		RETURN_CCTOR(&connection);
@@ -133493,12 +133498,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 	ZEPHIR_CPY_WRT(&ast, &_0);
 	ZEPHIR_OBS_VAR(&delete);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3476);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3488);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&tables);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3480);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3492);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&models);
@@ -133522,16 +133527,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3540);
+	zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3552);
 	if (Z_TYPE_P(&deleteTables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _1);
 			ZEPHIR_OBS_NVAR(&qualifiedName);
-			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504);
+			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3516);
 			ZEPHIR_OBS_NVAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505);
+			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3517);
 			ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -133555,17 +133560,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 			ZEPHIR_OBS_NVAR(&alias);
 			if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 				zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522);
-				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523);
+				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3534);
+				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3535);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 			} else {
 				zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529);
+				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3541);
 				zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 			}
-			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533);
+			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3545);
 			zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -133580,9 +133585,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 			ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&qualifiedName);
-				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3504);
+				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3516);
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3505);
+				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3517);
 				ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName);
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -133605,17 +133610,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 				ZEPHIR_OBS_NVAR(&alias);
 				if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 					zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3522);
-					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3523);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3534);
+					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3535);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3529);
+					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3541);
 					zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 				}
-				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3533);
+				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3545);
 				zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0);
 			zephir_check_call_status();
@@ -133633,13 +133638,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 	ZEPHIR_OBS_VAR(&where);
 	if (zephir_array_isset_string_fetch(&where, &ast, SL("where"), 0)) {
 		ZVAL_BOOL(&_10$$17, 1);
-		ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 460, &where, &_10$$17);
+		ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 456, &where, &_10$$17);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlDelete, SL("where"), &_9$$17, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&limit);
 	if (zephir_array_isset_string_fetch(&limit, &ast, SL("limit"), 0)) {
-		ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 474, &limit);
+		ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 470, &limit);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$18, PH_COPY | PH_SEPARATE);
 	}
@@ -133699,23 +133704,23 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&ast, &_0);
 	if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3574);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3586);
 		return;
 	}
 	if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3578);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3590);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&qualifiedName);
-	zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3581);
+	zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3593);
 	if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3585);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3597);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_OBS_VAR(&modelName);
-	zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3589);
+	zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3601);
 	ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -133732,8 +133737,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 	notQuoting = 0;
 	ZEPHIR_INIT_VAR(&exprValues);
 	array_init(&exprValues);
-	zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3602);
-	zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3610);
+	zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3614);
+	zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3622);
 	if (Z_TYPE_P(&_2) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3)
 		{
@@ -133742,17 +133747,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 			ZEPHIR_INIT_NVAR(&_5$$7);
 			zephir_create_array(&_5$$7, 2, 0);
 			ZEPHIR_OBS_NVAR(&_6$$7);
-			zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605);
+			zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3617);
 			zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE);
 			if (notQuoting) {
 				ZVAL_BOOL(&_8$$7, 1);
 			} else {
 				ZVAL_BOOL(&_8$$7, 0);
 			}
-			ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 460, &exprValue, &_8$$7);
+			ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 456, &exprValue, &_8$$7);
 			zephir_check_call_status();
 			zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE);
-			zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607);
+			zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3619);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0);
@@ -133768,17 +133773,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 				ZEPHIR_INIT_NVAR(&_10$$8);
 				zephir_create_array(&_10$$8, 2, 0);
 				ZEPHIR_OBS_NVAR(&_11$$8);
-				zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3605);
+				zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3617);
 				zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE);
 				if (notQuoting) {
 					ZVAL_BOOL(&_13$$8, 1);
 				} else {
 					ZVAL_BOOL(&_13$$8, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 460, &exprValue, &_13$$8);
+				ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 456, &exprValue, &_13$$8);
 				zephir_check_call_status();
 				zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3607);
+				zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3619);
 			ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -133794,14 +133799,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 	if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) {
 		ZEPHIR_INIT_VAR(&sqlFields);
 		array_init(&sqlFields);
-		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3634);
+		zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3646);
 		if (Z_TYPE_P(&fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9)
 			{
 				ZEPHIR_INIT_NVAR(&field);
 				ZVAL_COPY(&field, _14$$9);
 				ZEPHIR_OBS_NVAR(&name);
-				zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621);
+				zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3633);
 				ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name);
 				zephir_check_call_status();
 				if (UNEXPECTED(!zephir_is_true(&_16$$10))) {
@@ -133812,11 +133817,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 					ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11);
 					ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 29, &_20$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3627);
+					zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3639);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631);
+				zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3643);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0);
@@ -133830,7 +133835,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 				ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&name);
-					zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3621);
+					zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3633);
 					ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name);
 					zephir_check_call_status();
 					if (UNEXPECTED(!zephir_is_true(&_22$$12))) {
@@ -133841,11 +133846,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 						ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13);
 						ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 29, &_26$$13);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3627);
+						zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3639);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3631);
+					zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3643);
 				ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -134048,12 +134053,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	}
 	ZEPHIR_OBS_VAR(&tables);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3670);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3682);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&columns);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3674);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3686);
 		return;
 	}
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel")));
@@ -134094,26 +134099,26 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&metaData, &_1);
 	if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3741);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3753);
 		return;
 	}
 	if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3747);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3759);
 		return;
 	}
 	number = 0;
 	ZEPHIR_INIT_VAR(&automaticJoins);
 	array_init(&automaticJoins);
-	zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3877);
+	zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3889);
 	if (Z_TYPE_P(&selectedModels) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2)
 		{
 			ZEPHIR_INIT_NVAR(&selectedModel);
 			ZVAL_COPY(&selectedModel, _2);
 			ZEPHIR_OBS_NVAR(&qualifiedName);
-			zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755);
+			zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3767);
 			ZEPHIR_OBS_NVAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756);
+			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3768);
 			ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0);
@@ -134138,7 +134143,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 29, &_7$$17);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3781);
+					zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3793);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -134147,7 +134152,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 				if (Z_TYPE_P(&completeSource) == IS_ARRAY) {
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3805);
 				} else {
 					ZEPHIR_INIT_NVAR(&_9$$19);
 					zephir_create_array(&_9$$19, 3, 0);
@@ -134174,7 +134179,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				} else {
 					ZEPHIR_CPY_WRT(&withs, &with);
 				}
-				zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869);
+				zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3881);
 				if (Z_TYPE_P(&withs) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21)
 					{
@@ -134186,7 +134191,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24);
 						ZEPHIR_CPY_WRT(&joinAlias, &_13$$24);
 						ZEPHIR_OBS_NVAR(&relationModel);
-						zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+						zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 						ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel);
 						zephir_check_call_status();
 						if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -134209,7 +134214,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27);
 								ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_19$$27);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3839);
+								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3851);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -134229,7 +134234,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 						zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 						zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+						zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 						ZEPHIR_INIT_NVAR(&_22$$24);
 						zephir_create_array(&_22$$24, 3, 0);
 						add_assoc_long_ex(&_22$$24, SL("type"), 360);
@@ -134243,7 +134248,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						add_assoc_long_ex(&_23$$24, SL("type"), 355);
 						zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 						zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+						zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 						number++;
 					} ZEND_HASH_FOREACH_END();
 				} else {
@@ -134263,7 +134268,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28);
 							ZEPHIR_CPY_WRT(&joinAlias, &_25$$28);
 							ZEPHIR_OBS_NVAR(&relationModel);
-							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel);
 							zephir_check_call_status();
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -134286,7 +134291,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31);
 									ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 29, &_31$$31);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3839);
+									zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3851);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -134306,7 +134311,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+							zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 							ZEPHIR_INIT_NVAR(&_34$$28);
 							zephir_create_array(&_34$$28, 3, 0);
 							add_assoc_long_ex(&_34$$28, SL("type"), 360);
@@ -134320,7 +134325,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							add_assoc_long_ex(&_35$$28, SL("type"), 355);
 							zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+							zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 							number++;
 						ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0);
 						zephir_check_call_status();
@@ -134328,8 +134333,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				}
 				ZEPHIR_INIT_NVAR(&withItem);
 			}
-			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871);
-			zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872);
+			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3883);
+			zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884);
 			zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -134344,9 +134349,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 			ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&qualifiedName);
-				zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3755);
+				zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3767);
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3756);
+				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3768);
 				ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName);
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0);
@@ -134372,7 +134377,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36);
 						ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 29, &_40$$36);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3781);
+						zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3793);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -134381,7 +134386,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 					if (Z_TYPE_P(&completeSource) == IS_ARRAY) {
-						zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3793);
+						zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3805);
 					} else {
 						ZEPHIR_INIT_NVAR(&_41$$38);
 						zephir_create_array(&_41$$38, 3, 0);
@@ -134409,7 +134414,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					} else {
 						ZEPHIR_CPY_WRT(&withs, &with);
 					}
-					zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3869);
+					zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3881);
 					if (Z_TYPE_P(&withs) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40)
 						{
@@ -134421,7 +134426,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43);
 							ZEPHIR_CPY_WRT(&joinAlias, &_46$$43);
 							ZEPHIR_OBS_NVAR(&relationModel);
-							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+							zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 							ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel);
 							zephir_check_call_status();
 							if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -134444,7 +134449,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46);
 									ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 29, &_52$$46);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3839);
+									zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3851);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -134464,7 +134469,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+							zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 							ZEPHIR_INIT_NVAR(&_55$$43);
 							zephir_create_array(&_55$$43, 3, 0);
 							add_assoc_long_ex(&_55$$43, SL("type"), 360);
@@ -134478,7 +134483,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							add_assoc_long_ex(&_56$$43, SL("type"), 355);
 							zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 							zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE);
-							zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+							zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 							number++;
 						} ZEND_HASH_FOREACH_END();
 					} else {
@@ -134498,7 +134503,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47);
 								ZEPHIR_CPY_WRT(&joinAlias, &_58$$47);
 								ZEPHIR_OBS_NVAR(&relationModel);
-								zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3819);
+								zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3831);
 								ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel);
 								zephir_check_call_status();
 								if (Z_TYPE_P(&relation) == IS_OBJECT) {
@@ -134521,7 +134526,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 										ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50);
 										ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 29, &_64$$50);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3839);
+										zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3851);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -134541,7 +134546,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE);
 								zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE);
 								zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3853);
+								zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
 								ZEPHIR_INIT_NVAR(&_67$$47);
 								zephir_create_array(&_67$$47, 3, 0);
 								add_assoc_long_ex(&_67$$47, SL("type"), 360);
@@ -134555,7 +134560,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								add_assoc_long_ex(&_68$$47, SL("type"), 355);
 								zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE);
 								zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE);
-								zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3865);
+								zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3877);
 								number++;
 							ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0);
 							zephir_check_call_status();
@@ -134563,8 +134568,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 					}
 					ZEPHIR_INIT_NVAR(&withItem);
 				}
-				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3871);
-				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3872);
+				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3883);
+				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884);
 				zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0);
 			zephir_check_call_status();
@@ -134625,16 +134630,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins);
 				zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE);
 			} else {
-				zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3908);
+				zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3920);
 				zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE);
 			}
 		}
-		ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 475, &select);
+		ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 471, &select);
 		zephir_check_call_status();
 	} else {
 		if (zephir_fast_count_int(&automaticJoins)) {
 			zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE);
-			ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 475, &select);
+			ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 471, &select);
 			zephir_check_call_status();
 		} else {
 			ZEPHIR_INIT_NVAR(&sqlJoins);
@@ -134644,15 +134649,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	position = 0;
 	ZEPHIR_INIT_VAR(&sqlColumnAliases);
 	array_init(&sqlColumnAliases);
-	zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3959);
+	zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3971);
 	if (Z_TYPE_P(&selectColumns) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82)
 		{
 			ZEPHIR_INIT_NVAR(&column);
 			ZVAL_COPY(&column, _82);
-			ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 476, &column);
+			ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 472, &column);
 			zephir_check_call_status();
-			zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3957);
+			zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3969);
 			if (Z_TYPE_P(&_84$$60) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60)
 				{
@@ -134669,7 +134674,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 						if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 							zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 						} else {
-							zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+							zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 							if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) {
 								ZEPHIR_INIT_NVAR(&_89$$66);
 								ZVAL_LONG(&_89$$66, position);
@@ -134677,7 +134682,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66);
 								zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+								zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 							}
 						}
 					}
@@ -134705,7 +134710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 								zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+								zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 								if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) {
 									ZEPHIR_INIT_NVAR(&_92$$73);
 									ZVAL_LONG(&_92$$73, position);
@@ -134713,7 +134718,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73);
 									zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 								}
 							}
 						}
@@ -134735,9 +134740,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 			}
 			ZEPHIR_CALL_METHOD(&column, &selectColumns, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 476, &column);
+				ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 472, &column);
 				zephir_check_call_status();
-				zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3957);
+				zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3969);
 				if (Z_TYPE_P(&_94$$75) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75)
 					{
@@ -134754,7 +134759,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 							if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 								zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+								zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 								if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) {
 									ZEPHIR_INIT_NVAR(&_98$$81);
 									ZVAL_LONG(&_98$$81, position);
@@ -134762,7 +134767,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 									ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81);
 									zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+									zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 								}
 							}
 						}
@@ -134790,7 +134795,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 								if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) {
 									zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3947);
+									zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3959);
 									if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) {
 										ZEPHIR_INIT_NVAR(&_101$$88);
 										ZVAL_LONG(&_101$$88, position);
@@ -134798,7 +134803,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 										ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88);
 										zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE);
 									} else {
-										zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3950);
+										zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3962);
 									}
 								}
 							}
@@ -134830,31 +134835,31 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	}
 	ZEPHIR_OBS_VAR(&where);
 	if (zephir_array_isset_string_fetch(&where, ast, SL("where"), 0)) {
-		ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 460, &where);
+		ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 456, &where);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("where"), &_104$$92, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&groupBy);
 	if (zephir_array_isset_string_fetch(&groupBy, ast, SL("groupBy"), 0)) {
-		ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 477, &groupBy);
+		ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 473, &groupBy);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("group"), &_105$$93, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&having);
 	if (zephir_array_isset_string_fetch(&having, ast, SL("having"), 0)) {
-		ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 460, &having);
+		ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 456, &having);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("having"), &_106$$94, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&order);
 	if (zephir_array_isset_string_fetch(&order, ast, SL("orderBy"), 0)) {
-		ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 478, &order);
+		ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 474, &order);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("order"), &_107$$95, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&limit);
 	if (zephir_array_isset_string_fetch(&limit, ast, SL("limit"), 0)) {
-		ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 474, &limit);
+		ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 470, &limit);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("limit"), &_108$$96, PH_COPY | PH_SEPARATE);
 	}
@@ -134944,17 +134949,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 	ZEPHIR_CPY_WRT(&ast, &_0);
 	ZEPHIR_OBS_VAR(&update);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4036);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4048);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&tables);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4040);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4052);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&values);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4044);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4056);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&models);
@@ -134978,16 +134983,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4110);
+	zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4122);
 	if (Z_TYPE_P(&updateTables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _1);
 			ZEPHIR_OBS_NVAR(&qualifiedName);
-			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068);
+			zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4080);
 			ZEPHIR_OBS_NVAR(&modelName);
-			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069);
+			zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4081);
 			ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName);
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -135011,17 +135016,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			ZEPHIR_OBS_NVAR(&alias);
 			if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 				zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092);
-				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093);
+				zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4104);
+				zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4105);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 			} else {
 				zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 				zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099);
+				zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4111);
 				zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 			}
-			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103);
+			zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4115);
 			zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -135036,9 +135041,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&qualifiedName);
-				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4068);
+				zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4080);
 				ZEPHIR_OBS_NVAR(&modelName);
-				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4069);
+				zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4081);
 				ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName);
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0);
@@ -135061,17 +135066,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 				ZEPHIR_OBS_NVAR(&alias);
 				if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) {
 					zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4092);
-					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4093);
+					zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4104);
+					zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4105);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE);
 					zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4099);
+					zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4111);
 					zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE);
 				}
-				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4103);
+				zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4115);
 				zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0);
 			zephir_check_call_status();
@@ -135094,37 +135099,37 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 		ZEPHIR_CPY_WRT(&updateValues, &values);
 	}
 	notQuoting = 0;
-	zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4134);
+	zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4146);
 	if (Z_TYPE_P(&updateValues) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9)
 		{
 			ZEPHIR_INIT_NVAR(&updateValue);
 			ZVAL_COPY(&updateValue, _9);
-			zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126);
+			zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4138);
 			if (notQuoting) {
 				ZVAL_BOOL(&_13$$20, 1);
 			} else {
 				ZVAL_BOOL(&_13$$20, 0);
 			}
-			ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 460, &_12$$20, &_13$$20);
+			ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 456, &_12$$20, &_13$$20);
 			zephir_check_call_status();
-			zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126);
+			zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138);
 			ZEPHIR_OBS_NVAR(&exprColumn);
-			zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127);
+			zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4139);
 			ZEPHIR_INIT_NVAR(&_15$$20);
 			zephir_create_array(&_15$$20, 2, 0);
 			ZEPHIR_OBS_NVAR(&_16$$20);
-			zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129);
+			zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4141);
 			zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE);
 			if (notQuoting) {
 				ZVAL_BOOL(&_18$$20, 1);
 			} else {
 				ZVAL_BOOL(&_18$$20, 0);
 			}
-			ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 460, &exprColumn, &_18$$20);
+			ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 456, &exprColumn, &_18$$20);
 			zephir_check_call_status();
 			zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE);
-			zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131);
+			zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4143);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0);
@@ -135137,31 +135142,31 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			}
 			ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4126);
+				zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4138);
 				if (notQuoting) {
 					ZVAL_BOOL(&_21$$21, 1);
 				} else {
 					ZVAL_BOOL(&_21$$21, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 460, &_20$$21, &_21$$21);
+				ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 456, &_20$$21, &_21$$21);
 				zephir_check_call_status();
-				zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4126);
+				zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138);
 				ZEPHIR_OBS_NVAR(&exprColumn);
-				zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127);
+				zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4139);
 				ZEPHIR_INIT_NVAR(&_22$$21);
 				zephir_create_array(&_22$$21, 2, 0);
 				ZEPHIR_OBS_NVAR(&_23$$21);
-				zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4129);
+				zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4141);
 				zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE);
 				if (notQuoting) {
 					ZVAL_BOOL(&_25$$21, 1);
 				} else {
 					ZVAL_BOOL(&_25$$21, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 460, &exprColumn, &_25$$21);
+				ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 456, &exprColumn, &_25$$21);
 				zephir_check_call_status();
 				zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131);
+				zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4143);
 			ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -135176,13 +135181,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 	ZEPHIR_OBS_VAR(&where);
 	if (zephir_array_isset_string_fetch(&where, &ast, SL("where"), 0)) {
 		ZVAL_BOOL(&_27$$22, 1);
-		ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 460, &where, &_27$$22);
+		ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 456, &where, &_27$$22);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlUpdate, SL("where"), &_26$$22, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&limit);
 	if (zephir_array_isset_string_fetch(&limit, &ast, SL("limit"), 0)) {
-		ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 474, &limit);
+		ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 470, &limit);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlUpdate, SL("limit"), &_28$$23, PH_COPY | PH_SEPARATE);
 	}
@@ -136901,7 +136906,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Row, toArray)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 429, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 425, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -137080,7 +137085,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("rollbackOnAbort"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_is_true(&_0)) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 483);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 479);
 		zephir_check_call_status();
 		if (zephir_is_true(&_1$$3)) {
 			ZEPHIR_INIT_VAR(&_2$$4);
@@ -137199,7 +137204,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback)
 			ZEPHIR_INIT_VAR(&_3$$7);
 			object_init_ex(&_3$$7, phalcon_mvc_model_transaction_failed_ce);
 			zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("rollbackRecord"), PH_NOISY_CC | PH_READONLY);
-			ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 484, &rollbackMessage, &_4$$7);
+			ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 480, &rollbackMessage, &_4$$7);
 			zephir_check_call_status();
 			zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model/Transaction.zep", 215);
 			ZEPHIR_MM_RESTORE();
@@ -138300,7 +138305,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getModels)
 	}
 	if (_1) {
 		ZEPHIR_MAKE_REF(&models);
-		ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 479, &models);
+		ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 475, &models);
 		ZEPHIR_UNREF(&models);
 		zephir_check_call_status();
 		RETURN_MM();
@@ -138540,9 +138545,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					ZEPHIR_CONCAT_SVS(&_6$$19, "'", &conditions, "'");
 					ZEPHIR_CPY_WRT(&conditions, &_6$$19);
 				}
-				ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "autoescape", NULL, 480, &model);
+				ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "autoescape", NULL, 476, &model);
 				zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_8$$13, this_ptr, "autoescape", NULL, 480, &attributeField);
+				ZEPHIR_CALL_METHOD(&_8$$13, this_ptr, "autoescape", NULL, 476, &attributeField);
 				zephir_check_call_status();
 				ZEPHIR_INIT_VAR(&_9$$13);
 				ZEPHIR_CONCAT_VSVSV(&_9$$13, &_7$$13, ".", &_8$$13, " = ", &conditions);
@@ -138589,7 +138594,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					if (Z_TYPE_P(&columnAlias) == IS_LONG) {
 						zephir_array_append(&selectedColumns, &column, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 793);
 					} else {
-						ZEPHIR_CALL_METHOD(&_14$$29, this_ptr, "autoescape", NULL, 480, &columnAlias);
+						ZEPHIR_CALL_METHOD(&_14$$29, this_ptr, "autoescape", NULL, 476, &columnAlias);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_15$$29);
 						ZEPHIR_CONCAT_VSV(&_15$$29, &column, " AS ", &_14$$29);
@@ -138612,7 +138617,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 						if (Z_TYPE_P(&columnAlias) == IS_LONG) {
 							zephir_array_append(&selectedColumns, &column, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 793);
 						} else {
-							ZEPHIR_CALL_METHOD(&_16$$32, this_ptr, "autoescape", NULL, 480, &columnAlias);
+							ZEPHIR_CALL_METHOD(&_16$$32, this_ptr, "autoescape", NULL, 476, &columnAlias);
 							zephir_check_call_status();
 							ZEPHIR_INIT_NVAR(&_17$$32);
 							ZEPHIR_CONCAT_VSV(&_17$$32, &column, " AS ", &_16$$32);
@@ -138648,11 +138653,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					ZVAL_COPY(&model, _19$$35);
 					ZEPHIR_INIT_NVAR(&selectedColumn);
 					if (Z_TYPE_P(&modelColumnAlias) == IS_LONG) {
-						ZEPHIR_CALL_METHOD(&_23$$37, this_ptr, "autoescape", NULL, 480, &model);
+						ZEPHIR_CALL_METHOD(&_23$$37, this_ptr, "autoescape", NULL, 476, &model);
 						zephir_check_call_status();
 						ZEPHIR_CONCAT_VS(&selectedColumn, &_23$$37, ".*");
 					} else {
-						ZEPHIR_CALL_METHOD(&_24$$38, this_ptr, "autoescape", NULL, 480, &modelColumnAlias);
+						ZEPHIR_CALL_METHOD(&_24$$38, this_ptr, "autoescape", NULL, 476, &modelColumnAlias);
 						zephir_check_call_status();
 						ZEPHIR_CONCAT_VS(&selectedColumn, &_24$$38, ".*");
 					}
@@ -138673,11 +138678,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&selectedColumn);
 						if (Z_TYPE_P(&modelColumnAlias) == IS_LONG) {
-							ZEPHIR_CALL_METHOD(&_25$$40, this_ptr, "autoescape", NULL, 480, &model);
+							ZEPHIR_CALL_METHOD(&_25$$40, this_ptr, "autoescape", NULL, 476, &model);
 							zephir_check_call_status();
 							ZEPHIR_CONCAT_VS(&selectedColumn, &_25$$40, ".*");
 						} else {
-							ZEPHIR_CALL_METHOD(&_26$$41, this_ptr, "autoescape", NULL, 480, &modelColumnAlias);
+							ZEPHIR_CALL_METHOD(&_26$$41, this_ptr, "autoescape", NULL, 476, &modelColumnAlias);
 							zephir_check_call_status();
 							ZEPHIR_CONCAT_VS(&selectedColumn, &_26$$41, ".*");
 						}
@@ -138692,7 +138697,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 			zephir_fast_join_str(&_27$$35, SL(", "), &selectedColumns);
 			zephir_concat_self(&phql, &_27$$35);
 		} else {
-			ZEPHIR_CALL_METHOD(&_28$$42, this_ptr, "autoescape", NULL, 480, &models);
+			ZEPHIR_CALL_METHOD(&_28$$42, this_ptr, "autoescape", NULL, 476, &models);
 			zephir_check_call_status();
 			ZEPHIR_INIT_VAR(&_29$$42);
 			ZEPHIR_CONCAT_VS(&_29$$42, &_28$$42, ".*");
@@ -138715,14 +138720,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				ZEPHIR_INIT_NVAR(&model);
 				ZVAL_COPY(&model, _30$$43);
 				if (Z_TYPE_P(&modelAlias) == IS_STRING) {
-					ZEPHIR_CALL_METHOD(&_34$$45, this_ptr, "autoescape", NULL, 480, &model);
+					ZEPHIR_CALL_METHOD(&_34$$45, this_ptr, "autoescape", NULL, 476, &model);
 					zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_35$$45, this_ptr, "autoescape", NULL, 480, &modelAlias);
+					ZEPHIR_CALL_METHOD(&_35$$45, this_ptr, "autoescape", NULL, 476, &modelAlias);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&selectedModel);
 					ZEPHIR_CONCAT_VSV(&selectedModel, &_34$$45, " AS ", &_35$$45);
 				} else {
-					ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 480, &model);
+					ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 476, &model);
 					zephir_check_call_status();
 				}
 				zephir_array_append(&selectedModels, &selectedModel, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 839);
@@ -138741,14 +138746,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				ZEPHIR_CALL_METHOD(&model, &models, "current", NULL, 0);
 				zephir_check_call_status();
 					if (Z_TYPE_P(&modelAlias) == IS_STRING) {
-						ZEPHIR_CALL_METHOD(&_36$$48, this_ptr, "autoescape", NULL, 480, &model);
+						ZEPHIR_CALL_METHOD(&_36$$48, this_ptr, "autoescape", NULL, 476, &model);
 						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&_37$$48, this_ptr, "autoescape", NULL, 480, &modelAlias);
+						ZEPHIR_CALL_METHOD(&_37$$48, this_ptr, "autoescape", NULL, 476, &modelAlias);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&selectedModel);
 						ZEPHIR_CONCAT_VSV(&selectedModel, &_36$$48, " AS ", &_37$$48);
 					} else {
-						ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 480, &model);
+						ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 476, &model);
 						zephir_check_call_status();
 					}
 					zephir_array_append(&selectedModels, &selectedModel, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 839);
@@ -138764,7 +138769,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 		ZEPHIR_CONCAT_SV(&_39$$43, " FROM ", &_38$$43);
 		zephir_concat_self(&phql, &_39$$43);
 	} else {
-		ZEPHIR_CALL_METHOD(&_40$$50, this_ptr, "autoescape", NULL, 480, &models);
+		ZEPHIR_CALL_METHOD(&_40$$50, this_ptr, "autoescape", NULL, 476, &models);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_41$$50);
 		ZEPHIR_CONCAT_SV(&_41$$50, " FROM ", &_40$$50);
@@ -138788,20 +138793,20 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				ZEPHIR_OBS_NVAR(&joinType);
 				zephir_array_fetch_long(&joinType, &join, 3, PH_NOISY, "phalcon/Mvc/Model/Query/Builder.zep", 872);
 				if (zephir_is_true(&joinType)) {
-					ZEPHIR_CALL_METHOD(&_44$$53, this_ptr, "autoescape", NULL, 480, &joinModel);
+					ZEPHIR_CALL_METHOD(&_44$$53, this_ptr, "autoescape", NULL, 476, &joinModel);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_45$$53);
 					ZEPHIR_CONCAT_SVSV(&_45$$53, " ", &joinType, " JOIN ", &_44$$53);
 					zephir_concat_self(&phql, &_45$$53);
 				} else {
-					ZEPHIR_CALL_METHOD(&_46$$54, this_ptr, "autoescape", NULL, 480, &joinModel);
+					ZEPHIR_CALL_METHOD(&_46$$54, this_ptr, "autoescape", NULL, 476, &joinModel);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_47$$54);
 					ZEPHIR_CONCAT_SV(&_47$$54, " JOIN ", &_46$$54);
 					zephir_concat_self(&phql, &_47$$54);
 				}
 				if (zephir_is_true(&joinAlias)) {
-					ZEPHIR_CALL_METHOD(&_48$$55, this_ptr, "autoescape", NULL, 480, &joinAlias);
+					ZEPHIR_CALL_METHOD(&_48$$55, this_ptr, "autoescape", NULL, 476, &joinAlias);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_49$$55);
 					ZEPHIR_CONCAT_SV(&_49$$55, " AS ", &_48$$55);
@@ -138833,20 +138838,20 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					ZEPHIR_OBS_NVAR(&joinType);
 					zephir_array_fetch_long(&joinType, &join, 3, PH_NOISY, "phalcon/Mvc/Model/Query/Builder.zep", 872);
 					if (zephir_is_true(&joinType)) {
-						ZEPHIR_CALL_METHOD(&_51$$58, this_ptr, "autoescape", NULL, 480, &joinModel);
+						ZEPHIR_CALL_METHOD(&_51$$58, this_ptr, "autoescape", NULL, 476, &joinModel);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_52$$58);
 						ZEPHIR_CONCAT_SVSV(&_52$$58, " ", &joinType, " JOIN ", &_51$$58);
 						zephir_concat_self(&phql, &_52$$58);
 					} else {
-						ZEPHIR_CALL_METHOD(&_53$$59, this_ptr, "autoescape", NULL, 480, &joinModel);
+						ZEPHIR_CALL_METHOD(&_53$$59, this_ptr, "autoescape", NULL, 476, &joinModel);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_54$$59);
 						ZEPHIR_CONCAT_SV(&_54$$59, " JOIN ", &_53$$59);
 						zephir_concat_self(&phql, &_54$$59);
 					}
 					if (zephir_is_true(&joinAlias)) {
-						ZEPHIR_CALL_METHOD(&_55$$60, this_ptr, "autoescape", NULL, 480, &joinAlias);
+						ZEPHIR_CALL_METHOD(&_55$$60, this_ptr, "autoescape", NULL, 476, &joinAlias);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_56$$60);
 						ZEPHIR_CONCAT_SV(&_56$$60, " AS ", &_55$$60);
@@ -138881,7 +138886,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 			{
 				ZEPHIR_INIT_NVAR(&groupItem);
 				ZVAL_COPY(&groupItem, _59$$64);
-				ZEPHIR_CALL_METHOD(&_61$$65, this_ptr, "autoescape", NULL, 480, &groupItem);
+				ZEPHIR_CALL_METHOD(&_61$$65, this_ptr, "autoescape", NULL, 476, &groupItem);
 				zephir_check_call_status();
 				zephir_array_append(&groupItems, &_61$$65, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 914);
 			} ZEND_HASH_FOREACH_END();
@@ -138896,7 +138901,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				}
 				ZEPHIR_CALL_METHOD(&groupItem, &group, "current", NULL, 0);
 				zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_62$$66, this_ptr, "autoescape", NULL, 480, &groupItem);
+					ZEPHIR_CALL_METHOD(&_62$$66, this_ptr, "autoescape", NULL, 476, &groupItem);
 					zephir_check_call_status();
 					zephir_array_append(&groupItems, &_62$$66, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 914);
 				ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0);
@@ -138939,7 +138944,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 						ZEPHIR_INIT_NVAR(&itemExplode$$73);
 						zephir_fast_explode_str(&itemExplode$$73, SL(" "), &orderItem, LONG_MAX);
 						zephir_array_fetch_long(&_69$$73, &itemExplode$$73, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
-						ZEPHIR_CALL_METHOD(&_68$$73, this_ptr, "autoescape", NULL, 480, &_69$$73);
+						ZEPHIR_CALL_METHOD(&_68$$73, this_ptr, "autoescape", NULL, 476, &_69$$73);
 						zephir_check_call_status();
 						zephir_array_fetch_long(&_70$$73, &itemExplode$$73, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 						ZEPHIR_INIT_NVAR(&_71$$73);
@@ -138947,7 +138952,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 						zephir_array_append(&orderItems, &_71$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 						continue;
 					}
-					ZEPHIR_CALL_METHOD(&_72$$71, this_ptr, "autoescape", NULL, 480, &orderItem);
+					ZEPHIR_CALL_METHOD(&_72$$71, this_ptr, "autoescape", NULL, 476, &orderItem);
 					zephir_check_call_status();
 					zephir_array_append(&orderItems, &_72$$71, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 958);
 				} ZEND_HASH_FOREACH_END();
@@ -138970,7 +138975,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 							ZEPHIR_INIT_NVAR(&itemExplode$$76);
 							zephir_fast_explode_str(&itemExplode$$76, SL(" "), &orderItem, LONG_MAX);
 							zephir_array_fetch_long(&_74$$76, &itemExplode$$76, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
-							ZEPHIR_CALL_METHOD(&_73$$76, this_ptr, "autoescape", NULL, 480, &_74$$76);
+							ZEPHIR_CALL_METHOD(&_73$$76, this_ptr, "autoescape", NULL, 476, &_74$$76);
 							zephir_check_call_status();
 							zephir_array_fetch_long(&_75$$76, &itemExplode$$76, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 							ZEPHIR_INIT_NVAR(&_76$$76);
@@ -138978,7 +138983,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 							zephir_array_append(&orderItems, &_76$$76, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 							continue;
 						}
-						ZEPHIR_CALL_METHOD(&_77$$74, this_ptr, "autoescape", NULL, 480, &orderItem);
+						ZEPHIR_CALL_METHOD(&_77$$74, this_ptr, "autoescape", NULL, 476, &orderItem);
 						zephir_check_call_status();
 						zephir_array_append(&orderItems, &_77$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 958);
 					ZEPHIR_CALL_METHOD(NULL, &order, "next", NULL, 0);
@@ -139091,7 +139096,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getQuery)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 481);
+	ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 477);
 	zephir_check_call_status();
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
@@ -150512,7 +150517,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get)
 			ZEPHIR_INIT_VAR(&_3$$4);
 			ZVAL_STRING(&_3$$4, "rollbackPendent");
 			zephir_array_fast_append(&_2$$4, &_3$$4);
-			ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 485, &_2$$4);
+			ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 481, &_2$$4);
 			zephir_check_call_status();
 		}
 		if (1) {
@@ -150639,9 +150644,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction)
 	} else {
 		ZVAL_BOOL(&_7, 0);
 	}
-	ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 486, &container, &_7, &_6);
+	ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 482, &container, &_7, &_6);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 487, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 483, this_ptr);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("transactions"), &transaction);
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("number")));
@@ -151249,7 +151254,7 @@ static 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(&timestamp, this_ptr, "gettimestamp", NULL, 437, &options);
+	ZEPHIR_CALL_METHOD(&timestamp, this_ptr, "gettimestamp", NULL, 433, &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);
@@ -151313,7 +151318,7 @@ static 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, 438, &format);
+		ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 434, &format);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -151881,7 +151886,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write)
 		ZEPHIR_CONCAT_SVS(&_5$$3, "<?php return ", &_4$$3, "; ");
 		zephir_file_put_contents(&_3$$3, &path, &_5$$3);
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$3)) {
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 447, &option);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 443, &option);
 			zephir_check_call_status_or_jump(try_end_1);
 		}
 
@@ -151895,7 +151900,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write)
 		if (zephir_is_instance_of(&_6, SL("Exception"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_7, &_6);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 447, &option);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 443, &option);
 			zephir_check_call_status();
 		}
 	}
@@ -153972,7 +153977,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray)
 		if (!(zephir_is_true(&_0))) {
 			break;
 		}
-		ZEPHIR_CALL_METHOD(&current, this_ptr, "current", &_2, 482);
+		ZEPHIR_CALL_METHOD(&current, this_ptr, "current", &_2, 478);
 		zephir_check_call_status();
 		zephir_array_append(&records, &current, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 279);
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0);
@@ -155685,29 +155690,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Micro_LazyLoader)
 {
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Mvc\\Micro, LazyLoader, phalcon, mvc_micro_lazyloader, phalcon_mvc_micro_lazyloader_method_entry, 0);
 
-	zend_declare_property_null(phalcon_mvc_micro_lazyloader_ce, SL("handler"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_mvc_micro_lazyloader_ce, SL("definition"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_mvc_micro_lazyloader_ce, SL("handler"), ZEND_ACC_PROTECTED);
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "handler");
-}
-
-static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "definition");
-}
-
 static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -155828,6 +155815,24 @@ static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "definition");
+}
+
+static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "handler");
+}
+
 
 
 
@@ -155892,15 +155897,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_View_Simple)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "registeredEngines");
-}
-
 static PHP_METHOD(Phalcon_Mvc_View_Simple, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -156041,6 +156037,15 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, getParamsToView)
 	RETURN_MEMBER(getThis(), "viewParams");
 }
 
+static PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "registeredEngines");
+}
+
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getVar)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -156144,12 +156149,12 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, partial)
 	} else {
 		ZEPHIR_CPY_WRT(&mergedParams, params);
 	}
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &partialPath, &mergedParams);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 508, &partialPath, &mergedParams);
 	zephir_check_call_status();
 	if (Z_TYPE_P(params) == IS_ARRAY) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("viewParams"), &viewParams);
 	}
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 	zephir_check_call_status();
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("content"), PH_NOISY_CC | PH_READONLY);
 	zend_print_zval(&_2, 0);
@@ -156234,9 +156239,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, render)
 	ZEPHIR_CPY_WRT(&viewParams, &_1);
 	ZEPHIR_INIT_VAR(&mergedParams);
 	zephir_fast_array_merge(&mergedParams, &viewParams, &params);
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &path, &mergedParams);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 508, &path, &mergedParams);
 	zephir_check_call_status();
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "content");
 }
@@ -156438,7 +156443,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, setViewsDir)
 	}
 
 
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 0, &viewsDir);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 509, &viewsDir);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDir"), &_0);
 	ZEPHIR_MM_RESTORE();
@@ -156488,18 +156493,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines)
 		array_init(&engines);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("registeredEngines"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&registeredEngines, &_1$$3);
-		if (Z_TYPE_P(&registeredEngines) != IS_ARRAY) {
+		if (ZEPHIR_IS_EMPTY(&registeredEngines)) {
 			ZEPHIR_INIT_VAR(&_2$$4);
 			object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce);
-			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 494, this_ptr, &di);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 490, this_ptr, &di);
 			zephir_check_call_status();
 			zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE);
 		} else {
 			if (Z_TYPE_P(&di) != IS_OBJECT) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access the application services", "phalcon/Mvc/View/Simple.zep", 449);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access the application services", "phalcon/Mvc/View/Simple.zep", 457);
 				return;
 			}
-			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View/Simple.zep", 482);
+			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View/Simple.zep", 490);
 			if (Z_TYPE_P(&registeredEngines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&registeredEngines), _5$$5, _6$$5, _3$$5)
 				{
@@ -156535,7 +156540,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines)
 						ZEPHIR_CONCAT_SV(&_13$$12, "Invalid template engine registration for extension: ", &extension);
 						ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/View/Simple.zep", 477);
+						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/View/Simple.zep", 485);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -156578,7 +156583,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines)
 							ZEPHIR_CONCAT_SV(&_19$$18, "Invalid template engine registration for extension: ", &extension);
 							ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_14, 29, &_19$$18);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View/Simple.zep", 477);
+							zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View/Simple.zep", 485);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -156686,7 +156691,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender)
 	zephir_get_strval(&viewsDirPath, &_3);
 	ZEPHIR_CALL_METHOD(&engines, this_ptr, "loadtemplateengines", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&engines, 0, "phalcon/Mvc/View/Simple.zep", 573);
+	zephir_is_iterable(&engines, 0, "phalcon/Mvc/View/Simple.zep", 581);
 	if (Z_TYPE_P(&engines) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _6, _7, _4)
 		{
@@ -156809,7 +156814,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender)
 		ZEPHIR_CONCAT_SVS(&_31$$20, "View '", &viewsDirPath, "' was not found in the views directory");
 		ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", NULL, 29, &_31$$20);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_30$$20, "phalcon/Mvc/View/Simple.zep", 576);
+		zephir_throw_exception_debug(&_30$$20, "phalcon/Mvc/View/Simple.zep", 584);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -156863,12 +156868,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, getDirSeparator)
 
 zend_object *zephir_init_properties_Phalcon_Mvc_View_Simple(zend_class_entry *class_type)
 {
-		zval _0, _2, _1$$3, _3$$4;
+		zval _0, _2, _4, _1$$3, _3$$4, _5$$5;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_5$$5);
 	
 
 		ZEPHIR_MM_GROW();
@@ -156882,11 +156889,17 @@ zend_object *zephir_init_properties_Phalcon_Mvc_View_Simple(zend_class_entry *cl
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("viewParams"), &_1$$3);
 		}
-		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("registeredEngines"), 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("options"), &_3$$4);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("registeredEngines"), &_3$$4);
+		}
+		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_4) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_5$$5);
+			array_init(&_5$$5);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("options"), &_5$$5);
 		}
 		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
@@ -157100,7 +157113,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render)
 
 
 	if (mustClean) {
-		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496);
+		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 492);
 		zephir_check_call_status();
 	}
 	if (Z_TYPE_P(params) == IS_ARRAY) {
@@ -157150,7 +157163,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render)
 	}
 	if (mustClean) {
 		zephir_read_property(&_6$$7, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 495);
+		ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 491);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(NULL, &_6$$7, "setcontent", NULL, 0, &_7$$7);
 		zephir_check_call_status();
@@ -157294,7 +157307,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding)
 		_0 = ZEPHIR_IS_STRING_IDENTICAL(&to, "utf8");
 	}
 	if (_0) {
-		ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 497, &text);
+		ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 493, &text);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -157339,18 +157352,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler)
 		ZEPHIR_INIT_NVAR(&compiler);
 		object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 498, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 494, &_1$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_2$$3);
 		if (Z_TYPE_P(&container) == IS_OBJECT) {
-			ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 499, &container);
+			ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 495, &container);
 			zephir_check_call_status();
 		}
 		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&options, &_2$$3);
 		if (Z_TYPE_P(&options) == IS_ARRAY) {
-			ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 500, &options);
+			ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 496, &options);
 			zephir_check_call_status();
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("compiler"), &compiler);
@@ -157544,7 +157557,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload)
 		zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href);
 		ZEPHIR_INIT_VAR(&_8$$5);
 		ZVAL_STRING(&_8$$5, "preload");
-		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 501, &_8$$5, &_5$$5, &attributes);
+		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 497, &_8$$5, &_5$$5, &attributes);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_8$$5);
 		object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce);
@@ -157556,7 +157569,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload)
 		ZEPHIR_INIT_VAR(&_10$$5);
 		zephir_create_array(&_10$$5, 1, 0);
 		zephir_array_fast_append(&_10$$5, &link);
-		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 502, &_10$$5);
+		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 498, &_10$$5);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&header);
 		ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5);
@@ -157624,7 +157637,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render)
 
 
 	if (mustClean) {
-		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496);
+		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 492);
 		zephir_check_call_status();
 	}
 	ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0);
@@ -157700,7 +157713,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render)
 	}
 	if (mustClean) {
 		zephir_read_property(&_11$$11, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 495);
+		ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 491);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(NULL, &_11$$11, "setcontent", NULL, 0, &_12$$11);
 		zephir_check_call_status();
@@ -157840,7 +157853,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice)
 	}
 	if (Z_TYPE_P(value) == IS_ARRAY) {
 		ZVAL_LONG(&_5$$9, start);
-		ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, value, &_5$$9, &length);
+		ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 499, value, &_5$$9, &length);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -157889,7 +157902,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort)
 
 
 	ZEPHIR_MAKE_REF(&value);
-	ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 504, &value);
+	ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 500, &value);
 	ZEPHIR_UNREF(&value);
 	zephir_check_call_status();
 	RETURN_CTOR(&value);
@@ -158174,7 +158187,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader)
 			}
 		}
 	} else {
-		ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 505, &left);
+		ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 501, &left);
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&leftType);
 		zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 244);
@@ -158196,7 +158209,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader)
 		zephir_array_fetch_string(&_11$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 258);
 		zephir_concat_self(&exprCode, &_11$$11);
 	} else {
-		ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 505, &right);
+		ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 501, &right);
 		zephir_check_call_status();
 		zephir_concat_self(&exprCode, &_12$$12);
 	}
@@ -158452,7 +158465,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compile)
 						object_init_ex(&_17$$35, phalcon_mvc_view_engine_volt_exception_ce);
 						ZEPHIR_INIT_VAR(&_18$$35);
 						ZEPHIR_CONCAT_SVS(&_18$$35, "Extends compilation file ", &compiledTemplatePath, " could not be opened");
-						ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 506, &_18$$35);
+						ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 502, &_18$$35);
 						zephir_check_call_status();
 						zephir_throw_exception_debug(&_17$$35, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 478);
 						ZEPHIR_MM_RESTORE();
@@ -158517,7 +158530,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape)
 	} else {
 		ZVAL_BOOL(&_1, 0);
 	}
-	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &_0, &_1);
+	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 503, &_0, &_1);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &oldAutoescape);
 	RETURN_CCTOR(&compilation);
@@ -158592,13 +158605,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase)
 		object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$4);
 		ZVAL_STRING(&_1$$4, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 506, &_1$$4, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 502, &_1$$4, &statement);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 568);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php case ", &_2, ": ?>");
 	RETURN_MM();
@@ -158633,7 +158646,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo)
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 592);
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php ", &_0, "; ?>");
 	RETURN_MM();
@@ -158678,21 +158691,21 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 616);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 624);
 	if (ZEPHIR_IS_LONG(&_2, 350)) {
-		ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 508, &expr);
+		ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 504, &expr);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_TRUE_IDENTICAL(&_3$$4)) {
 			ZVAL_BOOL(&_4$$5, 1);
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr, &_4$$5);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 501, &expr, &_4$$5);
 			zephir_check_call_status();
 		}
 		zephir_array_fetch_string(&name, &expr, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 629);
@@ -158745,13 +158758,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 666);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php } elseif (", &_2, ") { ?>");
 	RETURN_MM();
@@ -158824,7 +158837,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile)
 		object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$4);
 		ZEPHIR_CONCAT_SVS(&_1$$4, "Template file ", &path, " does not exist");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 506, &_1$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 502, &_1$$4);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 706);
 		ZEPHIR_MM_RESTORE();
@@ -158837,7 +158850,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile)
 		object_init_ex(&_2$$5, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_3$$5);
 		ZEPHIR_CONCAT_SVS(&_3$$5, "Template file ", &path, " could not be opened");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 506, &_3$$5);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 502, &_3$$5);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 718);
 		ZEPHIR_MM_RESTORE();
@@ -158953,15 +158966,15 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 	ZEPHIR_INIT_VAR(&prefixLevel);
 	ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level);
 	ZEPHIR_OBS_VAR(&expr);
-	zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 784);
-	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr);
+	zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 782);
+	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&blockStatements);
-	zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 791);
+	zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 788);
 	ZEPHIR_INIT_NVAR(&forElse);
 	ZVAL_BOOL(&forElse, 0);
 	if (Z_TYPE_P(&blockStatements) == IS_ARRAY) {
-		zephir_is_iterable(&blockStatements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 812);
+		zephir_is_iterable(&blockStatements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 808);
 		if (Z_TYPE_P(&blockStatements) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&blockStatements), _0$$4)
 			{
@@ -159014,7 +159027,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 	} else {
 		ZVAL_BOOL(&_4, 0);
 	}
-	ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 507, &blockStatements, &_4);
+	ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 503, &blockStatements, &_4);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&loopContext);
 	zephir_read_property(&loopContext, this_ptr, ZEND_STRL("loopPointers"), PH_NOISY_CC);
@@ -159052,7 +159065,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 		ZEPHIR_CPY_WRT(&iterator, &exprCode);
 	}
 	ZEPHIR_OBS_VAR(&variable);
-	zephir_array_fetch_string(&variable, &statement, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 843);
+	zephir_array_fetch_string(&variable, &statement, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 838);
 	ZEPHIR_OBS_VAR(&key);
 	if (zephir_array_isset_string_fetch(&key, &statement, SL("key"), 0)) {
 		ZEPHIR_INIT_VAR(&_14$$13);
@@ -159065,7 +159078,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 	}
 	ZEPHIR_OBS_VAR(&ifExpr);
 	if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) {
-		ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 505, &ifExpr);
+		ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 501, &ifExpr);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_17$$15);
 		ZEPHIR_CONCAT_SVS(&_17$$15, "if (", &_16$$15, ") { ?>");
@@ -159193,21 +159206,21 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 946);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 941);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 952);
+	zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 947);
 	if (extendsMode) {
 		ZVAL_BOOL(&_5, 1);
 	} else {
 		ZVAL_BOOL(&_5, 0);
 	}
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 507, &_4, &_5);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 503, &_4, &_5);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_6);
 	ZEPHIR_CONCAT_SVSV(&_6, "<?php if (", &_2, ") { ?>", &_3);
@@ -159219,7 +159232,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf)
 		} else {
 			ZVAL_BOOL(&_8$$4, 0);
 		}
-		ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 507, &blockStatements, &_8$$4);
+		ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 503, &blockStatements, &_8$$4);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_9$$4);
 		ZEPHIR_CONCAT_SV(&_9$$4, "<?php } else { ?>", &_7$$4);
@@ -159263,14 +159276,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude)
 
 	ZEPHIR_OBS_VAR(&pathExpr);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&pathExpr, &statement, SL("path"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 986);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 981);
 		return;
 	}
-	zephir_array_fetch_string(&_0, &pathExpr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 993);
+	zephir_array_fetch_string(&_0, &pathExpr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 988);
 	if (ZEPHIR_IS_LONG(&_0, 260)) {
 		if (!(zephir_array_isset_string(&statement, SL("params")))) {
 			ZEPHIR_OBS_VAR(&path);
-			zephir_array_fetch_string(&path, &pathExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1002);
+			zephir_array_fetch_string(&path, &pathExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 997);
 			ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", NULL, 0, &path);
 			zephir_check_call_status();
 			ZEPHIR_INIT_VAR(&subCompiler);
@@ -159289,14 +159302,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude)
 			RETURN_CCTOR(&compilation);
 		}
 	}
-	ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 505, &pathExpr);
+	ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 501, &pathExpr);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&params);
 	if (!(zephir_array_isset_string_fetch(&params, &statement, SL("params"), 0))) {
 		ZEPHIR_CONCAT_SVS(return_value, "<?php $this->partial(", &path, "); ?>");
 		RETURN_MM();
 	}
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 505, &params);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 501, &params);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVSVS(return_value, "<?php $this->partial(", &path, ", ", &_3, "); ?>");
 	RETURN_MM();
@@ -159367,7 +159380,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 
 	ZEPHIR_OBS_VAR(&name);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&name, &statement, SL("name"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1061);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1056);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("macros"), PH_NOISY_CC | PH_READONLY);
@@ -159376,9 +159389,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 		object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_2$$4);
 		ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined");
-		ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 506, &_2$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 502, &_2$$4);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1068);
+		zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1063);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -159397,7 +159410,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 		ZEPHIR_INIT_VAR(&_5$$6);
 		ZEPHIR_CONCAT_VS(&_5$$6, &macroName, " = function($__p = null) { ");
 		zephir_concat_self(&code, &_5$$6);
-		zephir_is_iterable(&parameters, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1107);
+		zephir_is_iterable(&parameters, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1100);
 		if (Z_TYPE_P(&parameters) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&parameters), _8$$6, _9$$6, _6$$6)
 			{
@@ -159410,7 +159423,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 				ZEPHIR_INIT_NVAR(&parameter);
 				ZVAL_COPY(&parameter, _6$$6);
 				ZEPHIR_OBS_NVAR(&variableName);
-				zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1089);
+				zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1082);
 				ZEPHIR_INIT_NVAR(&_10$$7);
 				ZEPHIR_CONCAT_SVS(&_10$$7, "if (isset($__p[", &position, "])) { ");
 				zephir_concat_self(&code, &_10$$7);
@@ -159427,7 +159440,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 				zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1);
 				ZEPHIR_OBS_NVAR(&defaultValue);
 				if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, &parameter, SL("default"), 0))) {
-					ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 505, &defaultValue);
+					ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 501, &defaultValue);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_16$$8);
 					ZEPHIR_CONCAT_SVSVS(&_16$$8, "$", &variableName, " = ", &_14$$8, ";");
@@ -159453,7 +159466,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 				ZEPHIR_CALL_METHOD(&parameter, &parameters, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&variableName);
-					zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1089);
+					zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1082);
 					ZEPHIR_INIT_NVAR(&_18$$10);
 					ZEPHIR_CONCAT_SVS(&_18$$10, "if (isset($__p[", &position, "])) { ");
 					zephir_concat_self(&code, &_18$$10);
@@ -159470,7 +159483,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 					zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1);
 					ZEPHIR_OBS_NVAR(&defaultValue);
 					if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, &parameter, SL("default"), 0))) {
-						ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 505, &defaultValue);
+						ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 501, &defaultValue);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_23$$11);
 						ZEPHIR_CONCAT_SVSVS(&_23$$11, "$", &variableName, " = ", &_22$$11, ";");
@@ -159496,7 +159509,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 		} else {
 			ZVAL_BOOL(&_26$$13, 0);
 		}
-		ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 507, &blockStatements, &_26$$13);
+		ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 503, &blockStatements, &_26$$13);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_27$$13);
 		ZEPHIR_CONCAT_VS(&_27$$13, &_25$$13, "<?php }; ");
@@ -159536,10 +159549,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn)
 
 	ZEPHIR_OBS_VAR(&expr);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&expr, &statement, SL("expr"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1144);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1137);
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php return ", &_0, "; ?>");
 	RETURN_MM();
@@ -159593,24 +159606,24 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet)
 
 	ZEPHIR_OBS_VAR(&assignments);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&assignments, &statement, SL("assignments"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1170);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1163);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&compilation);
 	ZVAL_STRING(&compilation, "<?php");
-	zephir_is_iterable(&assignments, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1219);
+	zephir_is_iterable(&assignments, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1212);
 	if (Z_TYPE_P(&assignments) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&assignments), _0)
 		{
 			ZEPHIR_INIT_NVAR(&assignment);
 			ZVAL_COPY(&assignment, _0);
-			zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_2$$4);
+			zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1174);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 501, &_2$$4);
 			zephir_check_call_status();
-			zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1188);
-			ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_4$$4);
+			zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
+			ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 501, &_4$$4);
 			zephir_check_call_status();
-			zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1194);
+			zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1187);
 			do {
 				if (ZEPHIR_IS_LONG(&_5$$4, 281)) {
 					ZEPHIR_INIT_NVAR(&_6$$5);
@@ -159654,13 +159667,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet)
 			}
 			ZEPHIR_CALL_METHOD(&assignment, &assignments, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
-				ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_11$$10);
+				zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1174);
+				ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 501, &_11$$10);
 				zephir_check_call_status();
-				zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1188);
-				ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_12$$10);
+				zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
+				ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 501, &_12$$10);
 				zephir_check_call_status();
-				zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1194);
+				zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1187);
 				do {
 					if (ZEPHIR_IS_LONG(&_13$$10, 281)) {
 						ZEPHIR_INIT_NVAR(&_14$$11);
@@ -159802,13 +159815,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1260);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1253);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&compilation);
 	ZEPHIR_CONCAT_SVS(&compilation, "<?php switch (", &_2, "): ?>");
@@ -159819,7 +159832,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch)
 		} else {
 			ZVAL_BOOL(&_3$$4, 0);
 		}
-		ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 507, &caseClauses, &_3$$4);
+		ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 503, &caseClauses, &_3$$4);
 		zephir_check_call_status();
 		if (zephir_fast_strlen_ev(&lines) != 0) {
 			ZEPHIR_INIT_VAR(&_4$$5);
@@ -159924,7 +159937,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			zephir_array_fast_append(&_1$$4, &expr);
 			ZEPHIR_INIT_NVAR(&_2$$4);
 			ZVAL_STRING(&_2$$4, "resolveExpression");
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 509, &_2$$4, &_1$$4);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 505, &_2$$4, &_1$$4);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&exprCode) == IS_STRING) {
 				break;
@@ -159934,27 +159947,27 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 		if (!(zephir_array_isset_string_fetch(&type, &expr, SL("type"), 0))) {
 			ZEPHIR_INIT_NVAR(&items);
 			array_init(&items);
-			zephir_is_iterable(&expr, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1359);
+			zephir_is_iterable(&expr, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1352);
 			if (Z_TYPE_P(&expr) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _4$$6)
 				{
 					ZEPHIR_INIT_NVAR(&singleExpr);
 					ZVAL_COPY(&singleExpr, _4$$6);
-					zephir_array_fetch_string(&_6$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
+					zephir_array_fetch_string(&_6$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1341);
 					if (doubleQuotes) {
 						ZVAL_BOOL(&_7$$7, 1);
 					} else {
 						ZVAL_BOOL(&_7$$7, 0);
 					}
-					ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_6$$7, &_7$$7);
+					ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 501, &_6$$7, &_7$$7);
 					zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&name);
 					if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) {
 						ZEPHIR_INIT_NVAR(&_9$$8);
 						ZEPHIR_CONCAT_SVSV(&_9$$8, "'", &name, "' => ", &singleExprCode);
-						zephir_array_append(&items, &_9$$8, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1353);
+						zephir_array_append(&items, &_9$$8, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1346);
 					} else {
-						zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1355);
+						zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
 					}
 				} ZEND_HASH_FOREACH_END();
 			} else {
@@ -159968,21 +159981,21 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					}
 					ZEPHIR_CALL_METHOD(&singleExpr, &expr, "current", NULL, 0);
 					zephir_check_call_status();
-						zephir_array_fetch_string(&_10$$10, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
+						zephir_array_fetch_string(&_10$$10, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1341);
 						if (doubleQuotes) {
 							ZVAL_BOOL(&_11$$10, 1);
 						} else {
 							ZVAL_BOOL(&_11$$10, 0);
 						}
-						ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_10$$10, &_11$$10);
+						ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 501, &_10$$10, &_11$$10);
 						zephir_check_call_status();
 						ZEPHIR_OBS_NVAR(&name);
 						if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) {
 							ZEPHIR_INIT_NVAR(&_12$$11);
 							ZEPHIR_CONCAT_SVSV(&_12$$11, "'", &name, "' => ", &singleExprCode);
-							zephir_array_append(&items, &_12$$11, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1353);
+							zephir_array_append(&items, &_12$$11, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1346);
 						} else {
-							zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1355);
+							zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
 						}
 					ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0);
 					zephir_check_call_status();
@@ -160005,18 +160018,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			} else {
 				ZVAL_BOOL(&_14$$14, 0);
 			}
-			ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 505, &left, &_14$$14);
+			ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 501, &left, &_14$$14);
 			zephir_check_call_status();
 		}
 		if (ZEPHIR_IS_LONG(&type, 311)) {
-			zephir_array_fetch_string(&_15$$15, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1385);
+			zephir_array_fetch_string(&_15$$15, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1378);
 			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvetest", &_16, 0, &_15$$15, &leftCode);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 124)) {
-			zephir_array_fetch_string(&_17$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1397);
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 510, &_17$$16, &leftCode);
+			zephir_array_fetch_string(&_17$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1390);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 506, &_17$$16, &leftCode);
 			zephir_check_call_status();
 			break;
 		}
@@ -160027,7 +160040,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			} else {
 				ZVAL_BOOL(&_19$$17, 0);
 			}
-			ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 505, &right, &_19$$17);
+			ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 501, &right, &_19$$17);
 			zephir_check_call_status();
 		}
 		ZEPHIR_INIT_NVAR(&exprCode);
@@ -160099,19 +160112,19 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			}
 			if (ZEPHIR_IS_LONG(&type, 258)) {
 				ZEPHIR_OBS_NVAR(&exprCode);
-				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1468);
+				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1461);
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 259)) {
 				ZEPHIR_OBS_NVAR(&exprCode);
-				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1472);
+				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1465);
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 260)) {
 				ZEPHIR_INIT_NVAR(&exprCode);
 				if (EXPECTED(doubleQuotes == 0)) {
 					ZEPHIR_INIT_NVAR(&_20$$35);
-					zephir_array_fetch_string(&_21$$35, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1477);
+					zephir_array_fetch_string(&_21$$35, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1470);
 					ZEPHIR_INIT_NVAR(&_22$$35);
 					ZVAL_STRING(&_22$$35, "'");
 					ZEPHIR_INIT_NVAR(&_23$$35);
@@ -160119,7 +160132,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					zephir_fast_str_replace(&_20$$35, &_22$$35, &_23$$35, &_21$$35);
 					ZEPHIR_CONCAT_SVS(&exprCode, "'", &_20$$35, "'");
 				} else {
-					zephir_array_fetch_string(&_24$$36, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1479);
+					zephir_array_fetch_string(&_24$$36, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1472);
 					ZEPHIR_CONCAT_SVS(&exprCode, "\"", &_24$$36, "\"");
 				}
 				break;
@@ -160140,7 +160153,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 265)) {
-				zephir_array_fetch_string(&_25$$40, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1496);
+				zephir_array_fetch_string(&_25$$40, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1489);
 				ZEPHIR_INIT_NVAR(&exprCode);
 				ZEPHIR_CONCAT_SV(&exprCode, "$", &_25$$40);
 				break;
@@ -160218,7 +160231,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					} else {
 						ZVAL_BOOL(&_28$$54, 0);
 					}
-					ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 505, &start, &_28$$54);
+					ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 501, &start, &_28$$54);
 					zephir_check_call_status();
 				} else {
 					ZEPHIR_INIT_NVAR(&startCode);
@@ -160231,7 +160244,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					} else {
 						ZVAL_BOOL(&_29$$56, 0);
 					}
-					ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 505, &end, &_29$$56);
+					ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 501, &end, &_29$$56);
 					zephir_check_call_status();
 				} else {
 					ZEPHIR_INIT_NVAR(&endCode);
@@ -160322,13 +160335,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 366)) {
-				zephir_array_fetch_string(&_31$$74, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1635);
+				zephir_array_fetch_string(&_31$$74, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1628);
 				if (doubleQuotes) {
 					ZVAL_BOOL(&_32$$74, 1);
 				} else {
 					ZVAL_BOOL(&_32$$74, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 505, &_31$$74, &_32$$74);
+				ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 501, &_31$$74, &_32$$74);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&exprCode);
 				ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_30$$74, " ? ", &leftCode, " : ", &rightCode, ")");
@@ -160346,18 +160359,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			}
 			if (ZEPHIR_IS_LONG(&type, 364)) {
 				ZEPHIR_OBS_NVAR(&exprCode);
-				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1647);
+				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1640);
 				break;
 			}
 			ZEPHIR_INIT_NVAR(&_33$$78);
 			object_init_ex(&_33$$78, phalcon_mvc_view_engine_volt_exception_ce);
-			zephir_array_fetch_string(&_34$$78, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1652);
-			zephir_array_fetch_string(&_35$$78, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1653);
+			zephir_array_fetch_string(&_34$$78, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1645);
+			zephir_array_fetch_string(&_35$$78, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646);
 			ZEPHIR_INIT_NVAR(&_36$$78);
 			ZEPHIR_CONCAT_SVSVSV(&_36$$78, "Unknown expression ", &type, " in ", &_34$$78, " on line ", &_35$$78);
-			ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 506, &_36$$78);
+			ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 502, &_36$$78);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_33$$78, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1653);
+			zephir_throw_exception_debug(&_33$$78, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646);
 			ZEPHIR_MM_RESTORE();
 			return;
 		} while(0);
@@ -160419,7 +160432,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, fireExtensionEvent)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extensions, &_0);
-	zephir_is_iterable(&extensions, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1701);
+	zephir_is_iterable(&extensions, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1694);
 	if (Z_TYPE_P(&extensions) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&extensions), _1)
 		{
@@ -160565,9 +160578,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 	ZEPHIR_INIT_VAR(&funcArguments);
 	ZVAL_NULL(&funcArguments);
 	ZEPHIR_OBS_VAR(&nameExpr);
-	zephir_array_fetch_string(&nameExpr, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1720);
+	zephir_array_fetch_string(&nameExpr, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1713);
 	ZEPHIR_OBS_VAR(&nameType);
-	zephir_array_fetch_string(&nameType, &nameExpr, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1721);
+	zephir_array_fetch_string(&nameType, &nameExpr, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1714);
 	ZEPHIR_OBS_NVAR(&funcArguments);
 	if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) {
 		if (doubleQuotes) {
@@ -160575,7 +160588,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 		} else {
 			ZVAL_BOOL(&_0$$3, 0);
 		}
-		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_0$$3);
+		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 501, &funcArguments, &_0$$3);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_INIT_NVAR(&arguments);
@@ -160583,7 +160596,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 	}
 	if (ZEPHIR_IS_LONG(&nameType, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &nameExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1738);
+		zephir_array_fetch_string(&name, &nameExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1731);
 		zephir_read_property(&_1$$5, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&extensions, &_1$$5);
 		if (Z_TYPE_P(&extensions) == IS_ARRAY) {
@@ -160594,7 +160607,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 			zephir_array_fast_append(&_2$$6, &funcArguments);
 			ZEPHIR_INIT_VAR(&_3$$6);
 			ZVAL_STRING(&_3$$6, "compileFunction");
-			ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_3$$6, &_2$$6);
+			ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 505, &_3$$6, &_2$$6);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&code) == IS_STRING) {
 				RETURN_CCTOR(&code);
@@ -160622,13 +160635,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 				}
 				ZEPHIR_INIT_VAR(&_5$$9);
 				object_init_ex(&_5$$9, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_6$$9, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1788);
-				zephir_array_fetch_string(&_7$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1789);
+				zephir_array_fetch_string(&_6$$9, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1781);
+				zephir_array_fetch_string(&_7$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782);
 				ZEPHIR_INIT_VAR(&_8$$9);
 				ZEPHIR_CONCAT_SVSVSV(&_8$$9, "Invalid definition for user function '", &name, "' in ", &_6$$9, " on line ", &_7$$9);
-				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 506, &_8$$9);
+				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 502, &_8$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1789);
+				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -160655,7 +160668,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 					zephir_read_property(&_12$$17, this_ptr, ZEND_STRL("exprLevel"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&exprLevel, &_12$$17);
 					if (Z_TYPE_P(&block) == IS_ARRAY) {
-						ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 511, &block);
+						ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 507, &block);
 						zephir_check_call_status();
 						if (ZEPHIR_IS_LONG(&exprLevel, 1)) {
 							ZEPHIR_CPY_WRT(&escapedCode, &code);
@@ -160740,7 +160753,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 				ZEPHIR_OBS_NVAR(&funcArguments);
 				if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) {
 					ZVAL_BOOL(&_22$$30, 1);
-					ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_22$$30);
+					ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 501, &funcArguments, &_22$$30);
 					zephir_check_call_status();
 				} else {
 					ZEPHIR_INIT_NVAR(&arguments);
@@ -160791,7 +160804,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 	} else {
 		ZVAL_BOOL(&_24, 0);
 	}
-	ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 505, &nameExpr, &_24);
+	ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 501, &nameExpr, &_24);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_VSVS(return_value, &_23, "(", &arguments, ")");
 	RETURN_MM();
@@ -160945,7 +160958,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getUniquePrefix)
 	ZEPHIR_OBS_VAR(&_8);
 	zephir_read_property(&_8, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC);
 	if (UNEXPECTED(Z_TYPE_P(&_8) != IS_STRING)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "The unique compilation prefix is invalid", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2083);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "The unique compilation prefix is invalid", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2076);
 		return;
 	}
 	RETURN_MM_MEMBER(getThis(), "prefix");
@@ -161026,64 +161039,70 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest)
 
 
 	ZEPHIR_OBS_VAR(&type);
-	zephir_array_fetch_string(&type, &test, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2117);
+	zephir_array_fetch_string(&type, &test, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2110);
 	if (ZEPHIR_IS_LONG(&type, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &test, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2123);
-		if (ZEPHIR_IS_STRING(&name, "empty")) {
-			ZEPHIR_CONCAT_SVS(return_value, "empty(", &left, ")");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "even")) {
-			ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) == 0)");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "odd")) {
-			ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) != 0)");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "numeric")) {
-			ZEPHIR_CONCAT_SVS(return_value, "is_numeric(", &left, ")");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "scalar")) {
-			ZEPHIR_CONCAT_SVS(return_value, "is_scalar(", &left, ")");
-			RETURN_MM();
-		}
-		if (ZEPHIR_IS_STRING(&name, "iterable")) {
-			ZEPHIR_CONCAT_SVSVS(return_value, "(is_array(", &left, ") || (", &left, ") instanceof Traversable)");
-			RETURN_MM();
-		}
-	}
-	if (ZEPHIR_IS_LONG(&type, 350)) {
-		ZEPHIR_OBS_VAR(&testName);
-		zephir_array_fetch_string(&testName, &test, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2173);
-		ZEPHIR_OBS_NVAR(&name);
-		if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) {
-			if (ZEPHIR_IS_STRING(&name, "divisibleby")) {
-				zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2177);
-				ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 505, &_1$$12);
-				zephir_check_call_status();
-				ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)");
+		zephir_array_fetch_string(&name, &test, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2116);
+		do {
+			if (ZEPHIR_IS_STRING(&name, "empty")) {
+				ZEPHIR_CONCAT_SVS(return_value, "empty(", &left, ")");
 				RETURN_MM();
 			}
-			if (ZEPHIR_IS_STRING(&name, "sameas")) {
-				zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2184);
-				ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 505, &_3$$13);
-				zephir_check_call_status();
-				ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")");
+			if (ZEPHIR_IS_STRING(&name, "even")) {
+				ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) == 0)");
 				RETURN_MM();
 			}
-			if (ZEPHIR_IS_STRING(&name, "type")) {
-				zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2191);
-				ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 505, &_5$$14);
-				zephir_check_call_status();
-				ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")");
+			if (ZEPHIR_IS_STRING(&name, "odd")) {
+				ZEPHIR_CONCAT_SVS(return_value, "(((", &left, ") % 2) != 0)");
 				RETURN_MM();
 			}
+			if (ZEPHIR_IS_STRING(&name, "numeric")) {
+				ZEPHIR_CONCAT_SVS(return_value, "is_numeric(", &left, ")");
+				RETURN_MM();
+			}
+			if (ZEPHIR_IS_STRING(&name, "scalar")) {
+				ZEPHIR_CONCAT_SVS(return_value, "is_scalar(", &left, ")");
+				RETURN_MM();
+			}
+			if (ZEPHIR_IS_STRING(&name, "iterable")) {
+				ZEPHIR_CONCAT_SVSVS(return_value, "(is_array(", &left, ") || (", &left, ") instanceof Traversable)");
+				RETURN_MM();
+			}
+		} while(0);
+
+	}
+	if (ZEPHIR_IS_LONG(&type, 350)) {
+		ZEPHIR_OBS_VAR(&testName);
+		zephir_array_fetch_string(&testName, &test, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2139);
+		ZEPHIR_OBS_NVAR(&name);
+		if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) {
+			do {
+				if (ZEPHIR_IS_STRING(&name, "divisibleby")) {
+					zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2144);
+					ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 501, &_1$$12);
+					zephir_check_call_status();
+					ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)");
+					RETURN_MM();
+				}
+				if (ZEPHIR_IS_STRING(&name, "sameas")) {
+					zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2146);
+					ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 501, &_3$$13);
+					zephir_check_call_status();
+					ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")");
+					RETURN_MM();
+				}
+				if (ZEPHIR_IS_STRING(&name, "type")) {
+					zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2148);
+					ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 501, &_5$$14);
+					zephir_check_call_status();
+					ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")");
+					RETURN_MM();
+				}
+			} while(0);
+
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 505, &test);
+	ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 501, &test);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6);
 	RETURN_MM();
@@ -161267,7 +161286,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 		ZEPHIR_OBS_VAR(&autoescape);
 		if (zephir_array_isset_string_fetch(&autoescape, &options, SL("autoescape"), 0)) {
 			if (UNEXPECTED(((Z_TYPE_P(&autoescape) == IS_TRUE || Z_TYPE_P(&autoescape) == IS_FALSE) != 1))) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "'autoescape' must be bool", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2260);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "'autoescape' must be bool", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2217);
 				return;
 			}
 			zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &autoescape);
@@ -161277,7 +161296,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 	ZEPHIR_LAST_CALL_STATUS = phvolt_parse_view(&intermediate, &viewCode, &currentPath);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&intermediate) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Invalid intermediate representation", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2273);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Invalid intermediate representation", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2230);
 		return;
 	}
 	if (extendsMode) {
@@ -161285,7 +161304,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 	} else {
 		ZVAL_BOOL(&_0, 0);
 	}
-	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &intermediate, &_0);
+	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 503, &intermediate, &_0);
 	zephir_check_call_status();
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("extended"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extended, &_1);
@@ -161300,7 +161319,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 		ZEPHIR_CPY_WRT(&blocks, &_2$$7);
 		zephir_read_property(&_2$$7, this_ptr, ZEND_STRL("extendedBlocks"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&extendedBlocks, &_2$$7);
-		zephir_is_iterable(&extendedBlocks, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2345);
+		zephir_is_iterable(&extendedBlocks, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2302);
 		if (Z_TYPE_P(&extendedBlocks) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&extendedBlocks), _5$$7, _6$$7, _3$$7)
 			{
@@ -161315,17 +161334,17 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 				if (Z_TYPE_P(&name) == IS_STRING) {
 					if (zephir_array_isset(&blocks, &name)) {
 						ZEPHIR_OBS_NVAR(&localBlock);
-						zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2305);
+						zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2262);
 						zephir_update_property_zval(this_ptr, ZEND_STRL("currentBlock"), &name);
 						if (Z_TYPE_P(&localBlock) == IS_NULL) {
 							ZEPHIR_INIT_NVAR(&localBlock);
 							array_init(&localBlock);
 						}
-						ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &localBlock);
+						ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &localBlock);
 						zephir_check_call_status();
 					} else {
 						if (Z_TYPE_P(&block) == IS_ARRAY) {
-							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block);
+							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &block);
 							zephir_check_call_status();
 						} else {
 							ZEPHIR_CPY_WRT(&blockCompilation, &block);
@@ -161338,7 +161357,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 					}
 				} else {
 					if (extendsMode) {
-						zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2338);
+						zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2295);
 					} else {
 						zephir_concat_self(&finalCompilation, &block);
 					}
@@ -161360,17 +161379,17 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 					if (Z_TYPE_P(&name) == IS_STRING) {
 						if (zephir_array_isset(&blocks, &name)) {
 							ZEPHIR_OBS_NVAR(&localBlock);
-							zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2305);
+							zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2262);
 							zephir_update_property_zval(this_ptr, ZEND_STRL("currentBlock"), &name);
 							if (Z_TYPE_P(&localBlock) == IS_NULL) {
 								ZEPHIR_INIT_NVAR(&localBlock);
 								array_init(&localBlock);
 							}
-							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &localBlock);
+							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &localBlock);
 							zephir_check_call_status();
 						} else {
 							if (Z_TYPE_P(&block) == IS_ARRAY) {
-								ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block);
+								ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &block);
 								zephir_check_call_status();
 							} else {
 								ZEPHIR_CPY_WRT(&blockCompilation, &block);
@@ -161383,7 +161402,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 						}
 					} else {
 						if (extendsMode) {
-							zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2338);
+							zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2295);
 						} else {
 							zephir_concat_self(&finalCompilation, &block);
 						}
@@ -161437,7 +161456,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath)
 		ZEPHIR_CALL_METHOD(&viewsDirs, &view, "getviewsdir", NULL, 0);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&viewsDirs) == IS_ARRAY) {
-			zephir_is_iterable(&viewsDirs, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2379);
+			zephir_is_iterable(&viewsDirs, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2336);
 			if (Z_TYPE_P(&viewsDirs) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&viewsDirs), _1$$4)
 				{
@@ -161484,11 +161503,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath)
 
 static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 {
-	zend_bool _14, _21, _22;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval left;
-	zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _23, _24, _25, _26, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _15$$29, _16$$29, _17$$29, _18$$29, _19$$29, _20$$29;
+	zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _20, _21, _22, _23, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _14$$24, _15$$24, _16$$24, _17$$24, _18$$24, _19$$24;
 	zval filter, _4$$7, _5$$7, _7$$9, _9$$14;
 	zval *this_ptr = getThis();
 
@@ -161509,10 +161527,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZVAL_UNDEF(&arguments);
 	ZVAL_UNDEF(&definition);
 	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_20);
+	ZVAL_UNDEF(&_21);
+	ZVAL_UNDEF(&_22);
 	ZVAL_UNDEF(&_23);
-	ZVAL_UNDEF(&_24);
-	ZVAL_UNDEF(&_25);
-	ZVAL_UNDEF(&_26);
 	ZVAL_UNDEF(&_0$$5);
 	ZVAL_UNDEF(&_1$$5);
 	ZVAL_UNDEF(&_2$$5);
@@ -161522,12 +161540,12 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZVAL_UNDEF(&_11$$11);
 	ZVAL_UNDEF(&_12$$11);
 	ZVAL_UNDEF(&_13$$11);
-	ZVAL_UNDEF(&_15$$29);
-	ZVAL_UNDEF(&_16$$29);
-	ZVAL_UNDEF(&_17$$29);
-	ZVAL_UNDEF(&_18$$29);
-	ZVAL_UNDEF(&_19$$29);
-	ZVAL_UNDEF(&_20$$29);
+	ZVAL_UNDEF(&_14$$24);
+	ZVAL_UNDEF(&_15$$24);
+	ZVAL_UNDEF(&_16$$24);
+	ZVAL_UNDEF(&_17$$24);
+	ZVAL_UNDEF(&_18$$24);
+	ZVAL_UNDEF(&_19$$24);
 	ZVAL_UNDEF(&left);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
@@ -161547,28 +161565,28 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZEPHIR_INIT_VAR(&code);
 	ZVAL_NULL(&code);
 	ZEPHIR_OBS_VAR(&type);
-	zephir_array_fetch_string(&type, &filter, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2397);
+	zephir_array_fetch_string(&type, &filter, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2354);
 	if (ZEPHIR_IS_LONG(&type, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &filter, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2403);
+		zephir_array_fetch_string(&name, &filter, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2360);
 	} else {
 		if (UNEXPECTED(!ZEPHIR_IS_LONG(&type, 350))) {
 			ZEPHIR_INIT_VAR(&_0$$5);
 			object_init_ex(&_0$$5, phalcon_mvc_view_engine_volt_exception_ce);
-			zephir_array_fetch_string(&_1$$5, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2410);
-			zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2411);
+			zephir_array_fetch_string(&_1$$5, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2367);
+			zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5);
-			ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 506, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 502, &_3$$5);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2411);
+			zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZEPHIR_OBS_VAR(&functionName);
-		zephir_array_fetch_string(&functionName, &filter, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2414);
+		zephir_array_fetch_string(&functionName, &filter, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2371);
 		ZEPHIR_OBS_NVAR(&name);
-		zephir_array_fetch_string(&name, &functionName, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2415);
+		zephir_array_fetch_string(&name, &functionName, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2372);
 	}
 	ZEPHIR_INIT_VAR(&funcArguments);
 	ZVAL_NULL(&funcArguments);
@@ -161578,9 +161596,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	if (zephir_array_isset_string_fetch(&funcArguments, &filter, SL("arguments"), 0)) {
 		if (!ZEPHIR_IS_STRING(&name, "default")) {
 			ZEPHIR_OBS_VAR(&file);
-			zephir_array_fetch_string(&file, &filter, SL("file"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2429);
+			zephir_array_fetch_string(&file, &filter, SL("file"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2386);
 			ZEPHIR_OBS_VAR(&line);
-			zephir_array_fetch_string(&line, &filter, SL("line"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2430);
+			zephir_array_fetch_string(&line, &filter, SL("line"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2387);
 			ZEPHIR_INIT_VAR(&_4$$7);
 			zephir_create_array(&_4$$7, 3, 0);
 			ZEPHIR_INIT_VAR(&_5$$7);
@@ -161597,7 +161615,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 			ZEPHIR_UNREF(&funcArguments);
 			zephir_check_call_status();
 		}
-		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments);
+		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 501, &funcArguments);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CPY_WRT(&arguments, &left);
@@ -161612,7 +161630,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 		zephir_array_fast_append(&_7$$9, &funcArguments);
 		ZEPHIR_INIT_VAR(&_8$$9);
 		ZVAL_STRING(&_8$$9, "compileFilter");
-		ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_8$$9, &_7$$9);
+		ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 505, &_8$$9, &_7$$9);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&code) == IS_STRING) {
 			RETURN_CCTOR(&code);
@@ -161639,147 +161657,138 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 		}
 		ZEPHIR_INIT_VAR(&_10$$11);
 		object_init_ex(&_10$$11, phalcon_mvc_view_engine_volt_exception_ce);
-		zephir_array_fetch_string(&_11$$11, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2504);
-		zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2505);
+		zephir_array_fetch_string(&_11$$11, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2461);
+		zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462);
 		ZEPHIR_INIT_VAR(&_13$$11);
 		ZEPHIR_CONCAT_SVSVSV(&_13$$11, "Invalid definition for user filter '", &name, "' in ", &_11$$11, " on line ", &_12$$11);
-		ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 506, &_13$$11);
+		ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 502, &_13$$11);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2505);
+		zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	if (ZEPHIR_IS_STRING(&name, "length")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->length(", &arguments, ")");
-		RETURN_MM();
-	}
-	_14 = ZEPHIR_IS_STRING(&name, "e");
-	if (!(_14)) {
-		_14 = ZEPHIR_IS_STRING(&name, "escape");
-	}
-	if (_14) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->html(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "escape_css")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->css(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "escape_js")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->js(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "escape_attr")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->attributes(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "trim")) {
-		ZEPHIR_CONCAT_SVS(return_value, "trim(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "left_trim")) {
-		ZEPHIR_CONCAT_SVS(return_value, "ltrim(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "right_trim")) {
-		ZEPHIR_CONCAT_SVS(return_value, "rtrim(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "striptags")) {
-		ZEPHIR_CONCAT_SVS(return_value, "strip_tags(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "url_encode")) {
-		ZEPHIR_CONCAT_SVS(return_value, "urlencode(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "slashes")) {
-		ZEPHIR_CONCAT_SVS(return_value, "addslashes(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "stripslashes")) {
-		ZEPHIR_CONCAT_SVS(return_value, "stripslashes(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "nl2br")) {
-		ZEPHIR_CONCAT_SVS(return_value, "nl2br(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "keys")) {
-		ZEPHIR_CONCAT_SVS(return_value, "array_keys(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "join")) {
-		zephir_array_fetch_long(&_15$$29, &funcArguments, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_16$$29, &_15$$29, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_17$$29, &_16$$29, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_long(&_18$$29, &funcArguments, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_19$$29, &_18$$29, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		zephir_array_fetch_string(&_20$$29, &_19$$29, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2611);
-		ZEPHIR_CONCAT_SVSVS(return_value, "join('", &_17$$29, "', ", &_20$$29, ")");
-		RETURN_MM();
-	}
-	_21 = ZEPHIR_IS_STRING(&name, "lower");
-	if (!(_21)) {
-		_21 = ZEPHIR_IS_STRING(&name, "lowercase");
-	}
-	if (_21) {
-		ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")");
-		RETURN_MM();
-	}
-	_22 = ZEPHIR_IS_STRING(&name, "upper");
-	if (!(_22)) {
-		_22 = ZEPHIR_IS_STRING(&name, "uppercase");
-	}
-	if (_22) {
-		ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "capitalize")) {
-		ZEPHIR_CONCAT_SVS(return_value, "ucwords(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "sort")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->sort(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "json_encode")) {
-		ZEPHIR_CONCAT_SVS(return_value, "json_encode(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "json_decode")) {
-		ZEPHIR_CONCAT_SVS(return_value, "json_decode(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "format")) {
-		ZEPHIR_CONCAT_SVS(return_value, "sprintf(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "abs")) {
-		ZEPHIR_CONCAT_SVS(return_value, "abs(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "slice")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->slice(", &arguments, ")");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "default")) {
-		ZEPHIR_CONCAT_SVSVSVS(return_value, "(empty(", &left, ") ? (", &arguments, ") : (", &left, "))");
-		RETURN_MM();
-	}
-	if (ZEPHIR_IS_STRING(&name, "convert_encoding")) {
-		ZEPHIR_CONCAT_SVS(return_value, "$this->convertEncoding(", &arguments, ")");
-		RETURN_MM();
-	}
+	do {
+		if (ZEPHIR_IS_STRING(&name, "abs")) {
+			ZEPHIR_CONCAT_SVS(return_value, "abs(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "capitalize")) {
+			ZEPHIR_CONCAT_SVS(return_value, "ucwords(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "convert_encoding")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->convertEncoding(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "default")) {
+			ZEPHIR_CONCAT_SVSVSVS(return_value, "(empty(", &left, ") ? (", &arguments, ") : (", &left, "))");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "e") || ZEPHIR_IS_STRING(&name, "escape")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->html(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "escape_attr")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->attributes(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "escape_css")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->css(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "escape_js")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->escaper->js(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "format")) {
+			ZEPHIR_CONCAT_SVS(return_value, "sprintf(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "join")) {
+			zephir_array_fetch_long(&_14$$24, &funcArguments, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2488);
+			zephir_array_fetch_string(&_15$$24, &_14$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2488);
+			zephir_array_fetch_string(&_16$$24, &_15$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			zephir_array_fetch_long(&_17$$24, &funcArguments, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			zephir_array_fetch_string(&_18$$24, &_17$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			zephir_array_fetch_string(&_19$$24, &_18$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			ZEPHIR_CONCAT_SVSVS(return_value, "join('", &_16$$24, "', ", &_19$$24, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "json_encode")) {
+			ZEPHIR_CONCAT_SVS(return_value, "json_encode(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "json_decode")) {
+			ZEPHIR_CONCAT_SVS(return_value, "json_decode(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "keys")) {
+			ZEPHIR_CONCAT_SVS(return_value, "array_keys(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "left_trim")) {
+			ZEPHIR_CONCAT_SVS(return_value, "ltrim(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "length")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->length(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "lower") || ZEPHIR_IS_STRING(&name, "lowercase")) {
+			ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "right_trim")) {
+			ZEPHIR_CONCAT_SVS(return_value, "rtrim(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "nl2br")) {
+			ZEPHIR_CONCAT_SVS(return_value, "nl2br(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "slashes")) {
+			ZEPHIR_CONCAT_SVS(return_value, "addslashes(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "slice")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->slice(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "sort")) {
+			ZEPHIR_CONCAT_SVS(return_value, "$this->sort(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "stripslashes")) {
+			ZEPHIR_CONCAT_SVS(return_value, "stripslashes(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "striptags")) {
+			ZEPHIR_CONCAT_SVS(return_value, "strip_tags(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "trim")) {
+			ZEPHIR_CONCAT_SVS(return_value, "trim(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "upper") || ZEPHIR_IS_STRING(&name, "uppercase")) {
+			ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")");
+			RETURN_MM();
+		}
+		if (ZEPHIR_IS_STRING(&name, "url_encode")) {
+			ZEPHIR_CONCAT_SVS(return_value, "urlencode(", &arguments, ")");
+			RETURN_MM();
+		}
+	} while(0);
+
+	ZEPHIR_INIT_VAR(&_20);
+	object_init_ex(&_20, phalcon_mvc_view_engine_volt_exception_ce);
+	zephir_array_fetch_string(&_21, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2528);
+	zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529);
 	ZEPHIR_INIT_VAR(&_23);
-	object_init_ex(&_23, phalcon_mvc_view_engine_volt_exception_ce);
-	zephir_array_fetch_string(&_24, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2698);
-	zephir_array_fetch_string(&_25, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2699);
-	ZEPHIR_INIT_VAR(&_26);
-	ZEPHIR_CONCAT_SVSVSV(&_26, "Unknown filter \"", &name, "\" in ", &_24, " on line ", &_25);
-	ZEPHIR_CALL_METHOD(NULL, &_23, "__construct", NULL, 506, &_26);
-	zephir_check_call_status();
-	zephir_throw_exception_debug(&_23, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2699);
+	ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22);
+	ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 502, &_23);
+	zephir_check_call_status();
+	zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -161928,26 +161937,26 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 	ZVAL_NULL(&compilation);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extensions, &_0);
-	zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2985);
+	zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2815);
 	if (Z_TYPE_P(&statements) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&statements), _2)
 		{
 			ZEPHIR_INIT_NVAR(&statement);
 			ZVAL_COPY(&statement, _2);
 			if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2739);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2569);
 				return;
 			}
 			if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) {
 				ZEPHIR_INIT_NVAR(&_4$$7);
 				object_init_ex(&_4$$7, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
-				zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
+				zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
+				zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
 				ZEPHIR_INIT_NVAR(&_7$$7);
 				ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7);
-				ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 506, &_7$$7, &statement);
+				ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 502, &_7$$7, &statement);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2749);
+				zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -161957,7 +161966,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				zephir_array_fast_append(&_9$$8, &statement);
 				ZEPHIR_INIT_NVAR(&_10$$8);
 				ZVAL_STRING(&_10$$8, "compileStatement");
-				ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 509, &_10$$8, &_9$$8);
+				ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 505, &_10$$8, &_9$$8);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&tempCompilation) == IS_STRING) {
 					zephir_concat_self(&compilation, &tempCompilation);
@@ -161965,10 +161974,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 			}
 			ZEPHIR_OBS_NVAR(&type);
-			zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2775);
+			zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2605);
 			do {
 				if (ZEPHIR_IS_LONG(&type, 357)) {
-					zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2783);
+					zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2613);
 					zephir_concat_self(&compilation, &_12$$10);
 					break;
 				}
@@ -162038,7 +162047,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				if (ZEPHIR_IS_LONG(&type, 307)) {
 					ZEPHIR_OBS_NVAR(&blockName);
-					zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2830);
+					zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2660);
 					ZEPHIR_OBS_NVAR(&blockStatements);
 					zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0);
 					zephir_read_property(&_32$$19, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY);
@@ -162049,7 +162058,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 							array_init(&blocks);
 						}
 						if (Z_TYPE_P(&compilation) != IS_NULL) {
-							zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2845);
+							zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2675);
 							ZEPHIR_INIT_NVAR(&compilation);
 							ZVAL_NULL(&compilation);
 						}
@@ -162062,7 +162071,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 							} else {
 								ZVAL_BOOL(&_34$$24, 0);
 							}
-							ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 507, &blockStatements, &_34$$24);
+							ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 503, &blockStatements, &_34$$24);
 							zephir_check_call_status();
 							zephir_concat_self(&compilation, &_33$$24);
 						}
@@ -162071,8 +162080,8 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				if (ZEPHIR_IS_LONG(&type, 310)) {
 					ZEPHIR_OBS_NVAR(&path);
-					zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2870);
-					zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2874);
+					zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2700);
+					zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2704);
 					ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_36$$25);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&extended);
@@ -162168,13 +162177,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				ZEPHIR_INIT_NVAR(&_56$$37);
 				object_init_ex(&_56$$37, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2976);
-				zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+				zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2806);
+				zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 				ZEPHIR_INIT_NVAR(&_59$$37);
 				ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37);
-				ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 506, &_59$$37);
+				ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 502, &_59$$37);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+				zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 				ZEPHIR_MM_RESTORE();
 				return;
 			} while(0);
@@ -162192,19 +162201,19 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 			ZEPHIR_CALL_METHOD(&statement, &statements, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2739);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2569);
 					return;
 				}
 				if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) {
 					ZEPHIR_INIT_NVAR(&_60$$40);
 					object_init_ex(&_60$$40, phalcon_mvc_view_engine_volt_exception_ce);
-					zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
-					zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2747);
+					zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
+					zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
 					ZEPHIR_INIT_NVAR(&_63$$40);
 					ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40);
-					ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 506, &_63$$40, &statement);
+					ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 502, &_63$$40, &statement);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2749);
+					zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -162214,7 +162223,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					zephir_array_fast_append(&_64$$41, &statement);
 					ZEPHIR_INIT_NVAR(&_65$$41);
 					ZVAL_STRING(&_65$$41, "compileStatement");
-					ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 509, &_65$$41, &_64$$41);
+					ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 505, &_65$$41, &_64$$41);
 					zephir_check_call_status();
 					if (Z_TYPE_P(&tempCompilation) == IS_STRING) {
 						zephir_concat_self(&compilation, &tempCompilation);
@@ -162222,10 +162231,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 				}
 				ZEPHIR_OBS_NVAR(&type);
-				zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2775);
+				zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2605);
 				do {
 					if (ZEPHIR_IS_LONG(&type, 357)) {
-						zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2783);
+						zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2613);
 						zephir_concat_self(&compilation, &_66$$43);
 						break;
 					}
@@ -162295,7 +162304,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					if (ZEPHIR_IS_LONG(&type, 307)) {
 						ZEPHIR_OBS_NVAR(&blockName);
-						zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2830);
+						zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2660);
 						ZEPHIR_OBS_NVAR(&blockStatements);
 						zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0);
 						zephir_read_property(&_79$$52, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY);
@@ -162306,7 +162315,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 								array_init(&blocks);
 							}
 							if (Z_TYPE_P(&compilation) != IS_NULL) {
-								zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2845);
+								zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2675);
 								ZEPHIR_INIT_NVAR(&compilation);
 								ZVAL_NULL(&compilation);
 							}
@@ -162319,7 +162328,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 								} else {
 									ZVAL_BOOL(&_81$$57, 0);
 								}
-								ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 507, &blockStatements, &_81$$57);
+								ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 503, &blockStatements, &_81$$57);
 								zephir_check_call_status();
 								zephir_concat_self(&compilation, &_80$$57);
 							}
@@ -162328,8 +162337,8 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					if (ZEPHIR_IS_LONG(&type, 310)) {
 						ZEPHIR_OBS_NVAR(&path);
-						zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2870);
-						zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2874);
+						zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2700);
+						zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2704);
 						ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_82$$58);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&extended);
@@ -162425,13 +162434,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					ZEPHIR_INIT_NVAR(&_94$$70);
 					object_init_ex(&_94$$70, phalcon_mvc_view_engine_volt_exception_ce);
-					zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2976);
-					zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+					zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2806);
+					zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 					ZEPHIR_INIT_NVAR(&_97$$70);
 					ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70);
-					ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 506, &_97$$70);
+					ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 502, &_97$$70);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2977);
+					zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 					ZEPHIR_MM_RESTORE();
 					return;
 				} while(0);
@@ -162483,7 +162492,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends)
 	}
 	isStatementList = 1;
 	if (!(zephir_array_isset_string(statements, SL("type")))) {
-		zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 3034);
+		zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2864);
 		if (Z_TYPE_P(statements) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(statements), _0$$4)
 			{
@@ -162516,7 +162525,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends)
 		ZEPHIR_INIT_NVAR(&statement);
 	}
 	if (isStatementList) {
-		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 507, statements);
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 503, statements);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -162559,9 +162568,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory)
 				RETURN_MM_BOOL((ZEPHIR_IS_STRING_IDENTICAL(&leftValue, "tag")));
 			} else {
 				ZEPHIR_OBS_VAR(&_0$$6);
-				zephir_array_fetch_string(&_0$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 3071);
+				zephir_array_fetch_string(&_0$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2901);
 				if (Z_TYPE_P(&_0$$6) == IS_ARRAY) {
-					ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 508, &left);
+					ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 504, &left);
 					zephir_check_call_status();
 					RETURN_MM();
 				}
@@ -172442,7 +172451,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle)
 				object_init_ex(&route, phalcon_mvc_router_route_ce);
 				ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 97, &prefix);
 				zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 488);
+				ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 484);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_7$$6);
 				ZVAL_STRING(&_7$$6, "$#");
@@ -172656,7 +172665,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle)
 					object_init_ex(&route, phalcon_mvc_router_route_ce);
 					ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 97, &prefix);
 					zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 488);
+					ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 484);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_29$$29);
 					ZVAL_STRING(&_29$$29, "$#");
@@ -174202,7 +174211,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Group, addRoute)
 	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 97, &_2, &mergedPaths, httpMethods);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("routes"), &route);
-	ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 489, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 485, this_ptr);
 	zephir_check_call_status();
 	RETURN_CCTOR(&route);
 }
@@ -174301,15 +174310,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Route)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Mvc_Router_Route, getId)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "id");
-}
-
 static PHP_METHOD(Phalcon_Mvc_Router_Route, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -174845,6 +174845,15 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getHostname)
 	RETURN_MEMBER(getThis(), "hostname");
 }
 
+static PHP_METHOD(Phalcon_Mvc_Router_Route, getId)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "id");
+}
+
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getMatch)
 {
 	zval *this_ptr = getThis();
@@ -174960,23 +174969,23 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths)
 			_0$$4 = zephir_fast_count_int(&parts);
 			if (_0$$4 == 3) {
 				ZEPHIR_OBS_NVAR(&moduleName);
-				zephir_array_fetch_long(&moduleName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 459);
+				zephir_array_fetch_long(&moduleName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 467);
 				ZEPHIR_OBS_NVAR(&controllerName);
-				zephir_array_fetch_long(&controllerName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 460);
+				zephir_array_fetch_long(&controllerName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 468);
 				ZEPHIR_OBS_NVAR(&actionName);
-				zephir_array_fetch_long(&actionName, &parts, 2, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 461);
+				zephir_array_fetch_long(&actionName, &parts, 2, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 469);
 				break;
 			}
 			if (_0$$4 == 2) {
 				ZEPHIR_OBS_NVAR(&controllerName);
-				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 465);
+				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 473);
 				ZEPHIR_OBS_NVAR(&actionName);
-				zephir_array_fetch_long(&actionName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 466);
+				zephir_array_fetch_long(&actionName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 474);
 				break;
 			}
 			if (_0$$4 == 1) {
 				ZEPHIR_OBS_NVAR(&controllerName);
-				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 470);
+				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 478);
 				break;
 			}
 		} while(0);
@@ -174987,7 +174996,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths)
 			zephir_array_update_string(&routePaths, SL("module"), &moduleName, PH_COPY | PH_SEPARATE);
 		}
 		if (Z_TYPE_P(&controllerName) != IS_NULL) {
-			if (zephir_memnstr_str(&controllerName, SL("\\"), "phalcon/Mvc/Router/Route.zep", 484)) {
+			if (zephir_memnstr_str(&controllerName, SL("\\"), "phalcon/Mvc/Router/Route.zep", 492)) {
 				ZEPHIR_INIT_VAR(&realClassName);
 				zephir_get_class_ns(&realClassName, &controllerName, 0);
 				ZEPHIR_INIT_VAR(&namespaceName);
@@ -175007,7 +175016,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths)
 		ZEPHIR_CPY_WRT(&routePaths, paths);
 	}
 	if (UNEXPECTED(Z_TYPE_P(&routePaths) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The route contains invalid paths", "phalcon/Mvc/Router/Route.zep", 511);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The route contains invalid paths", "phalcon/Mvc/Router/Route.zep", 519);
 		return;
 	}
 	RETURN_CCTOR(&routePaths);
@@ -175081,13 +175090,13 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, reConfigure)
 	ZEPHIR_CALL_SELF(&routePaths, "getroutepaths", NULL, 0, paths);
 	zephir_check_call_status();
 	if (!(zephir_start_with_str(&pattern, SL("#")))) {
-		if (zephir_memnstr_str(&pattern, SL("{"), "phalcon/Mvc/Router/Route.zep", 551)) {
+		if (zephir_memnstr_str(&pattern, SL("{"), "phalcon/Mvc/Router/Route.zep", 559)) {
 			ZEPHIR_CALL_METHOD(&extracted, this_ptr, "extractnamedparams", NULL, 0, &pattern);
 			zephir_check_call_status();
 			ZEPHIR_OBS_VAR(&pcrePattern);
-			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 556);
+			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 564);
 			ZEPHIR_INIT_VAR(&_0$$4);
-			zephir_array_fetch_long(&_1$$4, &extracted, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router/Route.zep", 557);
+			zephir_array_fetch_long(&_1$$4, &extracted, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router/Route.zep", 565);
 			zephir_fast_array_merge(&_0$$4, &routePaths, &_1$$4);
 			ZEPHIR_CPY_WRT(&routePaths, &_0$$4);
 		} else {
@@ -175567,40 +175576,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Breadcrumbs)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "separator");
-}
-
-static PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *separator_param = NULL;
-	zval separator;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&separator);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(separator)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &separator_param);
-	zephir_get_strval(&separator, separator_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("separator"), &separator);
-	RETURN_THIS();
-}
-
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, add)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -175652,6 +175627,15 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, clear)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "separator");
+}
+
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, remove)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -175734,9 +175718,9 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 	ZEPHIR_UNREF(&urls);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&lastLabel);
-	zephir_array_fetch(&lastLabel, &elements, &lastUrl, PH_NOISY, "phalcon/Html/Breadcrumbs.zep", 112);
+	zephir_array_fetch(&lastLabel, &elements, &lastUrl, PH_NOISY, "phalcon/Html/Breadcrumbs.zep", 122);
 	zephir_array_unset(&elements, &lastUrl, PH_SEPARATE);
-	zephir_is_iterable(&elements, 0, "phalcon/Html/Breadcrumbs.zep", 133);
+	zephir_is_iterable(&elements, 0, "phalcon/Html/Breadcrumbs.zep", 143);
 	if (Z_TYPE_P(&elements) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&elements), _3, _4, _1)
 		{
@@ -175762,7 +175746,7 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 			zephir_array_fast_append(&_8$$3, &element);
 			zephir_array_fast_append(&_8$$3, &url);
 			zephir_fast_str_replace(&_5$$3, &_6$$3, &_8$$3, &template);
-			zephir_array_append(&output, &_5$$3, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 127);
+			zephir_array_append(&output, &_5$$3, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 137);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &elements, "rewind", NULL, 0);
@@ -175791,7 +175775,7 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 				zephir_array_fast_append(&_12$$4, &element);
 				zephir_array_fast_append(&_12$$4, &url);
 				zephir_fast_str_replace(&_9$$4, &_10$$4, &_12$$4, &template);
-				zephir_array_append(&output, &_9$$4, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 127);
+				zephir_array_append(&output, &_9$$4, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 137);
 			ZEPHIR_CALL_METHOD(NULL, &elements, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -175801,7 +175785,7 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 	if (0 != zephir_fast_count_int(&elements)) {
 		ZEPHIR_INIT_VAR(&_13$$5);
 		ZEPHIR_CONCAT_SVS(&_13$$5, "<dt>", &lastLabel, "</dt>");
-		zephir_array_append(&output, &_13$$5, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 134);
+		zephir_array_append(&output, &_13$$5, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 144);
 	} else {
 		ZEPHIR_INIT_VAR(&_14$$6);
 		ZEPHIR_INIT_VAR(&_15$$6);
@@ -175817,7 +175801,7 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 		zephir_array_fast_append(&_17$$6, &lastLabel);
 		zephir_array_fast_append(&_17$$6, &lastUrl);
 		zephir_fast_str_replace(&_14$$6, &_15$$6, &_17$$6, &template);
-		zephir_array_append(&output, &_14$$6, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 146);
+		zephir_array_append(&output, &_14$$6, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 156);
 	}
 	ZEPHIR_INIT_VAR(&_18);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("separator"), PH_NOISY_CC | PH_READONLY);
@@ -175828,6 +175812,31 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *separator_param = NULL;
+	zval separator;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&separator);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(separator)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &separator_param);
+	zephir_get_strval(&separator, separator_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("separator"), &separator);
+	RETURN_THIS();
+}
+
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, toArray)
 {
 	zval *this_ptr = getThis();
@@ -175882,54 +175891,143 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Escaper)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Html_Escaper, getEncoding)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "encoding");
-}
-
-static PHP_METHOD(Phalcon_Html_Escaper, getFlags)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "flags");
-}
-
 static PHP_METHOD(Phalcon_Html_Escaper, attributes)
 {
+	zend_string *_4;
+	zend_ulong _3;
+	zend_bool _0, _5$$5, _11$$9;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *input_param = NULL, _0, _1, _2;
-	zval input;
+	zval *input, input_sub, key, result, value, *_1, _2, _6$$5, _8$$5, _7$$7, _9$$8, _10$$8, _12$$9, _14$$9, _13$$11, _15$$12, _16$$12;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&input);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&input_sub);
+	ZVAL_UNDEF(&key);
+	ZVAL_UNDEF(&result);
+	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$5);
+	ZVAL_UNDEF(&_7$$7);
+	ZVAL_UNDEF(&_9$$8);
+	ZVAL_UNDEF(&_10$$8);
+	ZVAL_UNDEF(&_12$$9);
+	ZVAL_UNDEF(&_14$$9);
+	ZVAL_UNDEF(&_13$$11);
+	ZVAL_UNDEF(&_15$$12);
+	ZVAL_UNDEF(&_16$$12);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(input)
+		Z_PARAM_ZVAL(input)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &input_param);
-	zephir_get_strval(&input, input_param);
+	zephir_fetch_params(1, 1, 0, &input);
 
 
-	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, 284, &input, &_2, &_0, &_1);
-	zephir_check_call_status();
+	_0 = Z_TYPE_P(input) != IS_STRING;
+	if (_0) {
+		_0 = Z_TYPE_P(input) != IS_ARRAY;
+	}
+	if (_0) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_html_exception_ce, "Input must be an array or a string", "phalcon/Html/Escaper.zep", 70);
+		return;
+	}
+	if (Z_TYPE_P(input) == IS_STRING) {
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "phphtmlspecialchars", NULL, 0, input);
+		zephir_check_call_status();
+		RETURN_MM();
+	}
+	ZEPHIR_INIT_VAR(&result);
+	ZVAL_STRING(&result, "");
+	zephir_is_iterable(input, 0, "phalcon/Html/Escaper.zep", 100);
+	if (Z_TYPE_P(input) == IS_ARRAY) {
+		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(input), _3, _4, _1)
+		{
+			ZEPHIR_INIT_NVAR(&key);
+			if (_4 != NULL) { 
+				ZVAL_STR_COPY(&key, _4);
+			} else {
+				ZVAL_LONG(&key, _3);
+			}
+			ZEPHIR_INIT_NVAR(&value);
+			ZVAL_COPY(&value, _1);
+			_5$$5 = Z_TYPE_P(&value) == IS_NULL;
+			if (!(_5$$5)) {
+				_5$$5 = ZEPHIR_IS_FALSE_IDENTICAL(&value);
+			}
+			if (_5$$5) {
+				continue;
+			}
+			ZEPHIR_INIT_NVAR(&_6$$5);
+			zephir_fast_trim(&_6$$5, &key, NULL , ZEPHIR_TRIM_BOTH);
+			ZEPHIR_CPY_WRT(&key, &_6$$5);
+			if (Z_TYPE_P(&value) == IS_ARRAY) {
+				ZEPHIR_INIT_NVAR(&_7$$7);
+				zephir_fast_join_str(&_7$$7, SL(" "), &value);
+				ZEPHIR_CPY_WRT(&value, &_7$$7);
+			}
+			ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "phphtmlspecialchars", NULL, 0, &key);
+			zephir_check_call_status();
+			zephir_concat_self(&result, &_8$$5);
+			if (!ZEPHIR_IS_TRUE_IDENTICAL(&value)) {
+				ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "phphtmlspecialchars", NULL, 0, &value);
+				zephir_check_call_status();
+				ZEPHIR_INIT_NVAR(&_10$$8);
+				ZEPHIR_CONCAT_SVS(&_10$$8, "=\"", &_9$$8, "\"");
+				zephir_concat_self(&result, &_10$$8);
+			}
+			zephir_concat_self_str(&result, SL(" "));
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		ZEPHIR_CALL_METHOD(NULL, input, "rewind", NULL, 0);
+		zephir_check_call_status();
+		while (1) {
+			ZEPHIR_CALL_METHOD(&_2, input, "valid", NULL, 0);
+			zephir_check_call_status();
+			if (!zend_is_true(&_2)) {
+				break;
+			}
+			ZEPHIR_CALL_METHOD(&key, input, "key", NULL, 0);
+			zephir_check_call_status();
+			ZEPHIR_CALL_METHOD(&value, input, "current", NULL, 0);
+			zephir_check_call_status();
+				_11$$9 = Z_TYPE_P(&value) == IS_NULL;
+				if (!(_11$$9)) {
+					_11$$9 = ZEPHIR_IS_FALSE_IDENTICAL(&value);
+				}
+				if (_11$$9) {
+					continue;
+				}
+				ZEPHIR_INIT_NVAR(&_12$$9);
+				zephir_fast_trim(&_12$$9, &key, NULL , ZEPHIR_TRIM_BOTH);
+				ZEPHIR_CPY_WRT(&key, &_12$$9);
+				if (Z_TYPE_P(&value) == IS_ARRAY) {
+					ZEPHIR_INIT_NVAR(&_13$$11);
+					zephir_fast_join_str(&_13$$11, SL(" "), &value);
+					ZEPHIR_CPY_WRT(&value, &_13$$11);
+				}
+				ZEPHIR_CALL_METHOD(&_14$$9, this_ptr, "phphtmlspecialchars", NULL, 0, &key);
+				zephir_check_call_status();
+				zephir_concat_self(&result, &_14$$9);
+				if (!ZEPHIR_IS_TRUE_IDENTICAL(&value)) {
+					ZEPHIR_CALL_METHOD(&_15$$12, this_ptr, "phphtmlspecialchars", NULL, 0, &value);
+					zephir_check_call_status();
+					ZEPHIR_INIT_NVAR(&_16$$12);
+					ZEPHIR_CONCAT_SVS(&_16$$12, "=\"", &_15$$12, "\"");
+					zephir_concat_self(&result, &_16$$12);
+				}
+				zephir_concat_self_str(&result, SL(" "));
+			ZEPHIR_CALL_METHOD(NULL, input, "next", NULL, 0);
+			zephir_check_call_status();
+		}
+	}
+	ZEPHIR_INIT_NVAR(&value);
+	ZEPHIR_INIT_NVAR(&key);
+	zephir_fast_trim(return_value, &result, NULL , ZEPHIR_TRIM_RIGHT);
 	RETURN_MM();
 }
 
@@ -176016,7 +176114,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding)
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "ASCII");
 	zephir_array_fast_append(&_0, &_1);
-	zephir_is_iterable(&_0, 0, "phalcon/Html/Escaper.zep", 127);
+	zephir_is_iterable(&_0, 0, "phalcon/Html/Escaper.zep", 162);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _2)
 		{
@@ -176203,6 +176301,24 @@ static PHP_METHOD(Phalcon_Html_Escaper, escapeUrl)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Html_Escaper, getEncoding)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "encoding");
+}
+
+static PHP_METHOD(Phalcon_Html_Escaper, getFlags)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "flags");
+}
+
 static PHP_METHOD(Phalcon_Html_Escaper, html)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -176439,6 +176555,39 @@ static PHP_METHOD(Phalcon_Html_Escaper, url)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *input_param = NULL, _0, _1, _2;
+	zval input;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&input);
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_2);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(input)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &input_param);
+	zephir_get_strval(&input, input_param);
+
+
+	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, 284, &input, &_2, &_0, &_1);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
 static PHP_METHOD(Phalcon_Html_Escaper, doEscapeCss)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -182594,69 +182743,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Asset)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Assets_Asset, getFilter)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "filter");
-}
-
-static PHP_METHOD(Phalcon_Assets_Asset, getPath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "path");
-}
-
-static PHP_METHOD(Phalcon_Assets_Asset, getSourcePath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sourcePath");
-}
-
-static PHP_METHOD(Phalcon_Assets_Asset, getTargetPath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetPath");
-}
-
-static PHP_METHOD(Phalcon_Assets_Asset, getTargetUri)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetUri");
-}
-
-static PHP_METHOD(Phalcon_Assets_Asset, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
-static PHP_METHOD(Phalcon_Assets_Asset, getVersion)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "version");
-}
-
 static PHP_METHOD(Phalcon_Assets_Asset, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -182838,6 +182924,24 @@ static PHP_METHOD(Phalcon_Assets_Asset, getContent)
 	RETURN_CCTOR(&content);
 }
 
+static PHP_METHOD(Phalcon_Assets_Asset, getFilter)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "filter");
+}
+
+static PHP_METHOD(Phalcon_Assets_Asset, getPath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "path");
+}
+
 static PHP_METHOD(Phalcon_Assets_Asset, getRealSourcePath)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -182999,6 +183103,51 @@ static PHP_METHOD(Phalcon_Assets_Asset, getRealTargetUri)
 	RETURN_CCTOR(&target);
 }
 
+static PHP_METHOD(Phalcon_Assets_Asset, getSourcePath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sourcePath");
+}
+
+static PHP_METHOD(Phalcon_Assets_Asset, getTargetPath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetPath");
+}
+
+static PHP_METHOD(Phalcon_Assets_Asset, getTargetUri)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetUri");
+}
+
+static PHP_METHOD(Phalcon_Assets_Asset, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
+static PHP_METHOD(Phalcon_Assets_Asset, getVersion)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "version");
+}
+
 static PHP_METHOD(Phalcon_Assets_Asset, isAutoVersion)
 {
 	zval *this_ptr = getThis();
@@ -183339,7 +183488,7 @@ static PHP_METHOD(Phalcon_Assets_Asset, throwException)
 	ZEPHIR_CONCAT_SVS(&_1, "Asset's content for '", &completePath, "' cannot be read");
 	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_1);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_0, "phalcon/Assets/Asset.zep", 441);
+	zephir_throw_exception_debug(&_0, "phalcon/Assets/Asset.zep", 484);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -183436,8 +183585,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Collection)
 	zend_declare_property_bool(phalcon_assets_collection_ce, SL("autoVersion"), 0, ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_assets_collection_ce, SL("codes"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_assets_collection_ce, SL("filters"), ZEND_ACC_PROTECTED);
-	zend_declare_property_bool(phalcon_assets_collection_ce, SL("join"), 1, ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_assets_collection_ce, SL("isLocal"), 1, ZEND_ACC_PROTECTED);
+	zend_declare_property_bool(phalcon_assets_collection_ce, SL("join"), 1, ZEND_ACC_PROTECTED);
 	zend_declare_property_string(phalcon_assets_collection_ce, SL("prefix"), "", ZEND_ACC_PROTECTED);
 	zend_declare_property_string(phalcon_assets_collection_ce, SL("sourcePath"), "", ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_assets_collection_ce, SL("targetIsLocal"), 1, ZEND_ACC_PROTECTED);
@@ -183451,105 +183600,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Collection)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Assets_Collection, getAssets)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "assets");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getAttributes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "attributes");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getCodes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "codes");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getFilters)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "filters");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getJoin)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "join");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getPrefix)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "prefix");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getSourcePath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sourcePath");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getTargetIsLocal)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetIsLocal");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getTargetPath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetPath");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getTargetUri)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetUri");
-}
-
-static PHP_METHOD(Phalcon_Assets_Collection, getVersion)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "version");
-}
-
 static PHP_METHOD(Phalcon_Assets_Collection, add)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -183898,6 +183948,42 @@ static PHP_METHOD(Phalcon_Assets_Collection, count)
 	RETURN_LONG(zephir_fast_count_int(&_0));
 }
 
+static PHP_METHOD(Phalcon_Assets_Collection, getAssets)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "assets");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getAttributes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "attributes");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getCodes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "codes");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getFilters)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "filters");
+}
+
 static PHP_METHOD(Phalcon_Assets_Collection, getIterator)
 {
 	zval _0;
@@ -183917,6 +184003,24 @@ static PHP_METHOD(Phalcon_Assets_Collection, getIterator)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Assets_Collection, getJoin)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "join");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getPrefix)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "prefix");
+}
+
 static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -183960,6 +184064,51 @@ static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath)
 	RETURN_CCTOR(&completePath);
 }
 
+static PHP_METHOD(Phalcon_Assets_Collection, getSourcePath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sourcePath");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getTargetIsLocal)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetIsLocal");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getTargetPath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetPath");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getTargetUri)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetUri");
+}
+
+static PHP_METHOD(Phalcon_Assets_Collection, getVersion)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "version");
+}
+
 static PHP_METHOD(Phalcon_Assets_Collection, has)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -183989,7 +184138,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, has)
 	ZEPHIR_CALL_METHOD(&key, asset, "getassetkey", NULL, 0);
 	zephir_check_call_status();
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("assets"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_0, 0, "phalcon/Assets/Collection.zep", 307);
+	zephir_is_iterable(&_0, 0, "phalcon/Assets/Collection.zep", 395);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -184690,42 +184839,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Inline)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Assets_Inline, getAttributes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "attributes");
-}
-
-static PHP_METHOD(Phalcon_Assets_Inline, getContent)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "content");
-}
-
-static PHP_METHOD(Phalcon_Assets_Inline, getFilter)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "filter");
-}
-
-static PHP_METHOD(Phalcon_Assets_Inline, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 static PHP_METHOD(Phalcon_Assets_Inline, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -184808,6 +184921,42 @@ static PHP_METHOD(Phalcon_Assets_Inline, getAssetKey)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Assets_Inline, getAttributes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "attributes");
+}
+
+static PHP_METHOD(Phalcon_Assets_Inline, getContent)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "content");
+}
+
+static PHP_METHOD(Phalcon_Assets_Inline, getFilter)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "filter");
+}
+
+static PHP_METHOD(Phalcon_Assets_Inline, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
 static PHP_METHOD(Phalcon_Assets_Inline, setAttributes)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -195606,42 +195755,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Translate_Adapter_Gettext)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getCategory)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "category");
-}
-
-static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDefaultDomain)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "defaultDomain");
-}
-
-static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDirectory)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "directory");
-}
-
-static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getLocale)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "locale");
-}
-
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -195719,6 +195832,42 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, exists)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getCategory)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "category");
+}
+
+static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDefaultDomain)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "defaultDomain");
+}
+
+static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDirectory)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "directory");
+}
+
+static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getLocale)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "locale");
+}
+
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, has)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -195976,7 +196125,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory)
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("directory"), directory);
 	if (Z_TYPE_P(directory) == IS_ARRAY) {
-		zephir_is_iterable(directory, 0, "phalcon/Translate/Adapter/Gettext.zep", 217);
+		zephir_is_iterable(directory, 0, "phalcon/Translate/Adapter/Gettext.zep", 249);
 		if (Z_TYPE_P(directory) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(directory), _2$$4, _3$$4, _0$$4)
 			{
@@ -196167,11 +196316,11 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions)
 
 
 	if (UNEXPECTED(!(zephir_array_isset_string(&options, SL("locale"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'locale' is required", "phalcon/Translate/Adapter/Gettext.zep", 289);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'locale' is required", "phalcon/Translate/Adapter/Gettext.zep", 321);
 		return;
 	}
 	if (UNEXPECTED(!(zephir_array_isset_string(&options, SL("directory"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'directory' is required", "phalcon/Translate/Adapter/Gettext.zep", 293);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'directory' is required", "phalcon/Translate/Adapter/Gettext.zep", 325);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_0);
@@ -196179,17 +196328,17 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions)
 	zephir_check_call_status();
 	zephir_fast_array_merge(&_0, &_1, &options);
 	ZEPHIR_CPY_WRT(&options, &_0);
-	zephir_array_fetch_string(&_2, &options, SL("category"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 301);
-	zephir_array_fetch_string(&_3, &options, SL("locale"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 301);
+	zephir_array_fetch_string(&_2, &options, SL("category"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 333);
+	zephir_array_fetch_string(&_3, &options, SL("locale"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 333);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setlocale", NULL, 0, &_2, &_3);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_4, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 302);
+	zephir_array_fetch_string(&_4, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 334);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdefaultdomain", NULL, 0, &_4);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_5, &options, SL("directory"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 303);
+	zephir_array_fetch_string(&_5, &options, SL("directory"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 335);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdirectory", NULL, 0, &_5);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_6, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 304);
+	zephir_array_fetch_string(&_6, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 336);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdomain", NULL, 0, &_6);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
@@ -196702,7 +196851,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "A dependency injection container is required to access related dispatching services");
 		ZVAL_LONG(&_2$$3, 0);
@@ -196980,7 +197129,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						zephir_check_call_status();
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 409);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 408);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -197024,7 +197173,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						zephir_check_call_status();
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 428);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 427);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -197067,7 +197216,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						if (_78$$43) {
 							continue;
 						}
-						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 470);
+						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 469);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -197114,7 +197263,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						if (_88$$48) {
 							continue;
 						}
-						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 489);
+						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 488);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -197188,7 +197337,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 				if (_105$$59) {
 					continue;
 				}
-				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 561);
+				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 560);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -197229,7 +197378,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 					if (_115$$64) {
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 577);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 576);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -197269,7 +197418,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 					if (_123$$69) {
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 594);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 593);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -197303,7 +197452,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 					if (_130$$73) {
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 611);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 610);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -197333,7 +197482,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 				if (ZEPHIR_IS_FALSE_IDENTICAL(&_134$$77)) {
 					RETURN_MM_BOOL(0);
 				}
-				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 628);
+				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 627);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -197376,7 +197525,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, forward)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("isControllerInitialize"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_dispatcher_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/Dispatcher/AbstractDispatcher.zep", 662);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_dispatcher_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/Dispatcher/AbstractDispatcher.zep", 661);
 		return;
 	}
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("namespaceName"), PH_NOISY_CC | PH_READONLY);
@@ -197469,24 +197618,24 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getActiveMethod)
 
 static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getBoundModels)
 {
-	zval modelBinder, _0;
+	zval _0, _1;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&modelBinder);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelBinder"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&modelBinder, &_0);
-	if (Z_TYPE_P(&modelBinder) == IS_NULL) {
+	if (Z_TYPE_P(&_0) == IS_NULL) {
 		array_init(return_value);
 		RETURN_MM();
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&modelBinder, "getboundmodels", NULL, 0);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("modelBinder"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_1, "getboundmodels", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -197549,7 +197698,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getParam)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *param, param_sub, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, __$null, params, filter, paramValue, container, _0, _3, _4, _1$$5, _2$$5;
+	zval *param, param_sub, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, __$null, params, filter, paramValue, _0, _3, _4, _5, _1$$5, _2$$5;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
@@ -197559,10 +197708,10 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getParam)
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&filter);
 	ZVAL_UNDEF(&paramValue);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_1$$5);
 	ZVAL_UNDEF(&_2$$5);
 #if PHP_VERSION_ID >= 80000
@@ -197599,19 +197748,19 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getParam)
 		RETURN_CCTOR(&paramValue);
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&_0) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$5);
 		ZVAL_STRING(&_1$$5, "A dependency injection container is required to access the 'filter' service");
 		ZVAL_LONG(&_2$$5, 0);
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwdispatchexception", NULL, 0, &_1$$5, &_2$$5);
 		zephir_check_call_status();
 	}
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "filter");
-	ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4);
+	zephir_read_property(&_3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_STRING(&_5, "filter");
+	ZEPHIR_CALL_METHOD(&_4, &_3, "getshared", NULL, 0, &_5);
 	zephir_check_call_status();
-	ZEPHIR_CPY_WRT(&filter, &_3);
+	ZEPHIR_CPY_WRT(&filter, &_4);
 	ZEPHIR_RETURN_CALL_METHOD(&filter, "sanitize", NULL, 0, &paramValue, filters);
 	zephir_check_call_status();
 	RETURN_MM();
@@ -197757,7 +197906,7 @@ static PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getHandlerClass)
 	ZEPHIR_CPY_WRT(&handlerName, &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("namespaceName"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&namespaceName, &_0);
-	if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/Dispatcher/AbstractDispatcher.zep", 911))) {
+	if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/Dispatcher/AbstractDispatcher.zep", 904))) {
 		ZEPHIR_CALL_METHOD(&camelizedClass, this_ptr, "tocamelcase", NULL, 0, &handlerName);
 		zephir_check_call_status();
 	} else {
@@ -198489,7 +198638,9 @@ static PHP_METHOD(Phalcon_Http_Cookie, delete)
 	ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 332, &options, &_8, &httpOnly);
 	zephir_check_call_status();
 	zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE);
-	ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 333, &name, &__$null, &options);
+	ZEPHIR_INIT_NVAR(&_8);
+	ZVAL_STRING(&_8, "");
+	ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 333, &name, &_8, &options);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
@@ -198683,7 +198834,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, getValue)
 		if (zephir_is_true(&_2$$4)) {
 			zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_CPY_WRT(&container, &_3$$6);
-			if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+			if (Z_TYPE_P(&container) == IS_NULL) {
 				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'filter' and 'crypt' services", "phalcon/Http/Cookie.zep", 265);
 				return;
 			}
@@ -198716,7 +198867,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, getValue)
 				if (Z_TYPE_P(&container) == IS_NULL) {
 					zephir_read_property(&_7$$14, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&container, &_7$$14);
-					if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+					if (Z_TYPE_P(&container) == IS_NULL) {
 						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Cookie.zep", 314);
 						return;
 					}
@@ -198941,7 +199092,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, send)
 		_7 = !(ZEPHIR_IS_EMPTY(&value));
 	}
 	if (_7) {
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Cookie.zep", 462);
 			return;
 		}
@@ -199443,43 +199594,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Request)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "httpMethodParameterOverride");
-}
-
-static PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride)
-{
-	zval *httpMethodParameterOverride_param = NULL, __$true, __$false;
-	zend_bool httpMethodParameterOverride;
-	zval *this_ptr = getThis();
-
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_BOOL(httpMethodParameterOverride)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	zephir_fetch_params_without_memory_grow(1, 0, &httpMethodParameterOverride_param);
-	httpMethodParameterOverride = zephir_get_boolval(httpMethodParameterOverride_param);
-
-
-	if (httpMethodParameterOverride) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$true);
-	} else {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$false);
-	}
-	RETURN_THISW();
-}
-
 static PHP_METHOD(Phalcon_Http_Request, get)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -199693,6 +199807,15 @@ static PHP_METHOD(Phalcon_Http_Request, getBestLanguage)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "httpMethodParameterOverride");
+}
+
 static PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant)
 {
 	zval language, _0, _1, _2, _3;
@@ -199714,7 +199837,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_explode_str(&_0, SL("-"), &language, LONG_MAX);
 	ZEPHIR_CPY_WRT(&language, &_0);
-	zephir_array_fetch_long(&_1, &language, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 180);
+	zephir_array_fetch_long(&_1, &language, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 190);
 	ZEPHIR_CPY_WRT(&language, &_1);
 	ZEPHIR_INIT_VAR(&_2);
 	ZEPHIR_INIT_VAR(&_3);
@@ -199778,10 +199901,10 @@ static PHP_METHOD(Phalcon_Http_Request, getClientAddress)
 	if (Z_TYPE_P(&address) != IS_STRING) {
 		RETURN_MM_BOOL(0);
 	}
-	if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 216)) {
+	if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 226)) {
 		ZEPHIR_INIT_VAR(&_0$$7);
 		zephir_fast_explode_str(&_0$$7, SL(","), &address, LONG_MAX);
-		zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 221);
+		zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 231);
 		RETURN_CTOR(&_1$$7);
 	}
 	RETURN_CCTOR(&address);
@@ -199873,15 +199996,15 @@ static PHP_METHOD(Phalcon_Http_Request, getDigestAuth)
 			RETURN_CTOR(&auth);
 		}
 		if (Z_TYPE_P(&matches) == IS_ARRAY) {
-			zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 275);
+			zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 285);
 			if (Z_TYPE_P(&matches) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$5)
 				{
 					ZEPHIR_INIT_NVAR(&match);
 					ZVAL_COPY(&match, _3$$5);
-					zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 273);
+					zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 283);
 					ZEPHIR_OBS_NVAR(&_6$$6);
-					zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 273);
+					zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 283);
 					zephir_array_update_zval(&auth, &_6$$6, &_5$$6, PH_COPY | PH_SEPARATE);
 				} ZEND_HASH_FOREACH_END();
 			} else {
@@ -199895,9 +200018,9 @@ static PHP_METHOD(Phalcon_Http_Request, getDigestAuth)
 					}
 					ZEPHIR_CALL_METHOD(&match, &matches, "current", NULL, 0);
 					zephir_check_call_status();
-						zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 273);
+						zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 283);
 						ZEPHIR_OBS_NVAR(&_8$$7);
-						zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 273);
+						zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 283);
 						zephir_array_update_zval(&auth, &_8$$7, &_7$$7, PH_COPY | PH_SEPARATE);
 					ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0);
 					zephir_check_call_status();
@@ -199971,7 +200094,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFilteredQuery)
 
 	ZEPHIR_OBS_VAR(&filters);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY);
-	zephir_array_fetch_string(&_1, &_0, SL("GET"), PH_READONLY, "phalcon/Http/Request.zep", 292);
+	zephir_array_fetch_string(&_1, &_0, SL("GET"), PH_READONLY, "phalcon/Http/Request.zep", 302);
 	if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) {
 		ZEPHIR_INIT_NVAR(&filters);
 		array_init(&filters);
@@ -200053,7 +200176,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFilteredPost)
 
 	ZEPHIR_OBS_VAR(&filters);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY);
-	zephir_array_fetch_string(&_1, &_0, SL("POST"), PH_READONLY, "phalcon/Http/Request.zep", 316);
+	zephir_array_fetch_string(&_1, &_0, SL("POST"), PH_READONLY, "phalcon/Http/Request.zep", 326);
 	if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) {
 		ZEPHIR_INIT_NVAR(&filters);
 		array_init(&filters);
@@ -200135,7 +200258,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFilteredPut)
 
 	ZEPHIR_OBS_VAR(&filters);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY);
-	zephir_array_fetch_string(&_1, &_0, SL("PUT"), PH_READONLY, "phalcon/Http/Request.zep", 340);
+	zephir_array_fetch_string(&_1, &_0, SL("PUT"), PH_READONLY, "phalcon/Http/Request.zep", 350);
 	if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) {
 		ZEPHIR_INIT_NVAR(&filters);
 		array_init(&filters);
@@ -200282,7 +200405,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders)
 	zephir_array_update_string(&contentHeaders, SL("CONTENT_MD5"), &__$true, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 338);
 	zephir_check_call_status();
-	zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 441);
+	zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 451);
 	if (Z_TYPE_P(&server) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&server), _2, _3, _0)
 		{
@@ -200473,7 +200596,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost)
 		zephir_fast_trim(&_4$$5, &host, NULL , ZEPHIR_TRIM_BOTH);
 		ZEPHIR_INIT_VAR(&cleanHost);
 		zephir_fast_strtolower(&cleanHost, &_4$$5);
-		if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 515)) {
+		if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 525)) {
 			ZEPHIR_INIT_VAR(&_5$$6);
 			ZVAL_STRING(&_5$$6, "/:[[:digit:]]+$/");
 			ZEPHIR_INIT_VAR(&_6$$6);
@@ -200497,7 +200620,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost)
 			ZEPHIR_CONCAT_SV(&_13$$7, "Invalid host ", &host);
 			ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 339, &_13$$7);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 525);
+			zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 535);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -200681,7 +200804,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPort)
 		zephir_check_call_status();
 		RETURN_MM_LONG(zephir_get_intval(&_1$$3));
 	}
-	if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 634)) {
+	if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 644)) {
 		ZEPHIR_INIT_VAR(&_3$$4);
 		ZVAL_STRING(&_3$$4, ":");
 		ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 238, &host, &_3$$4);
@@ -201230,7 +201353,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 	array_init(&files);
 	ZEPHIR_CPY_WRT(&superFiles, &_FILES);
 	if (zephir_fast_count_int(&superFiles) > 0) {
-		zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 900);
+		zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 910);
 		if (Z_TYPE_P(&superFiles) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&superFiles), _2$$3, _3$$3, _0$$3)
 			{
@@ -201243,16 +201366,16 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 				ZEPHIR_INIT_NVAR(&input);
 				ZVAL_COPY(&input, _0$$3);
 				ZEPHIR_OBS_NVAR(&_4$$4);
-				zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 857);
+				zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 867);
 				if (Z_TYPE_P(&_4$$4) == IS_ARRAY) {
-					zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 859);
-					zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 860);
-					zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861);
-					zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862);
-					zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863);
+					zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 869);
+					zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 870);
+					zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 871);
+					zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 872);
+					zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 873);
 					ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 344, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix);
 					zephir_check_call_status();
-					zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890);
+					zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 900);
 					if (Z_TYPE_P(&smoothInput) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _11$$5)
 						{
@@ -201260,43 +201383,43 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 							ZVAL_COPY(&file, _11$$5);
 							_13$$6 = onlySuccessful == 0;
 							if (!(_13$$6)) {
-								zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+								zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 								_13$$6 = ZEPHIR_IS_LONG(&_14$$6, 0);
 							}
 							if (_13$$6) {
 								ZEPHIR_INIT_NVAR(&dataFile);
 								zephir_create_array(&dataFile, 5, 0);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+								zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 								zephir_array_update_string(&dataFile, SL("name"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+								zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 								zephir_array_update_string(&dataFile, SL("type"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+								zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 								zephir_array_update_string(&dataFile, SL("tmp_name"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+								zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 								zephir_array_update_string(&dataFile, SL("size"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+								zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 								zephir_array_update_string(&dataFile, SL("error"), &_15$$7, PH_COPY | PH_SEPARATE);
 								if (namedKeys == 1) {
 									ZEPHIR_INIT_NVAR(&_16$$8);
 									object_init_ex(&_16$$8, phalcon_http_request_file_ce);
-									zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+									zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 									ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 345, &dataFile, &_17$$8);
 									zephir_check_call_status();
 									ZEPHIR_OBS_NVAR(&_19$$8);
-									zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+									zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 									zephir_array_update_zval(&files, &_19$$8, &_16$$8, PH_COPY | PH_SEPARATE);
 								} else {
 									ZEPHIR_INIT_NVAR(&_20$$9);
 									object_init_ex(&_20$$9, phalcon_http_request_file_ce);
-									zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+									zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 									ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 345, &dataFile, &_21$$9);
 									zephir_check_call_status();
-									zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+									zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 								}
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -201313,44 +201436,44 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 							zephir_check_call_status();
 								_22$$10 = onlySuccessful == 0;
 								if (!(_22$$10)) {
-									zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+									zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 									_22$$10 = ZEPHIR_IS_LONG(&_23$$10, 0);
 								}
 								if (_22$$10) {
 									ZEPHIR_INIT_NVAR(&_24$$11);
 									zephir_create_array(&_24$$11, 5, 0);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+									zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 									zephir_array_update_string(&_24$$11, SL("name"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+									zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 									zephir_array_update_string(&_24$$11, SL("type"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+									zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 									zephir_array_update_string(&_24$$11, SL("tmp_name"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+									zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 									zephir_array_update_string(&_24$$11, SL("size"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+									zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 									zephir_array_update_string(&_24$$11, SL("error"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_CPY_WRT(&dataFile, &_24$$11);
 									if (namedKeys == 1) {
 										ZEPHIR_INIT_NVAR(&_26$$12);
 										object_init_ex(&_26$$12, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+										zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 										ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 345, &dataFile, &_27$$12);
 										zephir_check_call_status();
 										ZEPHIR_OBS_NVAR(&_28$$12);
-										zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+										zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 										zephir_array_update_zval(&files, &_28$$12, &_26$$12, PH_COPY | PH_SEPARATE);
 									} else {
 										ZEPHIR_INIT_NVAR(&_29$$13);
 										object_init_ex(&_29$$13, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+										zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 										ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 345, &dataFile, &_30$$13);
 										zephir_check_call_status();
-										zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+										zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 									}
 								}
 							ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0);
@@ -201361,7 +201484,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 				} else {
 					_31$$14 = onlySuccessful == 0;
 					if (!(_31$$14)) {
-						zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
+						zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 901);
 						_31$$14 = ZEPHIR_IS_LONG(&_32$$14, 0);
 					}
 					if (_31$$14) {
@@ -201376,7 +201499,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 							object_init_ex(&_34$$17, phalcon_http_request_file_ce);
 							ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 345, &input, &prefix);
 							zephir_check_call_status();
-							zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 895);
+							zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 905);
 						}
 					}
 				}
@@ -201395,16 +201518,16 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 				ZEPHIR_CALL_METHOD(&input, &superFiles, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&_35$$18);
-					zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 857);
+					zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 867);
 					if (Z_TYPE_P(&_35$$18) == IS_ARRAY) {
-						zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 859);
-						zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 860);
-						zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861);
-						zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862);
-						zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863);
+						zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 869);
+						zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 870);
+						zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 871);
+						zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 872);
+						zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 873);
 						ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 344, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix);
 						zephir_check_call_status();
-						zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890);
+						zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 900);
 						if (Z_TYPE_P(&smoothInput) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _41$$19)
 							{
@@ -201412,44 +201535,44 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 								ZVAL_COPY(&file, _41$$19);
 								_43$$20 = onlySuccessful == 0;
 								if (!(_43$$20)) {
-									zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+									zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 									_43$$20 = ZEPHIR_IS_LONG(&_44$$20, 0);
 								}
 								if (_43$$20) {
 									ZEPHIR_INIT_NVAR(&_45$$21);
 									zephir_create_array(&_45$$21, 5, 0);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+									zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 									zephir_array_update_string(&_45$$21, SL("name"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+									zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 									zephir_array_update_string(&_45$$21, SL("type"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+									zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 									zephir_array_update_string(&_45$$21, SL("tmp_name"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+									zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 									zephir_array_update_string(&_45$$21, SL("size"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+									zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 									zephir_array_update_string(&_45$$21, SL("error"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_CPY_WRT(&dataFile, &_45$$21);
 									if (namedKeys == 1) {
 										ZEPHIR_INIT_NVAR(&_47$$22);
 										object_init_ex(&_47$$22, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+										zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 										ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 345, &dataFile, &_48$$22);
 										zephir_check_call_status();
 										ZEPHIR_OBS_NVAR(&_49$$22);
-										zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+										zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 										zephir_array_update_zval(&files, &_49$$22, &_47$$22, PH_COPY | PH_SEPARATE);
 									} else {
 										ZEPHIR_INIT_NVAR(&_50$$23);
 										object_init_ex(&_50$$23, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+										zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 										ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 345, &dataFile, &_51$$23);
 										zephir_check_call_status();
-										zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+										zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 									}
 								}
 							} ZEND_HASH_FOREACH_END();
@@ -201466,44 +201589,44 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 								zephir_check_call_status();
 									_52$$24 = onlySuccessful == 0;
 									if (!(_52$$24)) {
-										zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+										zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 										_52$$24 = ZEPHIR_IS_LONG(&_53$$24, 0);
 									}
 									if (_52$$24) {
 										ZEPHIR_INIT_NVAR(&_54$$25);
 										zephir_create_array(&_54$$25, 5, 0);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+										zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 										zephir_array_update_string(&_54$$25, SL("name"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+										zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 										zephir_array_update_string(&_54$$25, SL("type"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+										zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 										zephir_array_update_string(&_54$$25, SL("tmp_name"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+										zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 										zephir_array_update_string(&_54$$25, SL("size"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+										zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 										zephir_array_update_string(&_54$$25, SL("error"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_CPY_WRT(&dataFile, &_54$$25);
 										if (namedKeys == 1) {
 											ZEPHIR_INIT_NVAR(&_56$$26);
 											object_init_ex(&_56$$26, phalcon_http_request_file_ce);
-											zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+											zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 											ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 345, &dataFile, &_57$$26);
 											zephir_check_call_status();
 											ZEPHIR_OBS_NVAR(&_58$$26);
-											zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+											zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 											zephir_array_update_zval(&files, &_58$$26, &_56$$26, PH_COPY | PH_SEPARATE);
 										} else {
 											ZEPHIR_INIT_NVAR(&_59$$27);
 											object_init_ex(&_59$$27, phalcon_http_request_file_ce);
-											zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+											zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 											ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 345, &dataFile, &_60$$27);
 											zephir_check_call_status();
-											zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+											zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 										}
 									}
 								ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0);
@@ -201514,7 +201637,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 					} else {
 						_61$$28 = onlySuccessful == 0;
 						if (!(_61$$28)) {
-							zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
+							zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 901);
 							_61$$28 = ZEPHIR_IS_LONG(&_62$$28, 0);
 						}
 						if (_61$$28) {
@@ -201529,7 +201652,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 								object_init_ex(&_64$$31, phalcon_http_request_file_ce);
 								ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 345, &input, &prefix);
 								zephir_check_call_status();
-								zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 895);
+								zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 905);
 							}
 						}
 					}
@@ -201586,7 +201709,7 @@ static PHP_METHOD(Phalcon_Http_Request, getURI)
 		ZEPHIR_INIT_VAR(&_2$$4);
 		ZVAL_STRING(&_2$$4, "?");
 		zephir_fast_explode(&_1$$4, &_2$$4, &requestURI, LONG_MAX);
-		zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 929);
+		zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 939);
 		ZEPHIR_CPY_WRT(&requestURI, &_3$$4);
 	}
 	RETURN_CCTOR(&requestURI);
@@ -202020,14 +202143,14 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod)
 			ZEPHIR_CONCAT_SV(&_3$$4, "Invalid HTTP method: ", methods);
 			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 29, &_3$$4);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1075);
+			zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1085);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(methods, &httpMethod));
 	}
 	if (Z_TYPE_P(methods) == IS_ARRAY) {
-		zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1088);
+		zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1098);
 		if (Z_TYPE_P(methods) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(methods), _4$$5)
 			{
@@ -202073,7 +202196,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod)
 		RETURN_MM_BOOL(0);
 	}
 	if (UNEXPECTED(strict)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1092);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1102);
 		return;
 	}
 	RETURN_MM_BOOL(0);
@@ -202216,7 +202339,7 @@ static PHP_METHOD(Phalcon_Http_Request, isSoap)
 	if (ZEPHIR_IS_EMPTY(&contentType)) {
 		RETURN_MM_BOOL(0);
 	}
-	RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1177));
+	RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1187));
 }
 
 static PHP_METHOD(Phalcon_Http_Request, isTrace)
@@ -202311,7 +202434,7 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles)
 	if (Z_TYPE_P(&files) != IS_ARRAY) {
 		RETURN_MM_LONG(0);
 	}
-	zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1242);
+	zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1252);
 	if (Z_TYPE_P(&files) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&files), _0)
 		{
@@ -202381,6 +202504,34 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles)
 	RETURN_MM_LONG(numberFiles);
 }
 
+static PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride)
+{
+	zval *override_param = NULL, __$true, __$false;
+	zend_bool override;
+	zval *this_ptr = getThis();
+
+	ZVAL_BOOL(&__$true, 1);
+	ZVAL_BOOL(&__$false, 0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_BOOL(override)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	zephir_fetch_params_without_memory_grow(1, 0, &override_param);
+	override = zephir_get_boolval(override_param);
+
+
+	if (override) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$true);
+	} else {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$false);
+	}
+	RETURN_THISW();
+}
+
 static PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -202454,13 +202605,13 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 		ZEPHIR_CONCAT_SVS(&_1$$3, "Filters have not been defined for '", &name, "'");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1259);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1283);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 349);
 	zephir_check_call_status();
-	zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1272);
+	zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1296);
 	if (Z_TYPE_P(&filters) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2)
 		{
@@ -202475,7 +202626,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 				ZEPHIR_CONCAT_SVS(&_7$$5, "Sanitizer '", &sanitizer, "' does not exist in the filter locator");
 				ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 29, &_7$$5);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1268);
+				zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1292);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -202500,7 +202651,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 					ZEPHIR_CONCAT_SVS(&_11$$7, "Sanitizer '", &sanitizer, "' does not exist in the filter locator");
 					ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", NULL, 29, &_11$$7);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1268);
+					zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1292);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -202524,7 +202675,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 	} else {
 		ZEPHIR_CPY_WRT(&localScope, &scope);
 	}
-	zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1286);
+	zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1310);
 	if (Z_TYPE_P(&localScope) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&localScope), _13)
 		{
@@ -202635,7 +202786,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestQuality)
 	quality = 0.0;
 	ZEPHIR_INIT_VAR(&selectedName);
 	ZVAL_STRING(&selectedName, "");
-	zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1329);
+	zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1353);
 	if (Z_TYPE_P(&qualityParts) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&qualityParts), _0)
 		{
@@ -202643,18 +202794,18 @@ static PHP_METHOD(Phalcon_Http_Request, getBestQuality)
 			ZVAL_COPY(&accept, _0);
 			if (i == 0) {
 				ZEPHIR_OBS_NVAR(&_2$$4);
-				zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1315);
+				zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1339);
 				quality = zephir_get_doubleval(&_2$$4);
 				ZEPHIR_OBS_NVAR(&selectedName);
-				zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1316);
+				zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1340);
 			} else {
 				ZEPHIR_OBS_NVAR(&_3$$5);
-				zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1318);
+				zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1342);
 				acceptQuality = zephir_get_doubleval(&_3$$5);
 				if (acceptQuality > quality) {
 					quality = acceptQuality;
 					ZEPHIR_OBS_NVAR(&selectedName);
-					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1322);
+					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1346);
 				}
 			}
 			i++;
@@ -202672,18 +202823,18 @@ static PHP_METHOD(Phalcon_Http_Request, getBestQuality)
 			zephir_check_call_status();
 				if (i == 0) {
 					ZEPHIR_OBS_NVAR(&_4$$8);
-					zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1315);
+					zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1339);
 					quality = zephir_get_doubleval(&_4$$8);
 					ZEPHIR_OBS_NVAR(&selectedName);
-					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1316);
+					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1340);
 				} else {
 					ZEPHIR_OBS_NVAR(&_5$$9);
-					zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1318);
+					zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1342);
 					acceptQuality = zephir_get_doubleval(&_5$$9);
 					if (acceptQuality > quality) {
 						quality = acceptQuality;
 						ZEPHIR_OBS_NVAR(&selectedName);
-						zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1322);
+						zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1346);
 					}
 				}
 				i++;
@@ -202837,7 +202988,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper)
 	if (Z_TYPE_P(data) != IS_ARRAY) {
 		RETURN_MM_LONG(1);
 	}
-	zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1398);
+	zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1422);
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), _0)
 		{
@@ -203015,7 +203166,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 	ZVAL_LONG(&_3, 1);
 	ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 67, &_1, &serverValue, &_2, &_3);
 	zephir_check_call_status();
-	zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1442);
+	zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1466);
 	if (Z_TYPE_P(&parts) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parts), _4)
 		{
@@ -203031,7 +203182,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 			ZVAL_LONG(&_9$$3, 1);
 			ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 67, &_7$$3, &_6$$3, &_8$$3, &_9$$3);
 			zephir_check_call_status();
-			zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1439);
+			zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1463);
 			if (Z_TYPE_P(&headerSplit) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _10$$3)
 				{
@@ -203044,17 +203195,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 					if (!ZEPHIR_IS_FALSE_IDENTICAL(&_13$$4)) {
 						ZEPHIR_INIT_NVAR(&split);
 						zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-						zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+						zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 						if (ZEPHIR_IS_STRING_IDENTICAL(&_14$$5, "q")) {
 							ZEPHIR_OBS_NVAR(&_15$$6);
-							zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+							zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 							ZEPHIR_INIT_NVAR(&_16$$6);
 							ZVAL_DOUBLE(&_16$$6, zephir_get_doubleval(&_15$$6));
 							zephir_array_update_string(&headerParts, SL("quality"), &_16$$6, PH_COPY | PH_SEPARATE);
 						} else {
-							zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+							zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 							ZEPHIR_OBS_NVAR(&_18$$7);
-							zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+							zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 							zephir_array_update_zval(&headerParts, &_18$$7, &_17$$7, PH_COPY | PH_SEPARATE);
 						}
 					} else {
@@ -203082,17 +203233,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 						if (!ZEPHIR_IS_FALSE_IDENTICAL(&_21$$9)) {
 							ZEPHIR_INIT_NVAR(&split);
 							zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-							zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+							zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 							if (ZEPHIR_IS_STRING_IDENTICAL(&_22$$10, "q")) {
 								ZEPHIR_OBS_NVAR(&_23$$11);
-								zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+								zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 								ZEPHIR_INIT_NVAR(&_24$$11);
 								ZVAL_DOUBLE(&_24$$11, zephir_get_doubleval(&_23$$11));
 								zephir_array_update_string(&headerParts, SL("quality"), &_24$$11, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 								ZEPHIR_OBS_NVAR(&_26$$12);
-								zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 								zephir_array_update_zval(&headerParts, &_26$$12, &_25$$12, PH_COPY | PH_SEPARATE);
 							}
 						} else {
@@ -203106,7 +203257,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 				}
 			}
 			ZEPHIR_INIT_NVAR(&headerPart);
-			zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1439);
+			zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1463);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0);
@@ -203129,7 +203280,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 				ZVAL_LONG(&_31$$14, 1);
 				ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 67, &_29$$14, &_28$$14, &_30$$14, &_31$$14);
 				zephir_check_call_status();
-				zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1439);
+				zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1463);
 				if (Z_TYPE_P(&headerSplit) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _32$$14)
 					{
@@ -203142,17 +203293,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 						if (!ZEPHIR_IS_FALSE_IDENTICAL(&_35$$15)) {
 							ZEPHIR_INIT_NVAR(&split);
 							zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-							zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+							zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 							if (ZEPHIR_IS_STRING_IDENTICAL(&_36$$16, "q")) {
 								ZEPHIR_OBS_NVAR(&_37$$17);
-								zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+								zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 								ZEPHIR_INIT_NVAR(&_38$$17);
 								ZVAL_DOUBLE(&_38$$17, zephir_get_doubleval(&_37$$17));
 								zephir_array_update_string(&headerParts, SL("quality"), &_38$$17, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 								ZEPHIR_OBS_NVAR(&_40$$18);
-								zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 								zephir_array_update_zval(&headerParts, &_40$$18, &_39$$18, PH_COPY | PH_SEPARATE);
 							}
 						} else {
@@ -203180,17 +203331,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 							if (!ZEPHIR_IS_FALSE_IDENTICAL(&_43$$20)) {
 								ZEPHIR_INIT_NVAR(&split);
 								zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-								zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+								zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 								if (ZEPHIR_IS_STRING_IDENTICAL(&_44$$21, "q")) {
 									ZEPHIR_OBS_NVAR(&_45$$22);
-									zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+									zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 									ZEPHIR_INIT_NVAR(&_46$$22);
 									ZVAL_DOUBLE(&_46$$22, zephir_get_doubleval(&_45$$22));
 									zephir_array_update_string(&headerParts, SL("quality"), &_46$$22, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+									zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 									ZEPHIR_OBS_NVAR(&_48$$23);
-									zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+									zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 									zephir_array_update_zval(&headerParts, &_48$$23, &_47$$23, PH_COPY | PH_SEPARATE);
 								}
 							} else {
@@ -203204,7 +203355,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 					}
 				}
 				ZEPHIR_INIT_NVAR(&headerPart);
-				zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1439);
+				zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1463);
 			ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -203215,57 +203366,57 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 
 static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders)
 {
-	zval headers, _6$$5, _37$$19;
-	zend_bool hasEventsManager = 0, _5, _10, _36, _23$$11;
-	zval resolved, eventsManager, container, exploded, digest, authHeader, server, _0, _9, _11, _1$$3, _2$$3, _3$$4, _4$$4, _7$$5, _8$$6, _12$$7, _13$$7, _14$$7, _15$$8, _16$$8, _17$$8, _18$$9, _19$$10, _20$$11, _21$$11, _22$$11, _24$$11, _25$$11, _26$$12, _27$$12, _28$$12, _29$$13, _30$$13, _31$$17, _32$$17, _33$$17, _34$$17, _35$$17, _38$$19, _39$$20;
+	zend_bool _4, _9, _35, _22$$11;
+	zval headers, _5$$5, _36$$19;
+	zval resolved, eventsManager, hasEventsManager, container, exploded, digest, authHeader, server, _0, _8, _10, _1$$3, _2$$4, _3$$4, _6$$5, _7$$6, _11$$7, _12$$7, _13$$7, _14$$8, _15$$8, _16$$8, _17$$9, _18$$10, _19$$11, _20$$11, _21$$11, _23$$11, _24$$11, _25$$12, _26$$12, _27$$12, _28$$13, _29$$13, _30$$17, _31$$17, _32$$17, _33$$17, _34$$17, _37$$19, _38$$20;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&resolved);
 	ZVAL_UNDEF(&eventsManager);
+	ZVAL_UNDEF(&hasEventsManager);
 	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&exploded);
 	ZVAL_UNDEF(&digest);
 	ZVAL_UNDEF(&authHeader);
 	ZVAL_UNDEF(&server);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_9);
-	ZVAL_UNDEF(&_11);
+	ZVAL_UNDEF(&_8);
+	ZVAL_UNDEF(&_10);
 	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$3);
+	ZVAL_UNDEF(&_2$$4);
 	ZVAL_UNDEF(&_3$$4);
-	ZVAL_UNDEF(&_4$$4);
-	ZVAL_UNDEF(&_7$$5);
-	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_7$$6);
+	ZVAL_UNDEF(&_11$$7);
 	ZVAL_UNDEF(&_12$$7);
 	ZVAL_UNDEF(&_13$$7);
-	ZVAL_UNDEF(&_14$$7);
+	ZVAL_UNDEF(&_14$$8);
 	ZVAL_UNDEF(&_15$$8);
 	ZVAL_UNDEF(&_16$$8);
-	ZVAL_UNDEF(&_17$$8);
-	ZVAL_UNDEF(&_18$$9);
-	ZVAL_UNDEF(&_19$$10);
+	ZVAL_UNDEF(&_17$$9);
+	ZVAL_UNDEF(&_18$$10);
+	ZVAL_UNDEF(&_19$$11);
 	ZVAL_UNDEF(&_20$$11);
 	ZVAL_UNDEF(&_21$$11);
-	ZVAL_UNDEF(&_22$$11);
+	ZVAL_UNDEF(&_23$$11);
 	ZVAL_UNDEF(&_24$$11);
-	ZVAL_UNDEF(&_25$$11);
+	ZVAL_UNDEF(&_25$$12);
 	ZVAL_UNDEF(&_26$$12);
 	ZVAL_UNDEF(&_27$$12);
-	ZVAL_UNDEF(&_28$$12);
+	ZVAL_UNDEF(&_28$$13);
 	ZVAL_UNDEF(&_29$$13);
-	ZVAL_UNDEF(&_30$$13);
+	ZVAL_UNDEF(&_30$$17);
 	ZVAL_UNDEF(&_31$$17);
 	ZVAL_UNDEF(&_32$$17);
 	ZVAL_UNDEF(&_33$$17);
 	ZVAL_UNDEF(&_34$$17);
-	ZVAL_UNDEF(&_35$$17);
-	ZVAL_UNDEF(&_38$$19);
-	ZVAL_UNDEF(&_39$$20);
-	ZVAL_UNDEF(&headers);
-	ZVAL_UNDEF(&_6$$5);
 	ZVAL_UNDEF(&_37$$19);
+	ZVAL_UNDEF(&_38$$20);
+	ZVAL_UNDEF(&headers);
+	ZVAL_UNDEF(&_5$$5);
+	ZVAL_UNDEF(&_36$$19);
 
 
 	ZEPHIR_MM_GROW();
@@ -203279,119 +203430,118 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders)
 	ZEPHIR_CPY_WRT(&container, &_0);
 	ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 338);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&container) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_2$$3);
-		ZVAL_STRING(&_2$$3, "eventsManager");
-		ZEPHIR_CALL_METHOD(&_1$$3, &container, "has", NULL, 0, &_2$$3);
+	if (Z_TYPE_P(&container) != IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_STRING(&_1$$3, "eventsManager");
+		ZEPHIR_CALL_METHOD(&hasEventsManager, &container, "has", NULL, 0, &_1$$3);
 		zephir_check_call_status();
-		hasEventsManager = zephir_get_boolval(&_1$$3);
-		if (hasEventsManager) {
-			ZEPHIR_INIT_VAR(&_4$$4);
-			ZVAL_STRING(&_4$$4, "eventsManager");
-			ZEPHIR_CALL_METHOD(&_3$$4, &container, "getshared", NULL, 0, &_4$$4);
+		if (zephir_is_true(&hasEventsManager)) {
+			ZEPHIR_INIT_VAR(&_3$$4);
+			ZVAL_STRING(&_3$$4, "eventsManager");
+			ZEPHIR_CALL_METHOD(&_2$$4, &container, "getshared", NULL, 0, &_3$$4);
 			zephir_check_call_status();
-			ZEPHIR_CPY_WRT(&eventsManager, &_3$$4);
+			ZEPHIR_CPY_WRT(&eventsManager, &_2$$4);
 		}
 	}
-	_5 = hasEventsManager;
-	if (_5) {
-		_5 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
+	_4 = zephir_is_true(&hasEventsManager);
+	if (_4) {
+		_4 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
 	}
-	if (_5) {
+	if (_4) {
+		ZEPHIR_INIT_VAR(&_5$$5);
+		zephir_create_array(&_5$$5, 1, 0);
+		zephir_array_update_string(&_5$$5, SL("server"), &server, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_6$$5);
-		zephir_create_array(&_6$$5, 1, 0);
-		zephir_array_update_string(&_6$$5, SL("server"), &server, PH_COPY | PH_SEPARATE);
-		ZEPHIR_INIT_VAR(&_7$$5);
-		ZVAL_STRING(&_7$$5, "request:beforeAuthorizationResolve");
-		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_7$$5, this_ptr, &_6$$5);
+		ZVAL_STRING(&_6$$5, "request:beforeAuthorizationResolve");
+		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_6$$5, this_ptr, &_5$$5);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&resolved) == IS_ARRAY) {
-			ZEPHIR_INIT_VAR(&_8$$6);
-			zephir_fast_array_merge(&_8$$6, &headers, &resolved);
-			ZEPHIR_CPY_WRT(&headers, &_8$$6);
+			ZEPHIR_INIT_VAR(&_7$$6);
+			zephir_fast_array_merge(&_7$$6, &headers, &resolved);
+			ZEPHIR_CPY_WRT(&headers, &_7$$6);
 		}
 	}
-	ZEPHIR_INIT_VAR(&_9);
-	ZVAL_STRING(&_9, "PHP_AUTH_USER");
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 336, &_9);
+	ZEPHIR_INIT_VAR(&_8);
+	ZVAL_STRING(&_8, "PHP_AUTH_USER");
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 336, &_8);
 	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, 336, &_9);
+	_9 = zephir_is_true(&_0);
+	if (_9) {
+		ZEPHIR_INIT_NVAR(&_8);
+		ZVAL_STRING(&_8, "PHP_AUTH_PW");
+		ZEPHIR_CALL_METHOD(&_10, this_ptr, "hasserver", NULL, 336, &_8);
 		zephir_check_call_status();
-		_10 = zephir_is_true(&_11);
+		_9 = zephir_is_true(&_10);
 	}
-	if (_10) {
-		ZEPHIR_INIT_VAR(&_13$$7);
-		ZVAL_STRING(&_13$$7, "PHP_AUTH_USER");
-		ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getserver", NULL, 0, &_13$$7);
+	if (_9) {
+		ZEPHIR_INIT_VAR(&_12$$7);
+		ZVAL_STRING(&_12$$7, "PHP_AUTH_USER");
+		ZEPHIR_CALL_METHOD(&_11$$7, this_ptr, "getserver", NULL, 0, &_12$$7);
 		zephir_check_call_status();
-		zephir_array_update_string(&headers, SL("Php-Auth-User"), &_12$$7, PH_COPY | PH_SEPARATE);
-		ZEPHIR_INIT_NVAR(&_13$$7);
-		ZVAL_STRING(&_13$$7, "PHP_AUTH_PW");
-		ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "getserver", NULL, 0, &_13$$7);
+		zephir_array_update_string(&headers, SL("Php-Auth-User"), &_11$$7, PH_COPY | PH_SEPARATE);
+		ZEPHIR_INIT_NVAR(&_12$$7);
+		ZVAL_STRING(&_12$$7, "PHP_AUTH_PW");
+		ZEPHIR_CALL_METHOD(&_13$$7, this_ptr, "getserver", NULL, 0, &_12$$7);
 		zephir_check_call_status();
-		zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_14$$7, PH_COPY | PH_SEPARATE);
+		zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_13$$7, PH_COPY | PH_SEPARATE);
 	} else {
-		ZEPHIR_INIT_VAR(&_16$$8);
-		ZVAL_STRING(&_16$$8, "HTTP_AUTHORIZATION");
-		ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 336, &_16$$8);
+		ZEPHIR_INIT_VAR(&_15$$8);
+		ZVAL_STRING(&_15$$8, "HTTP_AUTHORIZATION");
+		ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "hasserver", NULL, 336, &_15$$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, 336, &_16$$8);
+		ZEPHIR_INIT_NVAR(&_15$$8);
+		ZVAL_STRING(&_15$$8, "REDIRECT_HTTP_AUTHORIZATION");
+		ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "hasserver", NULL, 336, &_15$$8);
 		zephir_check_call_status();
-		if (zephir_is_true(&_15$$8)) {
-			ZEPHIR_INIT_VAR(&_18$$9);
-			ZVAL_STRING(&_18$$9, "HTTP_AUTHORIZATION");
-			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_18$$9);
+		if (zephir_is_true(&_14$$8)) {
+			ZEPHIR_INIT_VAR(&_17$$9);
+			ZVAL_STRING(&_17$$9, "HTTP_AUTHORIZATION");
+			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_17$$9);
 			zephir_check_call_status();
-		} else if (zephir_is_true(&_17$$8)) {
-			ZEPHIR_INIT_VAR(&_19$$10);
-			ZVAL_STRING(&_19$$10, "REDIRECT_HTTP_AUTHORIZATION");
-			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_19$$10);
+		} else if (zephir_is_true(&_16$$8)) {
+			ZEPHIR_INIT_VAR(&_18$$10);
+			ZVAL_STRING(&_18$$10, "REDIRECT_HTTP_AUTHORIZATION");
+			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_18$$10);
 			zephir_check_call_status();
 		}
 		if (zephir_is_true(&authHeader)) {
-			ZEPHIR_INIT_VAR(&_20$$11);
-			ZVAL_STRING(&_20$$11, "basic ");
-			ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 341, &authHeader, &_20$$11);
+			ZEPHIR_INIT_VAR(&_19$$11);
+			ZVAL_STRING(&_19$$11, "basic ");
+			ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 341, &authHeader, &_19$$11);
 			zephir_check_call_status();
-			ZEPHIR_INIT_NVAR(&_20$$11);
-			ZVAL_STRING(&_20$$11, "digest ");
-			ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 341, &authHeader, &_20$$11);
+			ZEPHIR_INIT_NVAR(&_19$$11);
+			ZVAL_STRING(&_19$$11, "digest ");
+			ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 341, &authHeader, &_19$$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, 336, &_20$$11);
+			_22$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0);
+			if (_22$$11) {
+				ZEPHIR_INIT_NVAR(&_19$$11);
+				ZVAL_STRING(&_19$$11, "PHP_AUTH_DIGEST");
+				ZEPHIR_CALL_METHOD(&_23$$11, this_ptr, "hasserver", NULL, 336, &_19$$11);
 				zephir_check_call_status();
-				_23$$11 = !zephir_is_true(&_24$$11);
+				_22$$11 = !zephir_is_true(&_23$$11);
 			}
-			ZEPHIR_INIT_NVAR(&_20$$11);
-			ZVAL_STRING(&_20$$11, "bearer ");
-			ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 341, &authHeader, &_20$$11);
+			ZEPHIR_INIT_NVAR(&_19$$11);
+			ZVAL_STRING(&_19$$11, "bearer ");
+			ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 341, &authHeader, &_19$$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, 226, &_27$$12);
+			if (ZEPHIR_IS_LONG_IDENTICAL(&_20$$11, 0)) {
+				ZVAL_LONG(&_25$$12, 6);
+				ZEPHIR_INIT_VAR(&_26$$12);
+				zephir_substr(&_26$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
+				ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 226, &_26$$12);
 				zephir_check_call_status();
 				ZEPHIR_INIT_VAR(&exploded);
-				zephir_fast_explode_str(&exploded, SL(":"), &_28$$12, 2 );
+				zephir_fast_explode_str(&exploded, SL(":"), &_27$$12, 2 );
 				if (zephir_fast_count_int(&exploded) == 2) {
-					zephir_array_fetch_long(&_29$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1501);
-					zephir_array_update_string(&headers, SL("Php-Auth-User"), &_29$$13, PH_COPY | PH_SEPARATE);
-					zephir_array_fetch_long(&_30$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1502);
-					zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_30$$13, PH_COPY | PH_SEPARATE);
+					zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1525);
+					zephir_array_update_string(&headers, SL("Php-Auth-User"), &_28$$13, PH_COPY | PH_SEPARATE);
+					zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1526);
+					zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_29$$13, PH_COPY | PH_SEPARATE);
 				}
-			} else if (_23$$11) {
+			} else if (_22$$11) {
 				zephir_array_update_string(&headers, SL("Php-Auth-Digest"), &authHeader, PH_COPY | PH_SEPARATE);
-			} else if (ZEPHIR_IS_LONG_IDENTICAL(&_25$$11, 0)) {
+			} else if (ZEPHIR_IS_LONG_IDENTICAL(&_24$$11, 0)) {
 				zephir_array_update_string(&headers, SL("Authorization"), &authHeader, PH_COPY | PH_SEPARATE);
 			}
 		}
@@ -203399,36 +203549,36 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders)
 	if (!(zephir_array_isset_string(&headers, SL("Authorization")))) {
 		ZEPHIR_OBS_VAR(&digest);
 		if (zephir_array_isset_string(&headers, SL("Php-Auth-User"))) {
-			zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1514);
-			zephir_array_fetch_string(&_32$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1514);
-			ZEPHIR_INIT_VAR(&_33$$17);
-			ZEPHIR_CONCAT_VSV(&_33$$17, &_31$$17, ":", &_32$$17);
-			ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 227, &_33$$17);
-			zephir_check_call_status();
-			ZEPHIR_INIT_VAR(&_35$$17);
-			ZEPHIR_CONCAT_SV(&_35$$17, "Basic ", &_34$$17);
-			zephir_array_update_string(&headers, SL("Authorization"), &_35$$17, PH_COPY | PH_SEPARATE);
+			zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1538);
+			zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1538);
+			ZEPHIR_INIT_VAR(&_32$$17);
+			ZEPHIR_CONCAT_VSV(&_32$$17, &_30$$17, ":", &_31$$17);
+			ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 227, &_32$$17);
+			zephir_check_call_status();
+			ZEPHIR_INIT_VAR(&_34$$17);
+			ZEPHIR_CONCAT_SV(&_34$$17, "Basic ", &_33$$17);
+			zephir_array_update_string(&headers, SL("Authorization"), &_34$$17, PH_COPY | PH_SEPARATE);
 		} else if (zephir_array_isset_string_fetch(&digest, &headers, SL("Php-Auth-Digest"), 0)) {
 			zephir_array_update_string(&headers, SL("Authorization"), &digest, PH_COPY | PH_SEPARATE);
 		}
 	}
-	_36 = hasEventsManager;
-	if (_36) {
-		_36 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
+	_35 = zephir_is_true(&hasEventsManager);
+	if (_35) {
+		_35 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
 	}
-	if (_36) {
+	if (_35) {
+		ZEPHIR_INIT_VAR(&_36$$19);
+		zephir_create_array(&_36$$19, 2, 0);
+		zephir_array_update_string(&_36$$19, SL("headers"), &headers, PH_COPY | PH_SEPARATE);
+		zephir_array_update_string(&_36$$19, SL("server"), &server, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_37$$19);
-		zephir_create_array(&_37$$19, 2, 0);
-		zephir_array_update_string(&_37$$19, SL("headers"), &headers, PH_COPY | PH_SEPARATE);
-		zephir_array_update_string(&_37$$19, SL("server"), &server, PH_COPY | PH_SEPARATE);
-		ZEPHIR_INIT_VAR(&_38$$19);
-		ZVAL_STRING(&_38$$19, "request:afterAuthorizationResolve");
-		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_38$$19, this_ptr, &_37$$19);
+		ZVAL_STRING(&_37$$19, "request:afterAuthorizationResolve");
+		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_37$$19, this_ptr, &_36$$19);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&resolved) == IS_ARRAY) {
-			ZEPHIR_INIT_VAR(&_39$$20);
-			zephir_fast_array_merge(&_39$$20, &headers, &resolved);
-			ZEPHIR_CPY_WRT(&headers, &_39$$20);
+			ZEPHIR_INIT_VAR(&_38$$20);
+			zephir_fast_array_merge(&_38$$20, &headers, &resolved);
+			ZEPHIR_CPY_WRT(&headers, &_38$$20);
 		}
 	}
 	RETURN_CTOR(&headers);
@@ -203500,7 +203650,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 
 	ZEPHIR_INIT_VAR(&files);
 	array_init(&files);
-	zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1578);
+	zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1602);
 	if (Z_TYPE_P(&names) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&names), _2, _3, _0)
 		{
@@ -203519,35 +203669,35 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 				zephir_create_array(&_4$$4, 6, 0);
 				zephir_array_update_string(&_4$$4, SL("name"), &name, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1554);
+				zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1578);
 				zephir_array_update_string(&_4$$4, SL("type"), &_5$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1555);
+				zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1579);
 				zephir_array_update_string(&_4$$4, SL("tmp_name"), &_5$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1556);
+				zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1580);
 				zephir_array_update_string(&_4$$4, SL("size"), &_5$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1557);
+				zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1581);
 				zephir_array_update_string(&_4$$4, SL("error"), &_5$$4, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_4$$4, SL("key"), &p, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1559);
+				zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1583);
 			}
 			if (Z_TYPE_P(&name) == IS_ARRAY) {
-				zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1564);
-				zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1565);
-				zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566);
-				zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1567);
-				zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1568);
+				zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1588);
+				zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1589);
+				zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1590);
+				zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1591);
+				zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1592);
 				ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 344, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p);
 				zephir_check_call_status();
-				zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1575);
+				zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1599);
 				if (Z_TYPE_P(&parentFiles) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _12$$5)
 					{
 						ZEPHIR_INIT_NVAR(&file);
 						ZVAL_COPY(&file, _12$$5);
-						zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+						zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 					} ZEND_HASH_FOREACH_END();
 				} else {
 					ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0);
@@ -203560,7 +203710,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 						}
 						ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0);
 						zephir_check_call_status();
-							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 						ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0);
 						zephir_check_call_status();
 					}
@@ -203588,35 +203738,35 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 					zephir_create_array(&_14$$9, 6, 0);
 					zephir_array_update_string(&_14$$9, SL("name"), &name, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1554);
+					zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1578);
 					zephir_array_update_string(&_14$$9, SL("type"), &_15$$9, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1555);
+					zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1579);
 					zephir_array_update_string(&_14$$9, SL("tmp_name"), &_15$$9, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1556);
+					zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1580);
 					zephir_array_update_string(&_14$$9, SL("size"), &_15$$9, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1557);
+					zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1581);
 					zephir_array_update_string(&_14$$9, SL("error"), &_15$$9, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_14$$9, SL("key"), &p, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1559);
+					zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1583);
 				}
 				if (Z_TYPE_P(&name) == IS_ARRAY) {
-					zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1564);
-					zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1565);
-					zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566);
-					zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1567);
-					zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1568);
+					zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1588);
+					zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1589);
+					zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1590);
+					zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1591);
+					zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1592);
 					ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 344, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p);
 					zephir_check_call_status();
-					zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1575);
+					zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1599);
 					if (Z_TYPE_P(&parentFiles) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _21$$10)
 						{
 							ZEPHIR_INIT_NVAR(&file);
 							ZVAL_COPY(&file, _21$$10);
-							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 						} ZEND_HASH_FOREACH_END();
 					} else {
 						ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0);
@@ -203629,7 +203779,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 							}
 							ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0);
 							zephir_check_call_status();
-								zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+								zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 							ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0);
 							zephir_check_call_status();
 						}
@@ -203667,8 +203817,8 @@ static PHP_METHOD(Phalcon_Http_Request, getFilterService)
 	if (Z_TYPE_P(&filterService) != IS_OBJECT) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_1$$3);
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1596);
+		if (Z_TYPE_P(&container) == IS_NULL) {
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1620);
 			return;
 		}
 		ZEPHIR_INIT_VAR(&_3$$3);
@@ -203694,10 +203844,9 @@ static PHP_METHOD(Phalcon_Http_Request, getServerArray)
 	if (zephir_is_true(&_SERVER)) {
 		RETVAL_ZVAL(&_SERVER, 1, 0);
 		return;
-	} else {
-		array_init(return_value);
-		return;
 	}
+	array_init(return_value);
+	return;
 }
 
 zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type)
@@ -203964,10 +204113,10 @@ static PHP_METHOD(Phalcon_Http_Response, getDI)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'url' service", "phalcon/Http/Response.zep", 147);
 			return;
 		}
@@ -205819,33 +205968,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Request_File)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Http_Request_File, getError)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "error");
-}
-
-static PHP_METHOD(Phalcon_Http_Request_File, getExtension)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "extension");
-}
-
-static PHP_METHOD(Phalcon_Http_Request_File, getKey)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "key");
-}
-
 static PHP_METHOD(Phalcon_Http_Request_File, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -205926,6 +206048,33 @@ static PHP_METHOD(Phalcon_Http_Request_File, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Http_Request_File, getError)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "error");
+}
+
+static PHP_METHOD(Phalcon_Http_Request_File, getExtension)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "extension");
+}
+
+static PHP_METHOD(Phalcon_Http_Request_File, getKey)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "key");
+}
+
 static PHP_METHOD(Phalcon_Http_Request_File, getName)
 {
 	zval *this_ptr = getThis();
@@ -206632,7 +206781,7 @@ static PHP_METHOD(Phalcon_Http_Response_Cookies, set)
 	if (ZEPHIR_IS_FALSE_IDENTICAL(&_10)) {
 		zephir_read_property(&_11$$6, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_11$$6);
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_cookie_exception_ce, "A dependency injection container is required to access the 'response' service", "phalcon/Http/Response/Cookies.zep", 311);
 			return;
 		}
@@ -208879,15 +209028,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "workFactor");
-}
-
 static PHP_METHOD(Phalcon_Encryption_Security, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -209397,6 +209537,15 @@ static PHP_METHOD(Phalcon_Encryption_Security, getTokenKey)
 	RETURN_MM_MEMBER(getThis(), "tokenKey");
 }
 
+static PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "workFactor");
+}
+
 static PHP_METHOD(Phalcon_Encryption_Security, hash)
 {
 	zend_bool legacy = 0;
@@ -211775,7 +211924,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY);
 	if (ZEPHIR_IS_EMPTY(&_0)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (empty)", "phalcon/Encryption/Security/JWT/Builder.zep", 197);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (empty)", "phalcon/Encryption/Security/JWT/Builder.zep", 199);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "getclaims", NULL, 0);
@@ -211857,7 +212006,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setAudience)
 		_0 = Z_TYPE_P(audience) != IS_ARRAY;
 	}
 	if (_0) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Audience", "phalcon/Encryption/Security/JWT/Builder.zep", 247);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Audience", "phalcon/Encryption/Security/JWT/Builder.zep", 249);
 		return;
 	}
 	if (Z_TYPE_P(audience) == IS_STRING) {
@@ -211932,7 +212081,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setExpirationTime)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_time(&_0);
 	if (ZEPHIR_GT_LONG(&_0, timestamp)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Expiration Time", "phalcon/Encryption/Security/JWT/Builder.zep", 292);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Expiration Time", "phalcon/Encryption/Security/JWT/Builder.zep", 294);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_1);
@@ -212083,7 +212232,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setNotBefore)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_time(&_0);
 	if (ZEPHIR_LT_LONG(&_0, timestamp)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Not Before", "phalcon/Encryption/Security/JWT/Builder.zep", 366);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid Not Before", "phalcon/Encryption/Security/JWT/Builder.zep", 368);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_1);
@@ -212173,7 +212322,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, setPassphrase)
 	ZVAL_STRING(&_3, "/(?=^.{16,}$)((?=.*\\d)|(?=.*\\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/");
 	zephir_preg_match(&_2, &_3, &passphrase, &_0, 0, 0 , 0 );
 	if (!(zephir_is_true(&_2))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (too weak)", "phalcon/Encryption/Security/JWT/Builder.zep", 404);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Invalid passphrase (too weak)", "phalcon/Encryption/Security/JWT/Builder.zep", 406);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("passphrase"), &passphrase);
@@ -212326,7 +212475,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encode)
 		ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3);
 		ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 192, &_5$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$3, "phalcon/Encryption/Security/JWT/Builder.zep", 451);
+		zephir_throw_exception_debug(&_3$$3, "phalcon/Encryption/Security/JWT/Builder.zep", 453);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -212347,8 +212496,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Validator)
 {
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Encryption\\Security\\JWT, Validator, phalcon, encryption_security_jwt_validator, phalcon_encryption_security_jwt_validator_method_entry, 0);
 
+	zend_declare_property_null(phalcon_encryption_security_jwt_validator_ce, SL("errors"), ZEND_ACC_PRIVATE);
 	zend_declare_property_long(phalcon_encryption_security_jwt_validator_ce, SL("timeShift"), 0, ZEND_ACC_PRIVATE);
 	zend_declare_property_null(phalcon_encryption_security_jwt_validator_ce, SL("token"), ZEND_ACC_PRIVATE);
+	phalcon_encryption_security_jwt_validator_ce->create_object = zephir_init_properties_Phalcon_Encryption_Security_JWT_Validator;
+
 	return SUCCESS;
 }
 
@@ -212384,6 +212536,15 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, __construct)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("timeShift"), &_0);
 }
 
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getErrors)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "errors");
+}
+
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken)
 {
 	zval *token, token_sub;
@@ -212407,71 +212568,115 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken)
 
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateAudience)
 {
+	zend_bool _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *audience_param = NULL, _0, _1, _2, _3, _4;
-	zval audience;
+	zval *audience = NULL, audience_sub, item, tokenAudience, _2, _3, _4, _5, *_6, _7, _1$$4, _8$$6, _9$$8;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&audience);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&audience_sub);
+	ZVAL_UNDEF(&item);
+	ZVAL_UNDEF(&tokenAudience);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_1$$4);
+	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_9$$8);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(audience)
+		Z_PARAM_ZVAL(audience)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &audience_param);
-	if (UNEXPECTED(Z_TYPE_P(audience_param) != IS_STRING && Z_TYPE_P(audience_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'audience' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(audience_param) == IS_STRING)) {
-		zephir_get_strval(&audience, audience_param);
-	} else {
-		ZEPHIR_INIT_VAR(&audience);
-	}
+	zephir_fetch_params(1, 1, 0, &audience);
+	ZEPHIR_SEPARATE_PARAM(audience);
 
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CALL_METHOD(&_1, &_0, "getclaims", NULL, 0);
+	_0 = Z_TYPE_P(audience) != IS_STRING;
+	if (_0) {
+		_0 = Z_TYPE_P(audience) != IS_ARRAY;
+	}
+	if (_0) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Audience must be a string or an array", "phalcon/Encryption/Security/JWT/Validator.zep", 83);
+		return;
+	}
+	if (Z_TYPE_P(audience) == IS_STRING) {
+		ZEPHIR_INIT_VAR(&_1$$4);
+		zephir_create_array(&_1$$4, 1, 0);
+		zephir_array_fast_append(&_1$$4, audience);
+		ZEPHIR_CPY_WRT(audience, &_1$$4);
+	}
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_3, &_2, "getclaims", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_3);
-	array_init(&_3);
 	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "aud");
-	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_4, &_3);
+	array_init(&_4);
+	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_STRING(&_5, "aud");
+	ZEPHIR_CALL_METHOD(&tokenAudience, &_3, "get", NULL, 0, &_5, &_4);
 	zephir_check_call_status();
-	if (!(zephir_fast_in_array(&audience, &_2))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: audience not allowed", "phalcon/Encryption/Security/JWT/Validator.zep", 71);
-		return;
+	zephir_is_iterable(audience, 0, "phalcon/Encryption/Security/JWT/Validator.zep", 98);
+	if (Z_TYPE_P(audience) == IS_ARRAY) {
+		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(audience), _6)
+		{
+			ZEPHIR_INIT_NVAR(&item);
+			ZVAL_COPY(&item, _6);
+			if (1 != zephir_fast_in_array(&item, &tokenAudience)) {
+				ZEPHIR_INIT_ZVAL_NREF(_8$$6);
+				ZEPHIR_INIT_NVAR(&_8$$6);
+				ZVAL_STRING(&_8$$6, "Validation: audience not allowed");
+				zephir_update_property_array_append(this_ptr, SL("errors"), &_8$$6);
+			}
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		ZEPHIR_CALL_METHOD(NULL, audience, "rewind", NULL, 0);
+		zephir_check_call_status();
+		while (1) {
+			ZEPHIR_CALL_METHOD(&_7, audience, "valid", NULL, 0);
+			zephir_check_call_status();
+			if (!zend_is_true(&_7)) {
+				break;
+			}
+			ZEPHIR_CALL_METHOD(&item, audience, "current", NULL, 0);
+			zephir_check_call_status();
+				if (1 != zephir_fast_in_array(&item, &tokenAudience)) {
+					ZEPHIR_INIT_ZVAL_NREF(_9$$8);
+					ZEPHIR_INIT_NVAR(&_9$$8);
+					ZVAL_STRING(&_9$$8, "Validation: audience not allowed");
+					zephir_update_property_array_append(this_ptr, SL("errors"), &_9$$8);
+				}
+			ZEPHIR_CALL_METHOD(NULL, audience, "next", NULL, 0);
+			zephir_check_call_status();
+		}
 	}
+	ZEPHIR_INIT_NVAR(&item);
 	RETURN_THIS();
 }
 
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration)
 {
-	zend_bool _4;
+	zend_bool _7;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *timestamp_param = NULL, _0, _1, _2, _3, _5, _6, _7, _8;
-	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS;
+	zval *timestamp_param = NULL, _0, _1, _2, _3, _4, _5, _6, _8, _9, _10$$3;
+	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS, tokenExpirationTime = 0;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
-	ZVAL_UNDEF(&_7);
 	ZVAL_UNDEF(&_8);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_10$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -212490,25 +212695,28 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration)
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "exp");
-	ZEPHIR_CALL_METHOD(&_2, &_1, "has", NULL, 0, &_3);
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
-	_4 = zephir_is_true(&_2);
-	if (_4) {
-		ZVAL_LONG(&_6, timestamp);
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 264, &_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);
-		zephir_check_call_status();
-		ZEPHIR_INIT_NVAR(&_3);
-		ZVAL_STRING(&_3, "exp");
-		ZEPHIR_CALL_METHOD(&_8, &_7, "get", NULL, 0, &_3);
+	tokenExpirationTime = zephir_get_intval(&_2);
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_5, &_4, "getclaims", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_INIT_NVAR(&_3);
+	ZVAL_STRING(&_3, "exp");
+	ZEPHIR_CALL_METHOD(&_6, &_5, "has", NULL, 0, &_3);
+	zephir_check_call_status();
+	_7 = zephir_is_true(&_6);
+	if (_7) {
+		ZVAL_LONG(&_9, timestamp);
+		ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 264, &_9);
 		zephir_check_call_status();
-		_4 = ZEPHIR_GE_LONG(&_5, zephir_get_intval(&_8));
+		_7 = ZEPHIR_LT_LONG(&_8, tokenExpirationTime);
 	}
-	if (_4) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the token has expired", "phalcon/Encryption/Security/JWT/Validator.zep", 91);
-		return;
+	if (_7) {
+		ZEPHIR_INIT_ZVAL_NREF(_10$$3);
+		ZEPHIR_INIT_VAR(&_10$$3);
+		ZVAL_STRING(&_10$$3, "Validation: the token has expired");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_10$$3);
 	}
 	RETURN_THIS();
 }
@@ -212517,16 +212725,18 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *id_param = NULL, _0, _1, _2, _3;
+	zval *id_param = NULL, tokenId, _0, _1, _2, _3, _5$$3;
 	zval id, _4;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&id);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&tokenId);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_5$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -212537,15 +212747,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 1, 0, &id_param);
-	if (UNEXPECTED(Z_TYPE_P(id_param) != IS_STRING && Z_TYPE_P(id_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'id' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(id_param) == IS_STRING)) {
-		zephir_get_strval(&id, id_param);
-	} else {
-		ZEPHIR_INIT_VAR(&id);
-	}
+	zephir_get_strval(&id, id_param);
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
@@ -212556,9 +212758,12 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
 	zephir_cast_to_string(&_4, &_2);
-	if (!ZEPHIR_IS_IDENTICAL(&id, &_4)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: incorrect Id", "phalcon/Encryption/Security/JWT/Validator.zep", 108);
-		return;
+	ZEPHIR_CPY_WRT(&tokenId, &_4);
+	if (!ZEPHIR_IS_IDENTICAL(&id, &tokenId)) {
+		ZEPHIR_INIT_ZVAL_NREF(_5$$3);
+		ZEPHIR_INIT_VAR(&_5$$3);
+		ZVAL_STRING(&_5$$3, "Validation: incorrect Id");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_5$$3);
 	}
 	RETURN_THIS();
 }
@@ -212566,8 +212771,8 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateId)
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *timestamp_param = NULL, _0, _1, _2, _3, _4;
-	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS;
+	zval *timestamp_param = NULL, _0, _1, _2, _3, _4, _5, _6$$3;
+	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS, tokenIssuedAt = 0;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -212575,6 +212780,8 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -212588,19 +212795,22 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt)
 	timestamp = zephir_get_intval(timestamp_param);
 
 
-	ZVAL_LONG(&_1, timestamp);
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 264, &_1);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_1, &_0, "getclaims", NULL, 0);
 	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);
+	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_STRING(&_3, "iat");
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "iat");
-	ZEPHIR_CALL_METHOD(&_3, &_2, "get", NULL, 0, &_4);
+	tokenIssuedAt = zephir_get_intval(&_2);
+	ZVAL_LONG(&_5, timestamp);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 264, &_5);
 	zephir_check_call_status();
-	if (ZEPHIR_LE_LONG(&_0, zephir_get_intval(&_3))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the token cannot be used yet (future)", "phalcon/Encryption/Security/JWT/Validator.zep", 125);
-		return;
+	if (ZEPHIR_LE_LONG(&_4, tokenIssuedAt)) {
+		ZEPHIR_INIT_ZVAL_NREF(_6$$3);
+		ZEPHIR_INIT_VAR(&_6$$3);
+		ZVAL_STRING(&_6$$3, "Validation: the token cannot be used yet (future)");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_6$$3);
 	}
 	RETURN_THIS();
 }
@@ -212609,16 +212819,18 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *issuer_param = NULL, _0, _1, _2, _3;
+	zval *issuer_param = NULL, tokenIssuer, _0, _1, _2, _3, _5$$3;
 	zval issuer, _4;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&issuer);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&tokenIssuer);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_5$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -212648,9 +212860,12 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer)
 	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
 	zephir_cast_to_string(&_4, &_2);
-	if (!ZEPHIR_IS_IDENTICAL(&issuer, &_4)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: incorrect issuer", "phalcon/Encryption/Security/JWT/Validator.zep", 142);
-		return;
+	ZEPHIR_CPY_WRT(&tokenIssuer, &_4);
+	if (!ZEPHIR_IS_IDENTICAL(&issuer, &tokenIssuer)) {
+		ZEPHIR_INIT_ZVAL_NREF(_5$$3);
+		ZEPHIR_INIT_VAR(&_5$$3);
+		ZVAL_STRING(&_5$$3, "Validation: incorrect issuer");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_5$$3);
 	}
 	RETURN_THIS();
 }
@@ -212658,8 +212873,8 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer)
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *timestamp_param = NULL, _0, _1, _2, _3, _4;
-	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS;
+	zval *timestamp_param = NULL, _0, _1, _2, _3, _4, _5, _6$$3;
+	zend_long timestamp, ZEPHIR_LAST_CALL_STATUS, tokenNotBefore = 0;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -212667,6 +212882,8 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -212680,19 +212897,22 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore)
 	timestamp = zephir_get_intval(timestamp_param);
 
 
-	ZVAL_LONG(&_1, timestamp);
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 264, &_1);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_1, &_0, "getclaims", NULL, 0);
 	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);
+	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_STRING(&_3, "nbf");
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "nbf");
-	ZEPHIR_CALL_METHOD(&_3, &_2, "get", NULL, 0, &_4);
+	tokenNotBefore = zephir_get_intval(&_2);
+	ZVAL_LONG(&_5, timestamp);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 264, &_5);
 	zephir_check_call_status();
-	if (ZEPHIR_LE_LONG(&_0, zephir_get_intval(&_3))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the token cannot be used yet (not before)", "phalcon/Encryption/Security/JWT/Validator.zep", 159);
-		return;
+	if (ZEPHIR_LE_LONG(&_4, tokenNotBefore)) {
+		ZEPHIR_INIT_ZVAL_NREF(_6$$3);
+		ZEPHIR_INIT_VAR(&_6$$3);
+		ZVAL_STRING(&_6$$3, "Validation: the token cannot be used yet (not before)");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_6$$3);
 	}
 	RETURN_THIS();
 }
@@ -212702,7 +212922,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature)
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval passphrase;
-	zval *signer, signer_sub, *passphrase_param = NULL, _0, _1, _2, _3, _4, _5;
+	zval *signer, signer_sub, *passphrase_param = NULL, _0, _1, _2, _3, _4, _5, _6$$3;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&signer_sub);
@@ -212712,6 +212932,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6$$3);
 	ZVAL_UNDEF(&passphrase);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
@@ -212737,9 +212958,11 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, signer, "verify", NULL, 0, &_3, &_5, &passphrase);
 	zephir_check_call_status();
-	if (!zephir_is_true(&_0)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, "Validation: the signature does not match", "phalcon/Encryption/Security/JWT/Validator.zep", 183);
-		return;
+	if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) {
+		ZEPHIR_INIT_ZVAL_NREF(_6$$3);
+		ZEPHIR_INIT_VAR(&_6$$3);
+		ZVAL_STRING(&_6$$3, "Validation: the signature does not match");
+		zephir_update_property_array_append(this_ptr, SL("errors"), &_6$$3);
 	}
 	RETURN_THIS();
 }
@@ -212767,6 +212990,30 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getTimestamp)
 	RETURN_LONG((timestamp + zephir_get_numberval(&_0)));
 }
 
+zend_object *zephir_init_properties_Phalcon_Encryption_Security_JWT_Validator(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("errors"), 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("errors"), &_1$$3);
+		}
+		ZEPHIR_MM_RESTORE();
+		return Z_OBJ_P(this_ptr);
+	}
+}
+
 
 
 
@@ -213086,11 +213333,11 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse)
 	ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 258, &token);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&encodedHeaders);
-	zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 33);
+	zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 37);
 	ZEPHIR_OBS_VAR(&encodedClaims);
-	zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 34);
+	zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 38);
 	ZEPHIR_OBS_VAR(&encodedSignature);
-	zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 35);
+	zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 39);
 	ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 259, &encodedHeaders);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 260, &encodedClaims);
@@ -213139,20 +213386,20 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims)
 	ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 263, &_0, &_1);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&decoded) != IS_ARRAY) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 59);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 63);
 		return;
 	}
 	_2 = zephir_array_isset_string(&decoded, SL("aud"));
 	if (_2) {
 		ZEPHIR_OBS_VAR(&_3);
-		zephir_array_fetch_string(&_3, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 65);
+		zephir_array_fetch_string(&_3, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 69);
 		_2 = Z_TYPE_P(&_3) != IS_ARRAY;
 	}
 	if (_2) {
 		ZEPHIR_INIT_VAR(&_4$$4);
 		zephir_create_array(&_4$$4, 1, 0);
 		ZEPHIR_OBS_VAR(&_5$$4);
-		zephir_array_fetch_string(&_5$$4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 66);
+		zephir_array_fetch_string(&_5$$4, &decoded, SL("aud"), PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 70);
 		zephir_array_fast_append(&_4$$4, &_5$$4);
 		zephir_array_update_string(&decoded, SL("aud"), &_4$$4, PH_COPY | PH_SEPARATE);
 	}
@@ -213193,11 +213440,11 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders)
 	ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 263, &_0, &_1);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&decoded) != IS_ARRAY) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 88);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 92);
 		return;
 	}
 	if (!(zephir_array_isset_string(&decoded, SL("typ")))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (missing 'typ' element)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 94);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (missing 'typ' element)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 98);
 		return;
 	}
 	object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce);
@@ -213290,7 +213537,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parseToken)
 	ZEPHIR_INIT_VAR(&parts);
 	zephir_fast_explode_str(&parts, SL("."), &token, LONG_MAX);
 	if (zephir_fast_count_int(&parts) != 3) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid JWT string (dots misalignment)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 140);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid JWT string (dots misalignment)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 144);
 		return;
 	}
 	RETURN_CCTOR(&parts);
@@ -213370,7 +213617,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decode)
 		ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3);
 		ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 192, &_6$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_4$$3, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 163);
+		zephir_throw_exception_debug(&_4$$3, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 167);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -213552,33 +213799,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Token)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getClaims)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "claims");
-}
-
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "headers");
-}
-
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "signature");
-}
-
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct)
 {
 	zval *headers, headers_sub, *claims, claims_sub, *signature, signature_sub;
@@ -213605,6 +213825,24 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("signature"), signature);
 }
 
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getClaims)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "claims");
+}
+
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "headers");
+}
+
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getPayload)
 {
 	zval _0, _1, _2, _3;
@@ -213630,6 +213868,15 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getPayload)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "signature");
+}
+
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getToken)
 {
 	zval _0, _1, _2;
@@ -213654,6 +213901,144 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getToken)
 	RETURN_MM();
 }
 
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, validate)
+{
+	zend_string *_3;
+	zend_ulong _2;
+	zval methods;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *validator, validator_sub, claimId, method, *_0, _1, _4$$3, _5$$3, _6$$4, _7$$4;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&validator_sub);
+	ZVAL_UNDEF(&claimId);
+	ZVAL_UNDEF(&method);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_4$$3);
+	ZVAL_UNDEF(&_5$$3);
+	ZVAL_UNDEF(&_6$$4);
+	ZVAL_UNDEF(&_7$$4);
+	ZVAL_UNDEF(&methods);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJECT_OF_CLASS(validator, phalcon_encryption_security_jwt_validator_ce)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &validator);
+
+
+	ZEPHIR_INIT_VAR(&methods);
+	zephir_create_array(&methods, 6, 0);
+	add_assoc_stringl_ex(&methods, SL("validateAudience"), SL("aud"));
+	add_assoc_stringl_ex(&methods, SL("validateExpiration"), SL("exp"));
+	add_assoc_stringl_ex(&methods, SL("validateId"), SL("jti"));
+	add_assoc_stringl_ex(&methods, SL("validateIssuedAt"), SL("iat"));
+	add_assoc_stringl_ex(&methods, SL("validateIssuer"), SL("iss"));
+	add_assoc_stringl_ex(&methods, SL("validateNotBefore"), SL("nbf"));
+	zephir_is_iterable(&methods, 0, "phalcon/Encryption/Security/JWT/Token/Token.zep", 125);
+	if (Z_TYPE_P(&methods) == IS_ARRAY) {
+		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methods), _2, _3, _0)
+		{
+			ZEPHIR_INIT_NVAR(&claimId);
+			if (_3 != NULL) { 
+				ZVAL_STR_COPY(&claimId, _3);
+			} else {
+				ZVAL_LONG(&claimId, _2);
+			}
+			ZEPHIR_INIT_NVAR(&method);
+			ZVAL_COPY(&method, _0);
+			zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("claims"), PH_NOISY_CC | PH_READONLY);
+			ZEPHIR_CALL_METHOD(&_5$$3, &_4$$3, "get", NULL, 0, &claimId);
+			zephir_check_call_status();
+			ZEPHIR_CALL_METHOD_ZVAL(NULL, validator, &method, NULL, 0, &_5$$3);
+			zephir_check_call_status();
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		ZEPHIR_CALL_METHOD(NULL, &methods, "rewind", NULL, 0);
+		zephir_check_call_status();
+		while (1) {
+			ZEPHIR_CALL_METHOD(&_1, &methods, "valid", NULL, 0);
+			zephir_check_call_status();
+			if (!zend_is_true(&_1)) {
+				break;
+			}
+			ZEPHIR_CALL_METHOD(&claimId, &methods, "key", NULL, 0);
+			zephir_check_call_status();
+			ZEPHIR_CALL_METHOD(&method, &methods, "current", NULL, 0);
+			zephir_check_call_status();
+				zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("claims"), PH_NOISY_CC | PH_READONLY);
+				ZEPHIR_CALL_METHOD(&_7$$4, &_6$$4, "get", NULL, 0, &claimId);
+				zephir_check_call_status();
+				ZEPHIR_CALL_METHOD_ZVAL(NULL, validator, &method, NULL, 0, &_7$$4);
+				zephir_check_call_status();
+			ZEPHIR_CALL_METHOD(NULL, &methods, "next", NULL, 0);
+			zephir_check_call_status();
+		}
+	}
+	ZEPHIR_INIT_NVAR(&method);
+	ZEPHIR_INIT_NVAR(&claimId);
+	ZEPHIR_RETURN_CALL_METHOD(validator, "geterrors", NULL, 0);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, verify)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval key;
+	zval *signer, signer_sub, *key_param = NULL, _0, _1, _2, _3, _4, _5, _6;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&signer_sub);
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&key);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_OBJECT_OF_CLASS(signer, phalcon_encryption_security_jwt_signer_signerinterface_ce)
+		Z_PARAM_STR(key)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 2, 0, &signer, &key_param);
+	zephir_get_strval(&key, key_param);
+
+
+	ZEPHIR_CALL_METHOD(&_0, signer, "getalgheader", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheaders", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_STRING(&_3, "alg");
+	ZEPHIR_CALL_METHOD(&_2, &_1, "get", NULL, 0, &_3);
+	zephir_check_call_status();
+	if (!ZEPHIR_IS_IDENTICAL(&_0, &_2)) {
+		RETURN_MM_BOOL(0);
+	}
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("signature"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(&_5, &_4, "gethash", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_CALL_METHOD(&_6, this_ptr, "getpayload", NULL, 0);
+	zephir_check_call_status();
+	ZEPHIR_RETURN_CALL_METHOD(signer, "verify", NULL, 0, &_5, &_6, &key);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
 
 
 
@@ -213668,7 +214053,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Exceptions_UnsupportedAlgorith
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Encryption\\Security\\JWT\\Exceptions, UnsupportedAlgorithmException, phalcon, encryption_security_jwt_exceptions_unsupportedalgorithmexception, zend_ce_exception, NULL, 0);
 
-	zend_class_implements(phalcon_encryption_security_jwt_exceptions_unsupportedalgorithmexception_ce, 1, zend_ce_throwable);
 	return SUCCESS;
 }
 
@@ -213686,7 +214070,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Exceptions_ValidatorException)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Encryption\\Security\\JWT\\Exceptions, ValidatorException, phalcon, encryption_security_jwt_exceptions_validatorexception, zend_ce_exception, NULL, 0);
 
-	zend_class_implements(phalcon_encryption_security_jwt_exceptions_validatorexception_ce, 1, zend_ce_throwable);
 	return SUCCESS;
 }
 
@@ -213704,7 +214087,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Signer_AbstractSigner)
 {
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Encryption\\Security\\JWT\\Signer, AbstractSigner, phalcon, encryption_security_jwt_signer_abstractsigner, phalcon_encryption_security_jwt_signer_abstractsigner_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
 
-	zend_declare_property_null(phalcon_encryption_security_jwt_signer_abstractsigner_ce, SL("algorithm"), ZEND_ACC_PROTECTED);
+	zend_declare_property_string(phalcon_encryption_security_jwt_signer_abstractsigner_ce, SL("algorithm"), "", ZEND_ACC_PROTECTED);
 	zend_class_implements(phalcon_encryption_security_jwt_signer_abstractsigner_ce, 1, phalcon_encryption_security_jwt_signer_signerinterface_ce);
 	return SUCCESS;
 }
@@ -213851,112 +214234,72 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign)
 	}
 
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 257, &payload, &passphrase);
-	zephir_check_call_status();
-	RETURN_MM();
-}
-
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *source_param = NULL, *payload_param = NULL, *passphrase_param = NULL, _0;
-	zval source, payload, passphrase;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&source);
-	ZVAL_UNDEF(&payload);
-	ZVAL_UNDEF(&passphrase);
-	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(3, 3)
-		Z_PARAM_STR(source)
-		Z_PARAM_STR(payload)
-		Z_PARAM_STR(passphrase)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 3, 0, &source_param, &payload_param, &passphrase_param);
-	if (UNEXPECTED(Z_TYPE_P(source_param) != IS_STRING && Z_TYPE_P(source_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'source' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(source_param) == IS_STRING)) {
-		zephir_get_strval(&source, source_param);
-	} else {
-		ZEPHIR_INIT_VAR(&source);
-	}
-	if (UNEXPECTED(Z_TYPE_P(payload_param) != IS_STRING && Z_TYPE_P(payload_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'payload' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(payload_param) == IS_STRING)) {
-		zephir_get_strval(&payload, payload_param);
-	} else {
-		ZEPHIR_INIT_VAR(&payload);
-	}
-	if (UNEXPECTED(Z_TYPE_P(passphrase_param) != IS_STRING && Z_TYPE_P(passphrase_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'passphrase' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(passphrase_param) == IS_STRING)) {
-		zephir_get_strval(&passphrase, passphrase_param);
-	} else {
-		ZEPHIR_INIT_VAR(&passphrase);
-	}
-
-
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 257, &payload, &passphrase);
-	zephir_check_call_status();
-	RETURN_MM_BOOL(zephir_hash_equals(&source, &_0));
-}
-
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *payload_param = NULL, *passphrase_param = NULL, __$true, _0;
-	zval payload, passphrase;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&payload);
-	ZVAL_UNDEF(&passphrase);
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(2, 2)
-		Z_PARAM_STR(payload)
-		Z_PARAM_STR(passphrase)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 2, 0, &payload_param, &passphrase_param);
-	if (UNEXPECTED(Z_TYPE_P(payload_param) != IS_STRING && Z_TYPE_P(payload_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'payload' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(payload_param) == IS_STRING)) {
-		zephir_get_strval(&payload, payload_param);
-	} else {
-		ZEPHIR_INIT_VAR(&payload);
-	}
-	if (UNEXPECTED(Z_TYPE_P(passphrase_param) != IS_STRING && Z_TYPE_P(passphrase_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'passphrase' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(passphrase_param) == IS_STRING)) {
-		zephir_get_strval(&passphrase, passphrase_param);
-	} else {
-		ZEPHIR_INIT_VAR(&passphrase);
-	}
-
-
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 257, &payload, &passphrase);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *source_param = NULL, *payload_param = NULL, *passphrase_param = NULL, _0;
+	zval source, payload, passphrase;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&source);
+	ZVAL_UNDEF(&payload);
+	ZVAL_UNDEF(&passphrase);
+	ZVAL_UNDEF(&_0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(3, 3)
+		Z_PARAM_STR(source)
+		Z_PARAM_STR(payload)
+		Z_PARAM_STR(passphrase)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 3, 0, &source_param, &payload_param, &passphrase_param);
+	zephir_get_strval(&source, source_param);
+	zephir_get_strval(&payload, payload_param);
+	zephir_get_strval(&passphrase, passphrase_param);
+
+
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 257, &payload, &passphrase);
+	zephir_check_call_status();
+	RETURN_MM_BOOL(zephir_hash_equals(&source, &_0));
+}
+
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *payload_param = NULL, *passphrase_param = NULL, __$true, _0;
+	zval payload, passphrase;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&payload);
+	ZVAL_UNDEF(&passphrase);
+	ZVAL_BOOL(&__$true, 1);
+	ZVAL_UNDEF(&_0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_STR(payload)
+		Z_PARAM_STR(passphrase)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 2, 0, &payload_param, &passphrase_param);
+	zephir_get_strval(&payload, payload_param);
+	zephir_get_strval(&passphrase, passphrase_param);
+
+
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getalgorithm", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 225, &_0, &payload, &passphrase, &__$true);
@@ -214058,33 +214401,9 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_None, verify)
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 3, 0, &source_param, &payload_param, &passphrase_param);
-	if (UNEXPECTED(Z_TYPE_P(source_param) != IS_STRING && Z_TYPE_P(source_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'source' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(source_param) == IS_STRING)) {
-		zephir_get_strval(&source, source_param);
-	} else {
-		ZEPHIR_INIT_VAR(&source);
-	}
-	if (UNEXPECTED(Z_TYPE_P(payload_param) != IS_STRING && Z_TYPE_P(payload_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'payload' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(payload_param) == IS_STRING)) {
-		zephir_get_strval(&payload, payload_param);
-	} else {
-		ZEPHIR_INIT_VAR(&payload);
-	}
-	if (UNEXPECTED(Z_TYPE_P(passphrase_param) != IS_STRING && Z_TYPE_P(passphrase_param) != IS_NULL)) {
-		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'passphrase' must be of the type string"));
-		RETURN_MM_NULL();
-	}
-	if (EXPECTED(Z_TYPE_P(passphrase_param) == IS_STRING)) {
-		zephir_get_strval(&passphrase, passphrase_param);
-	} else {
-		ZEPHIR_INIT_VAR(&passphrase);
-	}
+	zephir_get_strval(&source, source_param);
+	zephir_get_strval(&payload, payload_param);
+	zephir_get_strval(&passphrase, passphrase_param);
 
 
 	ZEPHIR_INIT_VAR(&_0);
@@ -214133,33 +214452,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Component)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Acl_Component, getDescription)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "description");
-}
-
-static PHP_METHOD(Phalcon_Acl_Component, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-static PHP_METHOD(Phalcon_Acl_Component, __toString)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
 static PHP_METHOD(Phalcon_Acl_Component, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -214197,7 +214489,7 @@ static PHP_METHOD(Phalcon_Acl_Component, __construct)
 	}
 
 
-	if (UNEXPECTED(ZEPHIR_IS_STRING(&name, "*"))) {
+	if (UNEXPECTED(ZEPHIR_IS_STRING_IDENTICAL(&name, "*"))) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Component name cannot be '*'", "phalcon/Acl/Component.zep", 38);
 		return;
 	}
@@ -214206,6 +214498,33 @@ static PHP_METHOD(Phalcon_Acl_Component, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Acl_Component, __toString)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+static PHP_METHOD(Phalcon_Acl_Component, getDescription)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "description");
+}
+
+static PHP_METHOD(Phalcon_Acl_Component, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
 
 
 
@@ -214296,39 +214615,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Role)
 {
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Acl, Role, phalcon, acl_role, phalcon_acl_role_method_entry, 0);
 
-	zend_declare_property_null(phalcon_acl_role_ce, SL("name"), ZEND_ACC_PRIVATE);
 	zend_declare_property_null(phalcon_acl_role_ce, SL("description"), ZEND_ACC_PRIVATE);
+	zend_declare_property_null(phalcon_acl_role_ce, SL("name"), ZEND_ACC_PRIVATE);
 	zend_class_implements(phalcon_acl_role_ce, 1, phalcon_acl_roleinterface_ce);
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Acl_Role, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-static PHP_METHOD(Phalcon_Acl_Role, __toString)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-static PHP_METHOD(Phalcon_Acl_Role, getDescription)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "description");
-}
-
 static PHP_METHOD(Phalcon_Acl_Role, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -214366,7 +214658,7 @@ static PHP_METHOD(Phalcon_Acl_Role, __construct)
 	}
 
 
-	if (UNEXPECTED(ZEPHIR_IS_STRING(&name, "*"))) {
+	if (UNEXPECTED(ZEPHIR_IS_STRING_IDENTICAL(&name, "*"))) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role name cannot be '*'", "phalcon/Acl/Role.zep", 38);
 		return;
 	}
@@ -214375,6 +214667,33 @@ static PHP_METHOD(Phalcon_Acl_Role, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Acl_Role, __toString)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+static PHP_METHOD(Phalcon_Acl_Role, getDescription)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "description");
+}
+
+static PHP_METHOD(Phalcon_Acl_Role, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
 
 
 
@@ -214427,10 +214746,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_AbstractAdapter)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Acl\\Adapter, AbstractAdapter, phalcon, acl_adapter_abstractadapter, phalcon_events_abstracteventsaware_ce, phalcon_acl_adapter_abstractadapter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
 
-	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeAccess"), ZEND_ACC_PROTECTED);
 	zend_declare_property_bool(phalcon_acl_adapter_abstractadapter_ce, SL("accessGranted"), 0, ZEND_ACC_PROTECTED);
-	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeRole"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeAccess"), ZEND_ACC_PROTECTED);
 	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeComponent"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeRole"), ZEND_ACC_PROTECTED);
 	zend_declare_property_long(phalcon_acl_adapter_abstractadapter_ce, SL("defaultAccess"), 0, ZEND_ACC_PROTECTED);
 	zend_class_implements(phalcon_acl_adapter_abstractadapter_ce, 1, phalcon_acl_adapter_adapterinterface_ce);
 	zend_class_implements(phalcon_acl_adapter_abstractadapter_ce, 1, phalcon_events_eventsawareinterface_ce);
@@ -214446,22 +214765,22 @@ static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveAccess)
 	RETURN_MEMBER(getThis(), "activeAccess");
 }
 
-static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole)
+static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent)
 {
 	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "activeRole");
+	RETURN_MEMBER(getThis(), "activeComponent");
 }
 
-static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent)
+static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole)
 {
 	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "activeComponent");
+	RETURN_MEMBER(getThis(), "activeRole");
 }
 
 static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getDefaultAction)
@@ -214562,33 +214881,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_Memory)
 	return SUCCESS;
 }
 
-static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "activeFunction");
-}
-
-static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "activeFunctionCustomArgumentsCount");
-}
-
-static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "activeKey");
-}
-
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, __construct)
 {
 	zval _0, _1;
@@ -215477,6 +215769,33 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, dropComponentAccess)
 	ZEPHIR_MM_RESTORE();
 }
 
+static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "activeFunction");
+}
+
+static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "activeFunctionCustomArgumentsCount");
+}
+
+static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "activeKey");
+}
+
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getComponents)
 {
 	zval *this_ptr = getThis();
@@ -215672,7 +215991,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 			ZEPHIR_CONCAT_SS(&_2$$6, "Object passed as roleName must implement ", "Phalcon\\Acl\\RoleAwareInterface or Phalcon\\Acl\\RoleInterface");
 			ZEPHIR_CALL_METHOD(NULL, &_1$$6, "__construct", NULL, 29, &_2$$6);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_1$$6, "phalcon/Acl/Adapter/Memory.zep", 587);
+			zephir_throw_exception_debug(&_1$$6, "phalcon/Acl/Adapter/Memory.zep", 613);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -215693,7 +216012,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 			ZEPHIR_CONCAT_SS(&_5$$10, "Object passed as componentName must implement ", "Phalcon\\Acl\\ComponentAwareInterface or Phalcon\\Acl\\ComponentInterface");
 			ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", NULL, 29, &_5$$10);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_4$$10, "phalcon/Acl/Adapter/Memory.zep", 601);
+			zephir_throw_exception_debug(&_4$$10, "phalcon/Acl/Adapter/Memory.zep", 627);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -215731,7 +216050,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 	}
 	if (_10) {
 		ZEPHIR_OBS_NVAR(&haveAccess);
-		zephir_array_fetch(&haveAccess, &accessList, &accessKey, PH_NOISY, "phalcon/Acl/Adapter/Memory.zep", 633);
+		zephir_array_fetch(&haveAccess, &accessList, &accessKey, PH_NOISY, "phalcon/Acl/Adapter/Memory.zep", 659);
 		ZEPHIR_OBS_NVAR(&funcAccess);
 		zephir_array_isset_fetch(&funcAccess, &funcList, &accessKey, 0);
 	}
@@ -215773,7 +216092,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 		ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 148);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, &parameterNumber);
-		zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 736);
+		zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 762);
 		if (Z_TYPE_P(&reflectionParameters) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&reflectionParameters), _15$$15)
 			{
@@ -215796,7 +216115,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 					}
 					if (_19$$18) {
 						hasRole = 1;
-						zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 689);
+						zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 715);
 						ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 						zephir_decrement(&userParametersSizeShouldBe);
 						continue;
@@ -215813,19 +216132,19 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 					}
 					if (_22$$18) {
 						hasComponent = 1;
-						zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 701);
+						zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 727);
 						ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 						zephir_decrement(&userParametersSizeShouldBe);
 						continue;
 					}
 					_23$$18 = zephir_array_isset(&parameters, &parameterToCheck);
 					if (_23$$18) {
-						zephir_array_fetch(&_24$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 712);
+						zephir_array_fetch(&_24$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 738);
 						_23$$18 = Z_TYPE_P(&_24$$18) == IS_OBJECT;
 					}
 					_25$$18 = _23$$18;
 					if (_25$$18) {
-						zephir_array_fetch(&_27$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 713);
+						zephir_array_fetch(&_27$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 739);
 						ZEPHIR_CALL_METHOD(&_26$$18, &reflectionClass, "isinstance", NULL, 0, &_27$$18);
 						zephir_check_call_status();
 						_25$$18 = !zephir_is_true(&_26$$18);
@@ -215834,7 +216153,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						ZEPHIR_INIT_NVAR(&_28$$21);
 						object_init_ex(&_28$$21, phalcon_acl_exception_ce);
 						ZEPHIR_INIT_NVAR(&_29$$21);
-						zephir_array_fetch(&_30$$21, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 720);
+						zephir_array_fetch(&_30$$21, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 746);
 						zephir_get_class(&_29$$21, &_30$$21, 0);
 						ZEPHIR_CALL_METHOD(&_31$$21, &reflectionClass, "getname", NULL, 0);
 						zephir_check_call_status();
@@ -215842,14 +216161,14 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_32$$21, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_29$$21, " , Class in defined function: ", &_31$$21, ".");
 						ZEPHIR_CALL_METHOD(NULL, &_28$$21, "__construct", NULL, 29, &_32$$21);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_28$$21, "phalcon/Acl/Adapter/Memory.zep", 723);
+						zephir_throw_exception_debug(&_28$$21, "phalcon/Acl/Adapter/Memory.zep", 749);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				}
 				if (zephir_array_isset(&parameters, &parameterToCheck)) {
-					zephir_array_fetch(&_33$$22, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 732);
-					zephir_array_append(&parametersForFunction, &_33$$22, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 732);
+					zephir_array_fetch(&_33$$22, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 758);
+					zephir_array_append(&parametersForFunction, &_33$$22, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 758);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -215880,7 +216199,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						}
 						if (_36$$24) {
 							hasRole = 1;
-							zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 689);
+							zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 715);
 							ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 							zephir_decrement(&userParametersSizeShouldBe);
 							continue;
@@ -215897,19 +216216,19 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						}
 						if (_39$$24) {
 							hasComponent = 1;
-							zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 701);
+							zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 727);
 							ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 							zephir_decrement(&userParametersSizeShouldBe);
 							continue;
 						}
 						_40$$24 = zephir_array_isset(&parameters, &parameterToCheck);
 						if (_40$$24) {
-							zephir_array_fetch(&_41$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 712);
+							zephir_array_fetch(&_41$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 738);
 							_40$$24 = Z_TYPE_P(&_41$$24) == IS_OBJECT;
 						}
 						_42$$24 = _40$$24;
 						if (_42$$24) {
-							zephir_array_fetch(&_44$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 713);
+							zephir_array_fetch(&_44$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 739);
 							ZEPHIR_CALL_METHOD(&_43$$24, &reflectionClass, "isinstance", NULL, 0, &_44$$24);
 							zephir_check_call_status();
 							_42$$24 = !zephir_is_true(&_43$$24);
@@ -215918,7 +216237,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 							ZEPHIR_INIT_NVAR(&_45$$27);
 							object_init_ex(&_45$$27, phalcon_acl_exception_ce);
 							ZEPHIR_INIT_NVAR(&_46$$27);
-							zephir_array_fetch(&_47$$27, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 720);
+							zephir_array_fetch(&_47$$27, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 746);
 							zephir_get_class(&_46$$27, &_47$$27, 0);
 							ZEPHIR_CALL_METHOD(&_48$$27, &reflectionClass, "getname", NULL, 0);
 							zephir_check_call_status();
@@ -215926,14 +216245,14 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 							ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_49$$27, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_46$$27, " , Class in defined function: ", &_48$$27, ".");
 							ZEPHIR_CALL_METHOD(NULL, &_45$$27, "__construct", NULL, 29, &_49$$27);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_45$$27, "phalcon/Acl/Adapter/Memory.zep", 723);
+							zephir_throw_exception_debug(&_45$$27, "phalcon/Acl/Adapter/Memory.zep", 749);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
 					}
 					if (zephir_array_isset(&parameters, &parameterToCheck)) {
-						zephir_array_fetch(&_50$$28, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 732);
-						zephir_array_append(&parametersForFunction, &_50$$28, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 732);
+						zephir_array_fetch(&_50$$28, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 758);
+						zephir_array_append(&parametersForFunction, &_50$$28, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 758);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &reflectionParameters, "next", NULL, 0);
 				zephir_check_call_status();
@@ -215986,7 +216305,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 		ZEPHIR_CONCAT_SSVSVSVS(&_61$$15, "You did not provide all necessary parameters for the ", "defined function when checking if '", roleName, "' can '", &access, "' for '", componentName, "'.");
 		ZEPHIR_CALL_METHOD(NULL, &_60$$15, "__construct", NULL, 29, &_61$$15);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_60$$15, "phalcon/Acl/Adapter/Memory.zep", 777);
+		zephir_throw_exception_debug(&_60$$15, "phalcon/Acl/Adapter/Memory.zep", 803);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -216135,7 +216454,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("accessList"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&accessList, &_3);
 	if (Z_TYPE_P(access) == IS_ARRAY) {
-		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 833);
+		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 859);
 		if (Z_TYPE_P(access) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(access), _4$$3)
 			{
@@ -216150,7 +216469,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 					ZEPHIR_CONCAT_SVSVS(&_7$$5, "Access '", &accessName, "' does not exist in component '", &componentName, "'");
 					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_8, 29, &_7$$5);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_6$$5, "phalcon/Acl/Adapter/Memory.zep", 829);
+					zephir_throw_exception_debug(&_6$$5, "phalcon/Acl/Adapter/Memory.zep", 855);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -216175,7 +216494,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 						ZEPHIR_CONCAT_SVSVS(&_10$$7, "Access '", &accessName, "' does not exist in component '", &componentName, "'");
 						ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 29, &_10$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_9$$7, "phalcon/Acl/Adapter/Memory.zep", 829);
+						zephir_throw_exception_debug(&_9$$7, "phalcon/Acl/Adapter/Memory.zep", 855);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -216184,7 +216503,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 			}
 		}
 		ZEPHIR_INIT_NVAR(&accessName);
-		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 841);
+		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 867);
 		if (Z_TYPE_P(access) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(access), _11$$3)
 			{
@@ -216230,7 +216549,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 				ZEPHIR_CONCAT_SVSVS(&_14$$14, "Access '", access, "' does not exist in component '", &componentName, "'");
 				ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_14$$14);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_13$$14, "phalcon/Acl/Adapter/Memory.zep", 849);
+				zephir_throw_exception_debug(&_13$$14, "phalcon/Acl/Adapter/Memory.zep", 875);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -216315,8 +216634,8 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess)
 		ZEPHIR_INIT_VAR(&checkRoleToInherits);
 		array_init(&checkRoleToInherits);
 		zephir_read_property(&_1$$6, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$6, &_1$$6, &roleName, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 910);
-		zephir_is_iterable(&_2$$6, 0, "phalcon/Acl/Adapter/Memory.zep", 914);
+		zephir_array_fetch(&_2$$6, &_1$$6, &roleName, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 936);
+		zephir_is_iterable(&_2$$6, 0, "phalcon/Acl/Adapter/Memory.zep", 940);
 		if (Z_TYPE_P(&_2$$6) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2$$6), _3$$6)
 			{
@@ -216382,8 +216701,8 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess)
 			zephir_read_property(&_10$$9, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY);
 			if (zephir_array_isset(&_10$$9, &checkRoleToInherit)) {
 				zephir_read_property(&_11$$14, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY);
-				zephir_array_fetch(&_12$$14, &_11$$14, &checkRoleToInherit, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 957);
-				zephir_is_iterable(&_12$$14, 0, "phalcon/Acl/Adapter/Memory.zep", 960);
+				zephir_array_fetch(&_12$$14, &_11$$14, &checkRoleToInherit, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 983);
+				zephir_is_iterable(&_12$$14, 0, "phalcon/Acl/Adapter/Memory.zep", 986);
 				if (Z_TYPE_P(&_12$$14) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_12$$14), _13$$14)
 					{
@@ -216467,7 +216786,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, checkExists)
 		ZEPHIR_CONCAT_VSVSV(&_1$$3, &elementName, " '", &element, "' does not exist in the ", &suffix);
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Acl/Adapter/Memory.zep", 985);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Acl/Adapter/Memory.zep", 1011);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -218295,7 +218614,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, __construct)
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 0, &path);
+	ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 510, &path);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_6);
 	ZEPHIR_MM_RESTORE();
@@ -218333,7 +218652,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy)
 	ZEPHIR_CONCAT_VV(&file, &_0, &_1);
 	_2 = (zephir_file_exists(&file) == SUCCESS);
 	if (_2) {
-		ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 0, &file);
+		ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 511, &file);
 		zephir_check_call_status();
 		_2 = zephir_is_true(&_3);
 	}
@@ -218396,7 +218715,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc)
 			ZVAL_COPY(&file, _4);
 			_6$$3 = 1 == (zephir_file_exists(&file) == SUCCESS);
 			if (_6$$3) {
-				ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 0, &file);
+				ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 511, &file);
 				zephir_check_call_status();
 				_6$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3);
 			}
@@ -218424,7 +218743,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc)
 			zephir_check_call_status();
 				_12$$5 = 1 == (zephir_file_exists(&file) == SUCCESS);
 				if (_12$$5) {
-					ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 0, &file);
+					ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 511, &file);
 					zephir_check_call_status();
 					_12$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_13$$5);
 				}
@@ -218891,7 +219210,7 @@ static PHP_METHOD(Phalcon_Application_AbstractApplication, __construct)
 	}
 
 
-	if (Z_TYPE_P(container) == IS_OBJECT) {
+	if (Z_TYPE_P(container) != IS_NULL) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), container);
 	}
 }
diff --git a/build/phalcon/phalcon.zep.h b/build/phalcon/phalcon.zep.h
index 3295975ce6e..9624dfde9f1 100644
--- a/build/phalcon/phalcon.zep.h
+++ b/build/phalcon/phalcon.zep.h
@@ -1125,13 +1125,13 @@ zend_class_entry *phalcon_storage_adapter_abstractadapter_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Storage_Adapter_AbstractAdapter);
 
-static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, __construct);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, clear);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, decrement);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, delete);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, get);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getAdapter);
+static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getKeys);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getPrefix);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, has);
@@ -1148,9 +1148,6 @@ static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, initSerializer);
 static PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getArrVal);
 zend_object *zephir_init_properties_Phalcon_Storage_Adapter_AbstractAdapter(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Storage\\SerializerFactory, 0)
 #if PHP_VERSION_ID >= 80000
@@ -1180,6 +1177,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getadapter, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getkeys, 0, 0, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -1247,7 +1247,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_zephir_in
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_abstractadapter_method_entry) {
-	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer, arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, __construct, arginfo_phalcon_storage_adapter_abstractadapter___construct, ZEND_ACC_PROTECTED|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, clear, arginfo_phalcon_storage_adapter_abstractadapter_clear, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, decrement, arginfo_phalcon_storage_adapter_abstractadapter_decrement, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
@@ -1258,6 +1257,7 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_abstractadapter_method_entry) {
 #else
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getAdapter, NULL, ZEND_ACC_PUBLIC)
 #endif
+	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer, arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getKeys, arginfo_phalcon_storage_adapter_abstractadapter_getkeys, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getPrefix, arginfo_phalcon_storage_adapter_abstractadapter_getprefix, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, has, arginfo_phalcon_storage_adapter_abstractadapter_has, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
@@ -1667,41 +1667,20 @@ zend_class_entry *phalcon_filter_validation_validator_file_abstractfile_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation_Validator_File_AbstractFile);
 
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty);
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty);
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize);
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize);
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid);
-static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsEmpty);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsValid);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadMaxSize);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getFileSizeInBytes);
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty);
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize);
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty);
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty);
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize);
+static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid);
 static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkIsUploadedFile);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, messageFileEmpty, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, messageIniSize, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, messageValid, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_checkupload, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Filter\\Validation, 0)
 	ZEND_ARG_INFO(0, field)
@@ -1726,28 +1705,52 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_valida
 	ZEND_ARG_TYPE_INFO(0, size, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_isallowempty, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Filter\\Validation, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_checkisuploadedfile, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_filter_validation_validator_file_abstractfile_method_entry) {
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkupload, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkuploadisempty, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkuploadisvalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadMaxSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkuploadmaxsize, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getFileSizeInBytes, arginfo_phalcon_filter_validation_validator_file_abstractfile_getfilesizeinbytes, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_isallowempty, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkIsUploadedFile, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkisuploadedfile, ZEND_ACC_PROTECTED)
 	PHP_FE_END
 };
@@ -2949,8 +2952,6 @@ zend_class_entry *phalcon_db_adapter_abstractadapter_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_AbstractAdapter);
 
-static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType);
-static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, __construct);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addColumn);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addForeignKey);
@@ -2980,12 +2981,14 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDefaultIdValue);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDefaultValue);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDescriptor);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialect);
+static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getEventsManager);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getNestedTransactionSavepointName);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getRealSQLStatement);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLBindTypes);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLStatement);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLVariables);
+static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, isNestedTransactionsWithSavepoints);
@@ -3009,12 +3012,6 @@ static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, supportsDefaultValue);
 static PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, viewExists);
 zend_object *zephir_init_properties_Phalcon_Db_Adapter_AbstractAdapter(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter___construct, 0, 0, 1)
 	ZEND_ARG_ARRAY_INFO(0, descriptor, 0)
 ZEND_END_ARG_INFO()
@@ -3190,6 +3187,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getdialect, 0, 0, Phalcon\\Db\\DialectInterface, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_geteventsmanager, 0, 0, Phalcon\\Events\\ManagerInterface, 1)
 ZEND_END_ARG_INFO()
 
@@ -3208,6 +3208,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getsqlvariables, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_insert, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
 	ZEND_ARG_ARRAY_INFO(0, values, 0)
@@ -3312,8 +3315,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_zephir_init_pr
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_adapter_abstractadapter_method_entry) {
-	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDialectType, arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getType, arginfo_phalcon_db_adapter_abstractadapter_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, __construct, arginfo_phalcon_db_adapter_abstractadapter___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, addColumn, arginfo_phalcon_db_adapter_abstractadapter_addcolumn, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, addForeignKey, arginfo_phalcon_db_adapter_abstractadapter_addforeignkey, ZEND_ACC_PUBLIC)
@@ -3343,12 +3344,14 @@ ZEPHIR_INIT_FUNCS(phalcon_db_adapter_abstractadapter_method_entry) {
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDefaultValue, arginfo_phalcon_db_adapter_abstractadapter_getdefaultvalue, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDescriptor, arginfo_phalcon_db_adapter_abstractadapter_getdescriptor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDialect, arginfo_phalcon_db_adapter_abstractadapter_getdialect, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDialectType, arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getEventsManager, arginfo_phalcon_db_adapter_abstractadapter_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getNestedTransactionSavepointName, arginfo_phalcon_db_adapter_abstractadapter_getnestedtransactionsavepointname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getRealSQLStatement, arginfo_phalcon_db_adapter_abstractadapter_getrealsqlstatement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getSQLBindTypes, arginfo_phalcon_db_adapter_abstractadapter_getsqlbindtypes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getSQLStatement, arginfo_phalcon_db_adapter_abstractadapter_getsqlstatement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getSQLVariables, arginfo_phalcon_db_adapter_abstractadapter_getsqlvariables, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getType, arginfo_phalcon_db_adapter_abstractadapter_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, insert, arginfo_phalcon_db_adapter_abstractadapter_insert, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict, arginfo_phalcon_db_adapter_abstractadapter_insertasdict, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, isNestedTransactionsWithSavepoints, arginfo_phalcon_db_adapter_abstractadapter_isnestedtransactionswithsavepoints, ZEND_ACC_PUBLIC)
@@ -3978,7 +3981,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connectio
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_connectioninterface_fetchobject, 0, 1, NULL, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_datamapper_pdo_connection_connectioninterface_fetchobject, 0, 1, MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_connectioninterface_fetchobject, 0, 1, IS_OBJECT, 0)
+#endif
 	ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, values, IS_ARRAY, 0, "[]")
@@ -5637,20 +5644,20 @@ zend_class_entry *phalcon_assets_asset_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Assets_Asset);
 
-static PHP_METHOD(Phalcon_Assets_Asset, getFilter);
-static PHP_METHOD(Phalcon_Assets_Asset, getPath);
-static PHP_METHOD(Phalcon_Assets_Asset, getSourcePath);
-static PHP_METHOD(Phalcon_Assets_Asset, getTargetPath);
-static PHP_METHOD(Phalcon_Assets_Asset, getTargetUri);
-static PHP_METHOD(Phalcon_Assets_Asset, getType);
-static PHP_METHOD(Phalcon_Assets_Asset, getVersion);
 static PHP_METHOD(Phalcon_Assets_Asset, __construct);
 static PHP_METHOD(Phalcon_Assets_Asset, getAssetKey);
 static PHP_METHOD(Phalcon_Assets_Asset, getAttributes);
 static PHP_METHOD(Phalcon_Assets_Asset, getContent);
+static PHP_METHOD(Phalcon_Assets_Asset, getFilter);
+static PHP_METHOD(Phalcon_Assets_Asset, getPath);
 static PHP_METHOD(Phalcon_Assets_Asset, getRealSourcePath);
 static PHP_METHOD(Phalcon_Assets_Asset, getRealTargetPath);
 static PHP_METHOD(Phalcon_Assets_Asset, getRealTargetUri);
+static PHP_METHOD(Phalcon_Assets_Asset, getSourcePath);
+static PHP_METHOD(Phalcon_Assets_Asset, getTargetPath);
+static PHP_METHOD(Phalcon_Assets_Asset, getTargetUri);
+static PHP_METHOD(Phalcon_Assets_Asset, getType);
+static PHP_METHOD(Phalcon_Assets_Asset, getVersion);
 static PHP_METHOD(Phalcon_Assets_Asset, isAutoVersion);
 static PHP_METHOD(Phalcon_Assets_Asset, isLocal);
 static PHP_METHOD(Phalcon_Assets_Asset, setAttributes);
@@ -5668,27 +5675,6 @@ static PHP_METHOD(Phalcon_Assets_Asset, throwException);
 static PHP_METHOD(Phalcon_Assets_Asset, phpFileExists);
 static PHP_METHOD(Phalcon_Assets_Asset, phpFileGetContents);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getfilter, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getpath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getsourcepath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargetpath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargeturi, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getversion, 0, 0, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_asset___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
@@ -5713,6 +5699,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getcontent,
 	ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getfilter, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getpath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getrealsourcepath, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 1)
 ZEND_END_ARG_INFO()
@@ -5724,6 +5716,21 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getrealtargeturi, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getsourcepath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargetpath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargeturi, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getversion, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_isautoversion, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
@@ -5788,20 +5795,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_asset_phpfilegetcontents, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_assets_asset_method_entry) {
-	PHP_ME(Phalcon_Assets_Asset, getFilter, arginfo_phalcon_assets_asset_getfilter, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getPath, arginfo_phalcon_assets_asset_getpath, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getSourcePath, arginfo_phalcon_assets_asset_getsourcepath, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getTargetPath, arginfo_phalcon_assets_asset_gettargetpath, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getTargetUri, arginfo_phalcon_assets_asset_gettargeturi, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getType, arginfo_phalcon_assets_asset_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getVersion, arginfo_phalcon_assets_asset_getversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, __construct, arginfo_phalcon_assets_asset___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Assets_Asset, getAssetKey, arginfo_phalcon_assets_asset_getassetkey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getAttributes, arginfo_phalcon_assets_asset_getattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getContent, arginfo_phalcon_assets_asset_getcontent, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getFilter, arginfo_phalcon_assets_asset_getfilter, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getPath, arginfo_phalcon_assets_asset_getpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getRealSourcePath, arginfo_phalcon_assets_asset_getrealsourcepath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getRealTargetPath, arginfo_phalcon_assets_asset_getrealtargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getRealTargetUri, arginfo_phalcon_assets_asset_getrealtargeturi, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getSourcePath, arginfo_phalcon_assets_asset_getsourcepath, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getTargetPath, arginfo_phalcon_assets_asset_gettargetpath, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getTargetUri, arginfo_phalcon_assets_asset_gettargeturi, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getType, arginfo_phalcon_assets_asset_gettype, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getVersion, arginfo_phalcon_assets_asset_getversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, isAutoVersion, arginfo_phalcon_assets_asset_isautoversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, isLocal, arginfo_phalcon_assets_asset_islocal, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, setAttributes, arginfo_phalcon_assets_asset_setattributes, ZEND_ACC_PUBLIC)
@@ -5825,28 +5832,16 @@ zend_class_entry *phalcon_assets_inline_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Assets_Inline);
 
+static PHP_METHOD(Phalcon_Assets_Inline, __construct);
+static PHP_METHOD(Phalcon_Assets_Inline, getAssetKey);
 static PHP_METHOD(Phalcon_Assets_Inline, getAttributes);
 static PHP_METHOD(Phalcon_Assets_Inline, getContent);
 static PHP_METHOD(Phalcon_Assets_Inline, getFilter);
 static PHP_METHOD(Phalcon_Assets_Inline, getType);
-static PHP_METHOD(Phalcon_Assets_Inline, __construct);
-static PHP_METHOD(Phalcon_Assets_Inline, getAssetKey);
 static PHP_METHOD(Phalcon_Assets_Inline, setAttributes);
 static PHP_METHOD(Phalcon_Assets_Inline, setFilter);
 static PHP_METHOD(Phalcon_Assets_Inline, setType);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getattributes, 0, 0, IS_ARRAY, 1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getcontent, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getfilter, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_inline___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
@@ -5861,6 +5856,18 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getassetkey, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getattributes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getcontent, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getfilter, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_inline_setattributes, 0, 1, Phalcon\\Assets\\AssetInterface, 0)
 	ZEND_ARG_ARRAY_INFO(0, attributes, 0)
 ZEND_END_ARG_INFO()
@@ -5874,12 +5881,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_inline_settype, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_assets_inline_method_entry) {
+	PHP_ME(Phalcon_Assets_Inline, __construct, arginfo_phalcon_assets_inline___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Assets_Inline, getAssetKey, arginfo_phalcon_assets_inline_getassetkey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getAttributes, arginfo_phalcon_assets_inline_getattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getContent, arginfo_phalcon_assets_inline_getcontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getFilter, arginfo_phalcon_assets_inline_getfilter, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getType, arginfo_phalcon_assets_inline_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Inline, __construct, arginfo_phalcon_assets_inline___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Assets_Inline, getAssetKey, arginfo_phalcon_assets_inline_getassetkey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, setAttributes, arginfo_phalcon_assets_inline_setattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, setFilter, arginfo_phalcon_assets_inline_setfilter, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, setType, arginfo_phalcon_assets_inline_settype, ZEND_ACC_PUBLIC)
@@ -6053,7 +6060,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connectio
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_abstractconnection_fetchobject, 0, 1, NULL, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_datamapper_pdo_connection_abstractconnection_fetchobject, 0, 1, MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_datamapper_pdo_connection_abstractconnection_fetchobject, 0, 1, IS_OBJECT, 0)
+#endif
 	ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, values, IS_ARRAY, 0, "[]")
@@ -6793,13 +6804,14 @@ zend_class_entry *phalcon_flash_abstractflash_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Flash_AbstractFlash);
 
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct);
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, clear);
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, error);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutoescape);
+static PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutomaticHtml);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssClasses);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssIconClasses);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getCustomTemplate);
-static PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct);
-static PHP_METHOD(Phalcon_Flash_AbstractFlash, clear);
-static PHP_METHOD(Phalcon_Flash_AbstractFlash, error);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, getEscaperService);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, notice);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, setAutoescape);
@@ -6818,28 +6830,31 @@ static PHP_METHOD(Phalcon_Flash_AbstractFlash, prepareHtmlMessage);
 static PHP_METHOD(Phalcon_Flash_AbstractFlash, checkClasses);
 zend_object *zephir_init_properties_Phalcon_Flash_AbstractFlash(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getautoescape, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_flash_abstractflash___construct, 0, 0, 0)
+	ZEND_ARG_OBJ_INFO(0, escaper, Phalcon\\Html\\Escaper\\EscaperInterface, 1)
+	ZEND_ARG_OBJ_INFO(0, session, Phalcon\\Session\\ManagerInterface, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssclasses, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_clear, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssiconclasses, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_error, 0, 1, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcustomtemplate, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getautoescape, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_flash_abstractflash___construct, 0, 0, 0)
-	ZEND_ARG_OBJ_INFO(0, escaper, Phalcon\\Html\\Escaper\\EscaperInterface, 1)
-	ZEND_ARG_OBJ_INFO(0, session, Phalcon\\Session\\ManagerInterface, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getautomatichtml, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_clear, 0, 0, IS_VOID, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssclasses, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_error, 0, 1, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssiconclasses, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcustomtemplate, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_flash_abstractflash_getescaperservice, 0, 0, Phalcon\\Html\\Escaper\\EscaperInterface, 0)
@@ -6913,13 +6928,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_flash_abstractflash_zephir_init_propertie
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_flash_abstractflash_method_entry) {
+	PHP_ME(Phalcon_Flash_AbstractFlash, __construct, arginfo_phalcon_flash_abstractflash___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Flash_AbstractFlash, clear, arginfo_phalcon_flash_abstractflash_clear, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Flash_AbstractFlash, error, arginfo_phalcon_flash_abstractflash_error, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getAutoescape, arginfo_phalcon_flash_abstractflash_getautoescape, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Flash_AbstractFlash, getAutomaticHtml, arginfo_phalcon_flash_abstractflash_getautomatichtml, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getCssClasses, arginfo_phalcon_flash_abstractflash_getcssclasses, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getCssIconClasses, arginfo_phalcon_flash_abstractflash_getcssiconclasses, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getCustomTemplate, arginfo_phalcon_flash_abstractflash_getcustomtemplate, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Flash_AbstractFlash, __construct, arginfo_phalcon_flash_abstractflash___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Flash_AbstractFlash, clear, arginfo_phalcon_flash_abstractflash_clear, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Flash_AbstractFlash, error, arginfo_phalcon_flash_abstractflash_error, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getEscaperService, arginfo_phalcon_flash_abstractflash_getescaperservice, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, notice, arginfo_phalcon_flash_abstractflash_notice, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, setAutoescape, arginfo_phalcon_flash_abstractflash_setautoescape, ZEND_ACC_PUBLIC)
@@ -7228,24 +7244,25 @@ zend_class_entry *phalcon_logger_formatter_abstractformatter_ce;
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_AbstractFormatter);
 
 static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getDateFormat);
-static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat);
 static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate);
+static PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat);
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_getdateformat, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, 0, 0, 1)
-	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()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 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_ME(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat, arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -7928,18 +7945,18 @@ zend_class_entry *phalcon_acl_adapter_abstractadapter_ce;
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_AbstractAdapter);
 
 static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveAccess);
-static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole);
 static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent);
+static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole);
 static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getDefaultAction);
 static PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, setDefaultAction);
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactiveaccess, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactivecomponent, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactivecomponent, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getdefaultaction, 0, 0, IS_LONG, 0)
@@ -7952,8 +7969,8 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_adapter_abstractadapter_method_entry) {
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveAccess, arginfo_phalcon_acl_adapter_abstractadapter_getactiveaccess, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole, arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent, arginfo_phalcon_acl_adapter_abstractadapter_getactivecomponent, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole, arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getDefaultAction, arginfo_phalcon_acl_adapter_abstractadapter_getdefaultaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, setDefaultAction, arginfo_phalcon_acl_adapter_abstractadapter_setdefaultaction, ZEND_ACC_PUBLIC)
 	PHP_FE_END
@@ -11397,10 +11414,6 @@ zend_class_entry *phalcon_mvc_router_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router);
 
-static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames);
-static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames);
-static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds);
-static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds);
 static PHP_METHOD(Phalcon_Mvc_Router, __construct);
 static PHP_METHOD(Phalcon_Mvc_Router, add);
 static PHP_METHOD(Phalcon_Mvc_Router, addConnect);
@@ -11418,6 +11431,9 @@ static PHP_METHOD(Phalcon_Mvc_Router, clear);
 static PHP_METHOD(Phalcon_Mvc_Router, getEventsManager);
 static PHP_METHOD(Phalcon_Mvc_Router, getActionName);
 static PHP_METHOD(Phalcon_Mvc_Router, getControllerName);
+static PHP_METHOD(Phalcon_Mvc_Router, getDefaults);
+static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames);
+static PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds);
 static PHP_METHOD(Phalcon_Mvc_Router, getMatchedRoute);
 static PHP_METHOD(Phalcon_Mvc_Router, getMatches);
 static PHP_METHOD(Phalcon_Mvc_Router, getModuleName);
@@ -11436,25 +11452,12 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaultController);
 static PHP_METHOD(Phalcon_Mvc_Router, setDefaultModule);
 static PHP_METHOD(Phalcon_Mvc_Router, setDefaultNamespace);
 static PHP_METHOD(Phalcon_Mvc_Router, setDefaults);
-static PHP_METHOD(Phalcon_Mvc_Router, getDefaults);
 static PHP_METHOD(Phalcon_Mvc_Router, setEventsManager);
+static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames);
+static PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds);
 static PHP_METHOD(Phalcon_Mvc_Router, wasMatched);
 zend_object *zephir_init_properties_Phalcon_Mvc_Router(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyroutenames, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_setkeyroutenames, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, keyRouteNames, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyrouteids, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_setkeyrouteids, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, keyRouteIds, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, defaultRoutes, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -11543,6 +11546,15 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getcontrollername, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getdefaults, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyroutenames, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyrouteids, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_getmatchedroute, 0, 0, Phalcon\\Mvc\\Router\\RouteInterface, 1)
 ZEND_END_ARG_INFO()
 
@@ -11609,14 +11621,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_setdefaults, 0
 	ZEND_ARG_ARRAY_INFO(0, defaults, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getdefaults, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_seteventsmanager, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_OBJ_INFO(0, eventsManager, Phalcon\\Events\\ManagerInterface, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_setkeyroutenames, 0, 1, Phalcon\\Mvc\\Router, 0)
+	ZEND_ARG_ARRAY_INFO(0, routeNames, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_setkeyrouteids, 0, 1, Phalcon\\Mvc\\Router, 0)
+	ZEND_ARG_ARRAY_INFO(0, routeIds, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_wasmatched, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
@@ -11624,10 +11641,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_zephir_init_properties_phalcon
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_router_method_entry) {
-	PHP_ME(Phalcon_Mvc_Router, getKeyRouteNames, arginfo_phalcon_mvc_router_getkeyroutenames, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, setKeyRouteNames, arginfo_phalcon_mvc_router_setkeyroutenames, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, getKeyRouteIds, arginfo_phalcon_mvc_router_getkeyrouteids, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, setKeyRouteIds, arginfo_phalcon_mvc_router_setkeyrouteids, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, __construct, arginfo_phalcon_mvc_router___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Router, add, arginfo_phalcon_mvc_router_add, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, addConnect, arginfo_phalcon_mvc_router_addconnect, ZEND_ACC_PUBLIC)
@@ -11645,6 +11658,9 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_router_method_entry) {
 	PHP_ME(Phalcon_Mvc_Router, getEventsManager, arginfo_phalcon_mvc_router_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getActionName, arginfo_phalcon_mvc_router_getactionname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getControllerName, arginfo_phalcon_mvc_router_getcontrollername, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, getDefaults, arginfo_phalcon_mvc_router_getdefaults, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, getKeyRouteNames, arginfo_phalcon_mvc_router_getkeyroutenames, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, getKeyRouteIds, arginfo_phalcon_mvc_router_getkeyrouteids, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getMatchedRoute, arginfo_phalcon_mvc_router_getmatchedroute, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getMatches, arginfo_phalcon_mvc_router_getmatches, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getModuleName, arginfo_phalcon_mvc_router_getmodulename, ZEND_ACC_PUBLIC)
@@ -11663,8 +11679,9 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_router_method_entry) {
 	PHP_ME(Phalcon_Mvc_Router, setDefaultModule, arginfo_phalcon_mvc_router_setdefaultmodule, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, setDefaultNamespace, arginfo_phalcon_mvc_router_setdefaultnamespace, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, setDefaults, arginfo_phalcon_mvc_router_setdefaults, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, getDefaults, arginfo_phalcon_mvc_router_getdefaults, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, setEventsManager, arginfo_phalcon_mvc_router_seteventsmanager, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, setKeyRouteNames, arginfo_phalcon_mvc_router_setkeyroutenames, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, setKeyRouteIds, arginfo_phalcon_mvc_router_setkeyrouteids, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, wasMatched, arginfo_phalcon_mvc_router_wasmatched, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
@@ -13001,9 +13018,6 @@ zend_class_entry *phalcon_acl_adapter_memory_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_Memory);
 
-static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction);
-static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount);
-static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, __construct);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponent);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponentAccess);
@@ -13012,6 +13026,9 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addRole);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, dropComponentAccess);
+static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction);
+static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount);
+static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getComponents);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getInheritedRoles);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, getNoArgumentsDefaultAction);
@@ -13024,15 +13041,6 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess);
 static PHP_METHOD(Phalcon_Acl_Adapter_Memory, checkExists);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunction, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivekey, 0, 0, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_adapter_memory___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -13078,6 +13086,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_dropc
 	ZEND_ARG_INFO(0, accessList)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunction, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivekey, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getcomponents, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -13139,13 +13156,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_check
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_adapter_memory_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, arginfo_phalcon_acl_adapter_memory_getactivefunction, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, NULL, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount, arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveKey, arginfo_phalcon_acl_adapter_memory_getactivekey, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Acl_Adapter_Memory, __construct, arginfo_phalcon_acl_adapter_memory___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 #else
@@ -13158,6 +13168,13 @@ ZEPHIR_INIT_FUNCS(phalcon_acl_adapter_memory_method_entry) {
 	PHP_ME(Phalcon_Acl_Adapter_Memory, allow, arginfo_phalcon_acl_adapter_memory_allow, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, deny, arginfo_phalcon_acl_adapter_memory_deny, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, dropComponentAccess, arginfo_phalcon_acl_adapter_memory_dropcomponentaccess, ZEND_ACC_PUBLIC)
+#if PHP_VERSION_ID >= 80000
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, arginfo_phalcon_acl_adapter_memory_getactivefunction, ZEND_ACC_PUBLIC)
+#else
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, NULL, ZEND_ACC_PUBLIC)
+#endif
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount, arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveKey, arginfo_phalcon_acl_adapter_memory_getactivekey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, getComponents, arginfo_phalcon_acl_adapter_memory_getcomponents, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, getInheritedRoles, arginfo_phalcon_acl_adapter_memory_getinheritedroles, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, getNoArgumentsDefaultAction, arginfo_phalcon_acl_adapter_memory_getnoargumentsdefaultaction, ZEND_ACC_PUBLIC)
@@ -13176,30 +13193,30 @@ zend_class_entry *phalcon_acl_component_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Component);
 
+static PHP_METHOD(Phalcon_Acl_Component, __construct);
+static PHP_METHOD(Phalcon_Acl_Component, __toString);
 static PHP_METHOD(Phalcon_Acl_Component, getDescription);
 static PHP_METHOD(Phalcon_Acl_Component, getName);
-static PHP_METHOD(Phalcon_Acl_Component, __toString);
-static PHP_METHOD(Phalcon_Acl_Component, __construct);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getdescription, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_component___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getname, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component___tostring, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component___tostring, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getdescription, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_component___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_component_method_entry) {
+	PHP_ME(Phalcon_Acl_Component, __construct, arginfo_phalcon_acl_component___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Acl_Component, __toString, arginfo_phalcon_acl_component___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Component, getDescription, arginfo_phalcon_acl_component_getdescription, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Component, getName, arginfo_phalcon_acl_component_getname, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Component, __toString, arginfo_phalcon_acl_component___tostring, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Component, __construct, arginfo_phalcon_acl_component___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
 
@@ -13229,12 +13246,14 @@ zend_class_entry *phalcon_acl_role_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Role);
 
-static PHP_METHOD(Phalcon_Acl_Role, getName);
+static PHP_METHOD(Phalcon_Acl_Role, __construct);
 static PHP_METHOD(Phalcon_Acl_Role, __toString);
 static PHP_METHOD(Phalcon_Acl_Role, getDescription);
-static PHP_METHOD(Phalcon_Acl_Role, __construct);
+static PHP_METHOD(Phalcon_Acl_Role, getName);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role_getname, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_role___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role___tostring, 0, 0, IS_STRING, 0)
@@ -13243,16 +13262,14 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role_getdescription, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_role___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_role_method_entry) {
-	PHP_ME(Phalcon_Acl_Role, getName, arginfo_phalcon_acl_role_getname, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Acl_Role, __construct, arginfo_phalcon_acl_role___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Acl_Role, __toString, arginfo_phalcon_acl_role___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Role, getDescription, arginfo_phalcon_acl_role_getdescription, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Role, __construct, arginfo_phalcon_acl_role___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Acl_Role, getName, arginfo_phalcon_acl_role_getname, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -13595,16 +13612,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection___construct, 0, 0,
 #endif
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getclassannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_annotations_reflection_getclassannotations, 0, 0, Phalcon\\Annotations\\Collection, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getconstantsannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getconstantsannotations, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getpropertiesannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getpropertiesannotations, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getmethodsannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getmethodsannotations, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getreflectiondata, 0, 0, IS_ARRAY, 0)
@@ -13615,26 +13632,10 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_annotations_reflection_method_entry) {
 	PHP_ME(Phalcon_Annotations_Reflection, __construct, arginfo_phalcon_annotations_reflection___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getClassAnnotations, arginfo_phalcon_annotations_reflection_getclassannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getClassAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getConstantsAnnotations, arginfo_phalcon_annotations_reflection_getconstantsannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getConstantsAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getPropertiesAnnotations, arginfo_phalcon_annotations_reflection_getpropertiesannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getPropertiesAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getMethodsAnnotations, arginfo_phalcon_annotations_reflection_getmethodsannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getMethodsAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
 	PHP_ME(Phalcon_Annotations_Reflection, getReflectionData, arginfo_phalcon_annotations_reflection_getreflectiondata, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
@@ -13691,27 +13692,27 @@ zend_class_entry *phalcon_assets_collection_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Assets_Collection);
 
+static PHP_METHOD(Phalcon_Assets_Collection, add);
+static PHP_METHOD(Phalcon_Assets_Collection, addCss);
+static PHP_METHOD(Phalcon_Assets_Collection, addFilter);
+static PHP_METHOD(Phalcon_Assets_Collection, addInline);
+static PHP_METHOD(Phalcon_Assets_Collection, addInlineCss);
+static PHP_METHOD(Phalcon_Assets_Collection, addInlineJs);
+static PHP_METHOD(Phalcon_Assets_Collection, addJs);
+static PHP_METHOD(Phalcon_Assets_Collection, count);
 static PHP_METHOD(Phalcon_Assets_Collection, getAssets);
 static PHP_METHOD(Phalcon_Assets_Collection, getAttributes);
 static PHP_METHOD(Phalcon_Assets_Collection, getCodes);
 static PHP_METHOD(Phalcon_Assets_Collection, getFilters);
+static PHP_METHOD(Phalcon_Assets_Collection, getIterator);
 static PHP_METHOD(Phalcon_Assets_Collection, getJoin);
 static PHP_METHOD(Phalcon_Assets_Collection, getPrefix);
+static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath);
 static PHP_METHOD(Phalcon_Assets_Collection, getSourcePath);
 static PHP_METHOD(Phalcon_Assets_Collection, getTargetIsLocal);
 static PHP_METHOD(Phalcon_Assets_Collection, getTargetPath);
 static PHP_METHOD(Phalcon_Assets_Collection, getTargetUri);
 static PHP_METHOD(Phalcon_Assets_Collection, getVersion);
-static PHP_METHOD(Phalcon_Assets_Collection, add);
-static PHP_METHOD(Phalcon_Assets_Collection, addCss);
-static PHP_METHOD(Phalcon_Assets_Collection, addFilter);
-static PHP_METHOD(Phalcon_Assets_Collection, addInline);
-static PHP_METHOD(Phalcon_Assets_Collection, addInlineCss);
-static PHP_METHOD(Phalcon_Assets_Collection, addInlineJs);
-static PHP_METHOD(Phalcon_Assets_Collection, addJs);
-static PHP_METHOD(Phalcon_Assets_Collection, count);
-static PHP_METHOD(Phalcon_Assets_Collection, getIterator);
-static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath);
 static PHP_METHOD(Phalcon_Assets_Collection, has);
 static PHP_METHOD(Phalcon_Assets_Collection, isAutoVersion);
 static PHP_METHOD(Phalcon_Assets_Collection, isLocal);
@@ -13732,39 +13733,6 @@ static PHP_METHOD(Phalcon_Assets_Collection, processAddInline);
 static PHP_METHOD(Phalcon_Assets_Collection, processAttributes);
 zend_object *zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getassets, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getattributes, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getcodes, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getfilters, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getjoin, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getprefix, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getsourcepath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetislocal, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetpath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargeturi, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getversion, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_collection_add, 0, 1, Phalcon\\Assets\\Collection, 0)
 	ZEND_ARG_OBJ_INFO(0, asset, Phalcon\\Assets\\AssetInterface, 0)
 ZEND_END_ARG_INFO()
@@ -13826,13 +13794,46 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getassets, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getattributes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getcodes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getfilters, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_collection_getiterator, 0, 0, Traversable, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getjoin, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getprefix, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getrealtargetpath, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getsourcepath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetislocal, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetpath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargeturi, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getversion, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_has, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, asset, Phalcon\\Assets\\AssetInterface, 0)
 ZEND_END_ARG_INFO()
@@ -13924,27 +13925,27 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_zephir_init_properties_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_assets_collection_method_entry) {
+	PHP_ME(Phalcon_Assets_Collection, add, arginfo_phalcon_assets_collection_add, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addCss, arginfo_phalcon_assets_collection_addcss, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addFilter, arginfo_phalcon_assets_collection_addfilter, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addInline, arginfo_phalcon_assets_collection_addinline, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addInlineCss, arginfo_phalcon_assets_collection_addinlinecss, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addInlineJs, arginfo_phalcon_assets_collection_addinlinejs, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addJs, arginfo_phalcon_assets_collection_addjs, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, count, arginfo_phalcon_assets_collection_count, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getAssets, arginfo_phalcon_assets_collection_getassets, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getAttributes, arginfo_phalcon_assets_collection_getattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getCodes, arginfo_phalcon_assets_collection_getcodes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getFilters, arginfo_phalcon_assets_collection_getfilters, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, getIterator, arginfo_phalcon_assets_collection_getiterator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getJoin, arginfo_phalcon_assets_collection_getjoin, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getPrefix, arginfo_phalcon_assets_collection_getprefix, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, getRealTargetPath, arginfo_phalcon_assets_collection_getrealtargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getSourcePath, arginfo_phalcon_assets_collection_getsourcepath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getTargetIsLocal, arginfo_phalcon_assets_collection_gettargetislocal, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getTargetPath, arginfo_phalcon_assets_collection_gettargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getTargetUri, arginfo_phalcon_assets_collection_gettargeturi, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getVersion, arginfo_phalcon_assets_collection_getversion, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, add, arginfo_phalcon_assets_collection_add, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addCss, arginfo_phalcon_assets_collection_addcss, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addFilter, arginfo_phalcon_assets_collection_addfilter, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addInline, arginfo_phalcon_assets_collection_addinline, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addInlineCss, arginfo_phalcon_assets_collection_addinlinecss, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addInlineJs, arginfo_phalcon_assets_collection_addinlinejs, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addJs, arginfo_phalcon_assets_collection_addjs, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, count, arginfo_phalcon_assets_collection_count, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, getIterator, arginfo_phalcon_assets_collection_getiterator, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, getRealTargetPath, arginfo_phalcon_assets_collection_getrealtargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, has, arginfo_phalcon_assets_collection_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, isAutoVersion, arginfo_phalcon_assets_collection_isautoversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, isLocal, arginfo_phalcon_assets_collection_islocal, ZEND_ACC_PUBLIC)
@@ -16486,17 +16487,17 @@ zend_class_entry *phalcon_db_column_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Column);
 
+static PHP_METHOD(Phalcon_Db_Column, __construct);
+static PHP_METHOD(Phalcon_Db_Column, getAfterPosition);
+static PHP_METHOD(Phalcon_Db_Column, getBindType);
+static PHP_METHOD(Phalcon_Db_Column, getComment);
 static PHP_METHOD(Phalcon_Db_Column, getDefault);
 static PHP_METHOD(Phalcon_Db_Column, getName);
-static PHP_METHOD(Phalcon_Db_Column, getComment);
 static PHP_METHOD(Phalcon_Db_Column, getScale);
 static PHP_METHOD(Phalcon_Db_Column, getSize);
 static PHP_METHOD(Phalcon_Db_Column, getType);
 static PHP_METHOD(Phalcon_Db_Column, getTypeReference);
 static PHP_METHOD(Phalcon_Db_Column, getTypeValues);
-static PHP_METHOD(Phalcon_Db_Column, __construct);
-static PHP_METHOD(Phalcon_Db_Column, getAfterPosition);
-static PHP_METHOD(Phalcon_Db_Column, getBindType);
 static PHP_METHOD(Phalcon_Db_Column, hasDefault);
 static PHP_METHOD(Phalcon_Db_Column, isAutoIncrement);
 static PHP_METHOD(Phalcon_Db_Column, isFirst);
@@ -16505,39 +16506,39 @@ static PHP_METHOD(Phalcon_Db_Column, isNumeric);
 static PHP_METHOD(Phalcon_Db_Column, isPrimary);
 static PHP_METHOD(Phalcon_Db_Column, isUnsigned);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getdefault, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column___construct, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_ARRAY_INFO(0, definition, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getname, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getafterposition, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getcomment, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getbindtype, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getscale, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getcomment, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getsize, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getdefault, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettype, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettypereference, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getscale, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_gettypevalues, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getsize, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column___construct, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_ARRAY_INFO(0, definition, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettype, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getafterposition, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettypereference, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getbindtype, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_gettypevalues, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_hasdefault, 0, 0, _IS_BOOL, 0)
@@ -16562,13 +16563,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_isunsigned, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_column_method_entry) {
+	PHP_ME(Phalcon_Db_Column, __construct, arginfo_phalcon_db_column___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Db_Column, getAfterPosition, arginfo_phalcon_db_column_getafterposition, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Column, getBindType, arginfo_phalcon_db_column_getbindtype, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Column, getComment, arginfo_phalcon_db_column_getcomment, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Db_Column, getDefault, arginfo_phalcon_db_column_getdefault, ZEND_ACC_PUBLIC)
 #else
 	PHP_ME(Phalcon_Db_Column, getDefault, NULL, ZEND_ACC_PUBLIC)
 #endif
 	PHP_ME(Phalcon_Db_Column, getName, arginfo_phalcon_db_column_getname, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Column, getComment, arginfo_phalcon_db_column_getcomment, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, getScale, arginfo_phalcon_db_column_getscale, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Db_Column, getSize, arginfo_phalcon_db_column_getsize, ZEND_ACC_PUBLIC)
@@ -16582,9 +16586,6 @@ ZEPHIR_INIT_FUNCS(phalcon_db_column_method_entry) {
 #else
 	PHP_ME(Phalcon_Db_Column, getTypeValues, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Db_Column, __construct, arginfo_phalcon_db_column___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Db_Column, getAfterPosition, arginfo_phalcon_db_column_getafterposition, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Column, getBindType, arginfo_phalcon_db_column_getbindtype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, hasDefault, arginfo_phalcon_db_column_hasdefault, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, isAutoIncrement, arginfo_phalcon_db_column_isautoincrement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, isFirst, arginfo_phalcon_db_column_isfirst, ZEND_ACC_PUBLIC)
@@ -17222,10 +17223,16 @@ zend_class_entry *phalcon_db_index_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Index);
 
+static PHP_METHOD(Phalcon_Db_Index, __construct);
 static PHP_METHOD(Phalcon_Db_Index, getColumns);
 static PHP_METHOD(Phalcon_Db_Index, getName);
 static PHP_METHOD(Phalcon_Db_Index, getType);
-static PHP_METHOD(Phalcon_Db_Index, __construct);
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_index___construct, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_ARRAY_INFO(0, columns, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_index_getcolumns, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -17236,17 +17243,11 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_index_gettype, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_index___construct, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_ARRAY_INFO(0, columns, 0)
-	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEPHIR_INIT_FUNCS(phalcon_db_index_method_entry) {
+	PHP_ME(Phalcon_Db_Index, __construct, arginfo_phalcon_db_index___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Db_Index, getColumns, arginfo_phalcon_db_index_getcolumns, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Index, getName, arginfo_phalcon_db_index_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Index, getType, arginfo_phalcon_db_index_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Index, __construct, arginfo_phalcon_db_index___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
 
@@ -17301,68 +17302,68 @@ zend_class_entry *phalcon_db_profiler_item_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Profiler_Item);
 
-static PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime);
 static PHP_METHOD(Phalcon_Db_Profiler_Item, getFinalTime);
-static PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime);
 static PHP_METHOD(Phalcon_Db_Profiler_Item, getInitialTime);
-static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes);
 static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlBindTypes);
-static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement);
 static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlStatement);
-static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables);
 static PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlVariables);
 static PHP_METHOD(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds);
+static PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime);
+static PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime);
+static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes);
+static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement);
+static PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setfinaltime, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, finalTime, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getfinaltime, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getfinaltime, 0, 0, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getinitialtime, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setinitialtime, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, initialTime, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlbindtypes, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getinitialtime, 0, 0, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlstatement, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlbindtypes, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, sqlBindTypes, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlvariables, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlbindtypes, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_gettotalelapsedseconds, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlstatement, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, sqlStatement, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setfinaltime, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_TYPE_INFO(0, finalTime, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlstatement, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setinitialtime, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_TYPE_INFO(0, initialTime, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlvariables, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, sqlVariables, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlbindtypes, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_ARRAY_INFO(0, sqlBindTypes, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlvariables, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlstatement, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_TYPE_INFO(0, sqlStatement, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_gettotalelapsedseconds, 0, 0, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlvariables, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_ARRAY_INFO(0, sqlVariables, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_profiler_item_method_entry) {
-	PHP_ME(Phalcon_Db_Profiler_Item, setFinalTime, arginfo_phalcon_db_profiler_item_setfinaltime, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getFinalTime, arginfo_phalcon_db_profiler_item_getfinaltime, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setInitialTime, arginfo_phalcon_db_profiler_item_setinitialtime, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getInitialTime, arginfo_phalcon_db_profiler_item_getinitialtime, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setSqlBindTypes, arginfo_phalcon_db_profiler_item_setsqlbindtypes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getSqlBindTypes, arginfo_phalcon_db_profiler_item_getsqlbindtypes, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setSqlStatement, arginfo_phalcon_db_profiler_item_setsqlstatement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getSqlStatement, arginfo_phalcon_db_profiler_item_getsqlstatement, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setSqlVariables, arginfo_phalcon_db_profiler_item_setsqlvariables, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getSqlVariables, arginfo_phalcon_db_profiler_item_getsqlvariables, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds, arginfo_phalcon_db_profiler_item_gettotalelapsedseconds, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setFinalTime, arginfo_phalcon_db_profiler_item_setfinaltime, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setInitialTime, arginfo_phalcon_db_profiler_item_setinitialtime, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setSqlBindTypes, arginfo_phalcon_db_profiler_item_setsqlbindtypes, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setSqlStatement, arginfo_phalcon_db_profiler_item_setsqlstatement, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setSqlVariables, arginfo_phalcon_db_profiler_item_setsqlvariables, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -17370,24 +17371,24 @@ zend_class_entry *phalcon_db_rawvalue_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_RawValue);
 
-static PHP_METHOD(Phalcon_Db_RawValue, getValue);
-static PHP_METHOD(Phalcon_Db_RawValue, __toString);
 static PHP_METHOD(Phalcon_Db_RawValue, __construct);
+static PHP_METHOD(Phalcon_Db_RawValue, __toString);
+static PHP_METHOD(Phalcon_Db_RawValue, getValue);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_rawvalue_getvalue, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_rawvalue___construct, 0, 0, 1)
+	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_rawvalue___tostring, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_rawvalue___construct, 0, 0, 1)
-	ZEND_ARG_INFO(0, value)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_rawvalue_getvalue, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_rawvalue_method_entry) {
-	PHP_ME(Phalcon_Db_RawValue, getValue, arginfo_phalcon_db_rawvalue_getvalue, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_RawValue, __toString, arginfo_phalcon_db_rawvalue___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_RawValue, __construct, arginfo_phalcon_db_rawvalue___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Db_RawValue, __toString, arginfo_phalcon_db_rawvalue___tostring, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_RawValue, getValue, arginfo_phalcon_db_rawvalue_getvalue, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -17395,6 +17396,7 @@ zend_class_entry *phalcon_db_reference_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Reference);
 
+static PHP_METHOD(Phalcon_Db_Reference, __construct);
 static PHP_METHOD(Phalcon_Db_Reference, getColumns);
 static PHP_METHOD(Phalcon_Db_Reference, getName);
 static PHP_METHOD(Phalcon_Db_Reference, getReferencedColumns);
@@ -17403,7 +17405,11 @@ static PHP_METHOD(Phalcon_Db_Reference, getReferencedTable);
 static PHP_METHOD(Phalcon_Db_Reference, getSchemaName);
 static PHP_METHOD(Phalcon_Db_Reference, getOnDelete);
 static PHP_METHOD(Phalcon_Db_Reference, getOnUpdate);
-static PHP_METHOD(Phalcon_Db_Reference, __construct);
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_reference___construct, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_ARRAY_INFO(0, definition, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_reference_getcolumns, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -17429,12 +17435,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_reference_getonupdate, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_reference___construct, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_ARRAY_INFO(0, definition, 0)
-ZEND_END_ARG_INFO()
-
 ZEPHIR_INIT_FUNCS(phalcon_db_reference_method_entry) {
+	PHP_ME(Phalcon_Db_Reference, __construct, arginfo_phalcon_db_reference___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Db_Reference, getColumns, arginfo_phalcon_db_reference_getcolumns, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getName, arginfo_phalcon_db_reference_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getReferencedColumns, arginfo_phalcon_db_reference_getreferencedcolumns, ZEND_ACC_PUBLIC)
@@ -17443,7 +17445,6 @@ ZEPHIR_INIT_FUNCS(phalcon_db_reference_method_entry) {
 	PHP_ME(Phalcon_Db_Reference, getSchemaName, arginfo_phalcon_db_reference_getschemaname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getOnDelete, arginfo_phalcon_db_reference_getondelete, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getOnUpdate, arginfo_phalcon_db_reference_getonupdate, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Reference, __construct, arginfo_phalcon_db_reference___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
 
@@ -17686,12 +17687,12 @@ zend_class_entry *phalcon_domain_payload_payload_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Domain_Payload_Payload);
 
+static PHP_METHOD(Phalcon_Domain_Payload_Payload, getException);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, getExtras);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, getInput);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, getMessages);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, getStatus);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, getOutput);
-static PHP_METHOD(Phalcon_Domain_Payload_Payload, getException);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, setException);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, setExtras);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, setInput);
@@ -17699,6 +17700,9 @@ static PHP_METHOD(Phalcon_Domain_Payload_Payload, setMessages);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, setOutput);
 static PHP_METHOD(Phalcon_Domain_Payload_Payload, setStatus);
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_getexception, 0, 0, Throwable, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_domain_payload_payload_getextras, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -17714,9 +17718,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_domain_payload_payload_getoutput, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_getexception, 0, 0, Throwable, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_setexception, 0, 1, Phalcon\\Domain\\Payload\\PayloadInterface, 0)
 	ZEND_ARG_OBJ_INFO(0, exception, Throwable, 0)
 ZEND_END_ARG_INFO()
@@ -17742,6 +17743,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_se
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_domain_payload_payload_method_entry) {
+	PHP_ME(Phalcon_Domain_Payload_Payload, getException, arginfo_phalcon_domain_payload_payload_getexception, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Domain_Payload_Payload, getExtras, arginfo_phalcon_domain_payload_payload_getextras, ZEND_ACC_PUBLIC)
 #else
@@ -17767,7 +17769,6 @@ ZEPHIR_INIT_FUNCS(phalcon_domain_payload_payload_method_entry) {
 #else
 	PHP_ME(Phalcon_Domain_Payload_Payload, getOutput, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Domain_Payload_Payload, getException, arginfo_phalcon_domain_payload_payload_getexception, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Domain_Payload_Payload, setException, arginfo_phalcon_domain_payload_payload_setexception, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Domain_Payload_Payload, setExtras, arginfo_phalcon_domain_payload_payload_setextras, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Domain_Payload_Payload, setInput, arginfo_phalcon_domain_payload_payload_setinput, ZEND_ACC_PUBLIC)
@@ -18260,7 +18261,6 @@ zend_class_entry *phalcon_encryption_security_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security);
 
-static PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor);
 static PHP_METHOD(Phalcon_Encryption_Security, __construct);
 static PHP_METHOD(Phalcon_Encryption_Security, checkHash);
 static PHP_METHOD(Phalcon_Encryption_Security, checkToken);
@@ -18275,6 +18275,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, getSessionToken);
 static PHP_METHOD(Phalcon_Encryption_Security, getSaltBytes);
 static PHP_METHOD(Phalcon_Encryption_Security, getToken);
 static PHP_METHOD(Phalcon_Encryption_Security, getTokenKey);
+static PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor);
 static PHP_METHOD(Phalcon_Encryption_Security, hash);
 static PHP_METHOD(Phalcon_Encryption_Security, isLegacyHash);
 static PHP_METHOD(Phalcon_Encryption_Security, setDefaultHash);
@@ -18287,9 +18288,6 @@ static PHP_METHOD(Phalcon_Encryption_Security, processCost);
 static PHP_METHOD(Phalcon_Encryption_Security, processTokenKey);
 static PHP_METHOD(Phalcon_Encryption_Security, processUserToken);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getworkfactor, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security___construct, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO(0, session, Phalcon\\Session\\ManagerInterface, 1)
 	ZEND_ARG_OBJ_INFO(0, request, Phalcon\\Http\\RequestInterface, 1)
@@ -18346,6 +18344,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gettokenkey, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getworkfactor, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_hash, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -18401,7 +18402,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_proc
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) {
-	PHP_ME(Phalcon_Encryption_Security, getWorkFactor, arginfo_phalcon_encryption_security_getworkfactor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, __construct, arginfo_phalcon_encryption_security___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Encryption_Security, checkHash, arginfo_phalcon_encryption_security_checkhash, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, checkToken, arginfo_phalcon_encryption_security_checktoken, ZEND_ACC_PUBLIC)
@@ -18416,6 +18416,7 @@ ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) {
 	PHP_ME(Phalcon_Encryption_Security, getSaltBytes, arginfo_phalcon_encryption_security_getsaltbytes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, getToken, arginfo_phalcon_encryption_security_gettoken, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, getTokenKey, arginfo_phalcon_encryption_security_gettokenkey, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security, getWorkFactor, arginfo_phalcon_encryption_security_getworkfactor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, hash, arginfo_phalcon_encryption_security_hash, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, isLegacyHash, arginfo_phalcon_encryption_security_islegacyhash, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, setDefaultHash, arginfo_phalcon_encryption_security_setdefaulthash, ZEND_ACC_PUBLIC)
@@ -18806,53 +18807,54 @@ zend_class_entry *phalcon_encryption_security_jwt_token_token_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Token_Token);
 
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getClaims);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders);
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature);
-static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, __construct);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getPayload);
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getSignature);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, getToken);
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, validate);
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Token, verify);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getclaims, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token___construct, 0, 0, 3)
+	ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
+	ZEND_ARG_OBJ_INFO(0, claims, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
+	ZEND_ARG_OBJ_INFO(0, signature, Phalcon\\Encryption\\Security\\JWT\\Token\\Signature, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getheaders, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getclaims, 0, 0, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getsignature, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getheaders, 0, 0, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token___construct, 0, 0, 3)
-	ZEND_ARG_OBJ_INFO(0, headers, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
-	ZEND_ARG_OBJ_INFO(0, claims, Phalcon\\Encryption\\Security\\JWT\\Token\\Item, 0)
-	ZEND_ARG_OBJ_INFO(0, signature, Phalcon\\Encryption\\Security\\JWT\\Token\\Signature, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getpayload, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getpayload, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_getsignature, 0, 0, Phalcon\\Encryption\\Security\\JWT\\Token\\Signature, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_gettoken, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_validate, 0, 1, IS_ARRAY, 0)
+	ZEND_ARG_OBJ_INFO(0, validator, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_token_token_verify, 0, 2, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO(0, signer, Phalcon\\Encryption\\Security\\JWT\\Signer\\SignerInterface, 0)
+	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_token_token_method_entry) {
-#if PHP_VERSION_ID >= 80000
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, __construct, arginfo_phalcon_encryption_security_jwt_token_token___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getClaims, arginfo_phalcon_encryption_security_jwt_token_token_getclaims, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getClaims, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders, arginfo_phalcon_encryption_security_jwt_token_token_getheaders, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getHeaders, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getSignature, arginfo_phalcon_encryption_security_jwt_token_token_getsignature, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getSignature, NULL, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, __construct, arginfo_phalcon_encryption_security_jwt_token_token___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getPayload, arginfo_phalcon_encryption_security_jwt_token_token_getpayload, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getSignature, arginfo_phalcon_encryption_security_jwt_token_token_getsignature, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, getToken, arginfo_phalcon_encryption_security_jwt_token_token_gettoken, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, validate, arginfo_phalcon_encryption_security_jwt_token_token_validate, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Token_Token, verify, arginfo_phalcon_encryption_security_jwt_token_token_verify, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -18861,6 +18863,7 @@ zend_class_entry *phalcon_encryption_security_jwt_validator_ce;
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security_JWT_Validator);
 
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, __construct);
+static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getErrors);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, setToken);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateAudience);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration);
@@ -18870,18 +18873,22 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuer);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateSignature);
 static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, getTimestamp);
+zend_object *zephir_init_properties_Phalcon_Encryption_Security_JWT_Validator(zend_class_entry *class_type);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, token, Phalcon\\Encryption\\Security\\JWT\\Token\\Token, 0)
 	ZEND_ARG_TYPE_INFO(0, timeShift, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_geterrors, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_settoken, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
 	ZEND_ARG_OBJ_INFO(0, token, Phalcon\\Encryption\\Security\\JWT\\Token\\Token, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_validateaudience, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
-	ZEND_ARG_TYPE_INFO(0, audience, IS_STRING, 0)
+	ZEND_ARG_INFO(0, audience)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_validateexpiration, 0, 1, Phalcon\\Encryption\\Security\\JWT\\Validator, 0)
@@ -18913,8 +18920,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_jwt_
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security_jwt_validator_zephir_init_properties_phalcon_encryption_security_jwt_validator, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_encryption_security_jwt_validator_method_entry) {
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, __construct, arginfo_phalcon_encryption_security_jwt_validator___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, getErrors, arginfo_phalcon_encryption_security_jwt_validator_geterrors, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, setToken, arginfo_phalcon_encryption_security_jwt_validator_settoken, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, validateAudience, arginfo_phalcon_encryption_security_jwt_validator_validateaudience, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security_JWT_Validator, validateExpiration, arginfo_phalcon_encryption_security_jwt_validator_validateexpiration, ZEND_ACC_PUBLIC)
@@ -18996,30 +19007,34 @@ zend_class_entry *phalcon_events_event_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Events_Event);
 
+static PHP_METHOD(Phalcon_Events_Event, __construct);
 static PHP_METHOD(Phalcon_Events_Event, getData);
 static PHP_METHOD(Phalcon_Events_Event, getSource);
 static PHP_METHOD(Phalcon_Events_Event, getType);
-static PHP_METHOD(Phalcon_Events_Event, __construct);
 static PHP_METHOD(Phalcon_Events_Event, isCancelable);
 static PHP_METHOD(Phalcon_Events_Event, isStopped);
 static PHP_METHOD(Phalcon_Events_Event, setData);
 static PHP_METHOD(Phalcon_Events_Event, setType);
 static PHP_METHOD(Phalcon_Events_Event, stop);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event_getdata, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
+	ZEND_ARG_INFO(0, source)
+	ZEND_ARG_INFO(0, data)
+	ZEND_ARG_TYPE_INFO(0, cancelable, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_events_event_getsource, 0, 0, NULL, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event_getdata, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_gettype, 0, 0, IS_STRING, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_events_event_getsource, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_getsource, 0, 0, IS_OBJECT, 1)
+#endif
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
-	ZEND_ARG_INFO(0, source)
-	ZEND_ARG_INFO(0, data)
-	ZEND_ARG_TYPE_INFO(0, cancelable, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_gettype, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_iscancelable, 0, 0, _IS_BOOL, 0)
@@ -19040,6 +19055,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_events_event_stop, 0, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_events_event_method_entry) {
+	PHP_ME(Phalcon_Events_Event, __construct, arginfo_phalcon_events_event___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Events_Event, getData, arginfo_phalcon_events_event_getdata, ZEND_ACC_PUBLIC)
 #else
@@ -19047,7 +19063,6 @@ ZEPHIR_INIT_FUNCS(phalcon_events_event_method_entry) {
 #endif
 	PHP_ME(Phalcon_Events_Event, getSource, arginfo_phalcon_events_event_getsource, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, getType, arginfo_phalcon_events_event_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Events_Event, __construct, arginfo_phalcon_events_event___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Events_Event, isCancelable, arginfo_phalcon_events_event_iscancelable, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, isStopped, arginfo_phalcon_events_event_isstopped, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, setData, arginfo_phalcon_events_event_setdata, ZEND_ACC_PUBLIC)
@@ -19656,12 +19671,11 @@ zend_class_entry *phalcon_filter_validation_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation);
 
-static PHP_METHOD(Phalcon_Filter_Validation, getData);
-static PHP_METHOD(Phalcon_Filter_Validation, setValidators);
 static PHP_METHOD(Phalcon_Filter_Validation, __construct);
 static PHP_METHOD(Phalcon_Filter_Validation, add);
 static PHP_METHOD(Phalcon_Filter_Validation, appendMessage);
 static PHP_METHOD(Phalcon_Filter_Validation, bind);
+static PHP_METHOD(Phalcon_Filter_Validation, getData);
 static PHP_METHOD(Phalcon_Filter_Validation, getEntity);
 static PHP_METHOD(Phalcon_Filter_Validation, getFilters);
 static PHP_METHOD(Phalcon_Filter_Validation, getLabel);
@@ -19675,17 +19689,11 @@ static PHP_METHOD(Phalcon_Filter_Validation, rules);
 static PHP_METHOD(Phalcon_Filter_Validation, setEntity);
 static PHP_METHOD(Phalcon_Filter_Validation, setFilters);
 static PHP_METHOD(Phalcon_Filter_Validation, setLabels);
+static PHP_METHOD(Phalcon_Filter_Validation, setValidators);
 static PHP_METHOD(Phalcon_Filter_Validation, validate);
 static PHP_METHOD(Phalcon_Filter_Validation, preChecking);
 zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getdata, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_setvalidators, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, validators, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, validators, IS_ARRAY, 0, "[]")
@@ -19708,6 +19716,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_bind, 0
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getdata, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getentity, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -19764,6 +19775,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_setlab
 	ZEND_ARG_ARRAY_INFO(0, labels, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_setvalidators, 0, 1, Phalcon\\Filter\\Validation, 0)
+	ZEND_ARG_ARRAY_INFO(0, validators, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, Phalcon\\Messages\\Messages, 0)
 	ZEND_ARG_INFO(0, data)
 	ZEND_ARG_INFO(0, entity)
@@ -19778,16 +19793,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_zephir_init_properties_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_filter_validation_method_entry) {
+	PHP_ME(Phalcon_Filter_Validation, __construct, arginfo_phalcon_filter_validation___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Filter_Validation, add, arginfo_phalcon_filter_validation_add, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation, appendMessage, arginfo_phalcon_filter_validation_appendmessage, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation, bind, arginfo_phalcon_filter_validation_bind, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Filter_Validation, getData, arginfo_phalcon_filter_validation_getdata, ZEND_ACC_PUBLIC)
 #else
 	PHP_ME(Phalcon_Filter_Validation, getData, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Filter_Validation, setValidators, arginfo_phalcon_filter_validation_setvalidators, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation, __construct, arginfo_phalcon_filter_validation___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Filter_Validation, add, arginfo_phalcon_filter_validation_add, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation, appendMessage, arginfo_phalcon_filter_validation_appendmessage, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation, bind, arginfo_phalcon_filter_validation_bind, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Filter_Validation, getEntity, arginfo_phalcon_filter_validation_getentity, ZEND_ACC_PUBLIC)
 #else
@@ -19805,6 +19819,7 @@ ZEPHIR_INIT_FUNCS(phalcon_filter_validation_method_entry) {
 	PHP_ME(Phalcon_Filter_Validation, setEntity, arginfo_phalcon_filter_validation_setentity, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, setFilters, arginfo_phalcon_filter_validation_setfilters, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, setLabels, arginfo_phalcon_filter_validation_setlabels, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation, setValidators, arginfo_phalcon_filter_validation_setvalidators, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, validate, arginfo_phalcon_filter_validation_validate, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, preChecking, arginfo_phalcon_filter_validation_prechecking, ZEND_ACC_PROTECTED)
 	PHP_FE_END
@@ -20840,8 +20855,6 @@ zend_class_entry *phalcon_forms_form_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Forms_Form);
 
-static PHP_METHOD(Phalcon_Forms_Form, getValidation);
-static PHP_METHOD(Phalcon_Forms_Form, getWhitelist);
 static PHP_METHOD(Phalcon_Forms_Form, __construct);
 static PHP_METHOD(Phalcon_Forms_Form, add);
 static PHP_METHOD(Phalcon_Forms_Form, bind);
@@ -20861,6 +20874,8 @@ static PHP_METHOD(Phalcon_Forms_Form, getTagFactory);
 static PHP_METHOD(Phalcon_Forms_Form, getUserOption);
 static PHP_METHOD(Phalcon_Forms_Form, getUserOptions);
 static PHP_METHOD(Phalcon_Forms_Form, getValue);
+static PHP_METHOD(Phalcon_Forms_Form, getValidation);
+static PHP_METHOD(Phalcon_Forms_Form, getWhitelist);
 static PHP_METHOD(Phalcon_Forms_Form, has);
 static PHP_METHOD(Phalcon_Forms_Form, hasMessagesFor);
 static PHP_METHOD(Phalcon_Forms_Form, isValid);
@@ -20881,12 +20896,6 @@ static PHP_METHOD(Phalcon_Forms_Form, setUserOptions);
 static PHP_METHOD(Phalcon_Forms_Form, valid);
 zend_object *zephir_init_properties_Phalcon_Forms_Form(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getvalidation, 0, 0, IS_NULL, 1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getwhitelist, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, entity)
 #if PHP_VERSION_ID >= 80000
@@ -20972,6 +20981,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_getvalue, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_forms_form_getvalidation, 0, 0, Phalcon\\Filter\\Validation\\ValidationInterface, 1)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_getwhitelist, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_has, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -21061,8 +21076,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_zephir_init_properties_phalcon
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) {
-	PHP_ME(Phalcon_Forms_Form, getValidation, arginfo_phalcon_forms_form_getvalidation, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Forms_Form, getWhitelist, arginfo_phalcon_forms_form_getwhitelist, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, __construct, arginfo_phalcon_forms_form___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Forms_Form, add, arginfo_phalcon_forms_form_add, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, bind, arginfo_phalcon_forms_form_bind, ZEND_ACC_PUBLIC)
@@ -21090,6 +21103,8 @@ ZEPHIR_INIT_FUNCS(phalcon_forms_form_method_entry) {
 	PHP_ME(Phalcon_Forms_Form, getUserOption, arginfo_phalcon_forms_form_getuseroption, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, getUserOptions, arginfo_phalcon_forms_form_getuseroptions, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, getValue, arginfo_phalcon_forms_form_getvalue, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Forms_Form, getValidation, arginfo_phalcon_forms_form_getvalidation, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Forms_Form, getWhitelist, arginfo_phalcon_forms_form_getwhitelist, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, has, arginfo_phalcon_forms_form_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, hasMessagesFor, arginfo_phalcon_forms_form_hasmessagesfor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Forms_Form, isValid, arginfo_phalcon_forms_form_isvalid, ZEND_ACC_PUBLIC)
@@ -21179,22 +21194,15 @@ zend_class_entry *phalcon_html_breadcrumbs_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Html_Breadcrumbs);
 
-static PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator);
-static PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator);
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, add);
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, clear);
+static PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator);
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, remove);
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, render);
+static PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator);
 static PHP_METHOD(Phalcon_Html_Breadcrumbs, toArray);
 zend_object *zephir_init_properties_Phalcon_Html_Breadcrumbs(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_getseparator, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_breadcrumbs_setseparator, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, separator, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_html_breadcrumbs_add, 0, 1, Phalcon\\Html\\Breadcrumbs, 0)
 	ZEND_ARG_TYPE_INFO(0, label, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, link, IS_STRING, 0)
@@ -21203,6 +21211,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_clear, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_getseparator, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_remove, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_TYPE_INFO(0, link, IS_STRING, 0)
@@ -21211,6 +21222,10 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_render, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_html_breadcrumbs_setseparator, 0, 1, Phalcon\\Html\\Breadcrumbs, 0)
+	ZEND_ARG_TYPE_INFO(0, separator, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_toarray, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -21218,12 +21233,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_breadcrumbs_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_html_breadcrumbs_method_entry) {
-	PHP_ME(Phalcon_Html_Breadcrumbs, getSeparator, arginfo_phalcon_html_breadcrumbs_getseparator, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Html_Breadcrumbs, setSeparator, arginfo_phalcon_html_breadcrumbs_setseparator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, add, arginfo_phalcon_html_breadcrumbs_add, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, clear, arginfo_phalcon_html_breadcrumbs_clear, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Breadcrumbs, getSeparator, arginfo_phalcon_html_breadcrumbs_getseparator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, remove, arginfo_phalcon_html_breadcrumbs_remove, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, render, arginfo_phalcon_html_breadcrumbs_render, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Breadcrumbs, setSeparator, arginfo_phalcon_html_breadcrumbs_setseparator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, toArray, arginfo_phalcon_html_breadcrumbs_toarray, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
@@ -21232,8 +21247,6 @@ zend_class_entry *phalcon_html_escaper_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Html_Escaper);
 
-static PHP_METHOD(Phalcon_Html_Escaper, getEncoding);
-static PHP_METHOD(Phalcon_Html_Escaper, getFlags);
 static PHP_METHOD(Phalcon_Html_Escaper, attributes);
 static PHP_METHOD(Phalcon_Html_Escaper, css);
 static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding);
@@ -21242,6 +21255,8 @@ static PHP_METHOD(Phalcon_Html_Escaper, escapeJs);
 static PHP_METHOD(Phalcon_Html_Escaper, escapeHtml);
 static PHP_METHOD(Phalcon_Html_Escaper, escapeHtmlAttr);
 static PHP_METHOD(Phalcon_Html_Escaper, escapeUrl);
+static PHP_METHOD(Phalcon_Html_Escaper, getEncoding);
+static PHP_METHOD(Phalcon_Html_Escaper, getFlags);
 static PHP_METHOD(Phalcon_Html_Escaper, html);
 static PHP_METHOD(Phalcon_Html_Escaper, js);
 static PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding);
@@ -21250,17 +21265,12 @@ static PHP_METHOD(Phalcon_Html_Escaper, setEncoding);
 static PHP_METHOD(Phalcon_Html_Escaper, setFlags);
 static PHP_METHOD(Phalcon_Html_Escaper, setHtmlQuoteType);
 static PHP_METHOD(Phalcon_Html_Escaper, url);
+static PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars);
 static PHP_METHOD(Phalcon_Html_Escaper, doEscapeCss);
 static PHP_METHOD(Phalcon_Html_Escaper, doEscapeJs);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getencoding, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getflags, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_attributes, 0, 1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_INFO(0, input)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_css, 0, 1, IS_STRING, 0)
@@ -21291,6 +21301,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_escapeurl,
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getencoding, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getflags, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_html, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 1)
 ZEND_END_ARG_INFO()
@@ -21323,6 +21339,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_url, 0, 1,
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_phphtmlspecialchars, 0, 1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_doescapecss, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -21332,8 +21352,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_doescapejs,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_html_escaper_method_entry) {
-	PHP_ME(Phalcon_Html_Escaper, getEncoding, arginfo_phalcon_html_escaper_getencoding, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Html_Escaper, getFlags, arginfo_phalcon_html_escaper_getflags, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, attributes, arginfo_phalcon_html_escaper_attributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, css, arginfo_phalcon_html_escaper_css, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, detectEncoding, arginfo_phalcon_html_escaper_detectencoding, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC)
@@ -21342,6 +21360,8 @@ ZEPHIR_INIT_FUNCS(phalcon_html_escaper_method_entry) {
 	PHP_ME(Phalcon_Html_Escaper, escapeHtml, arginfo_phalcon_html_escaper_escapehtml, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, escapeHtmlAttr, arginfo_phalcon_html_escaper_escapehtmlattr, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, escapeUrl, arginfo_phalcon_html_escaper_escapeurl, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Escaper, getEncoding, arginfo_phalcon_html_escaper_getencoding, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Escaper, getFlags, arginfo_phalcon_html_escaper_getflags, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, html, arginfo_phalcon_html_escaper_html, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, js, arginfo_phalcon_html_escaper_js, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, normalizeEncoding, arginfo_phalcon_html_escaper_normalizeencoding, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC)
@@ -21350,6 +21370,7 @@ ZEPHIR_INIT_FUNCS(phalcon_html_escaper_method_entry) {
 	PHP_ME(Phalcon_Html_Escaper, setFlags, arginfo_phalcon_html_escaper_setflags, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, setHtmlQuoteType, arginfo_phalcon_html_escaper_sethtmlquotetype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, url, arginfo_phalcon_html_escaper_url, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Escaper, phpHtmlSpecialChars, arginfo_phalcon_html_escaper_phphtmlspecialchars, ZEND_ACC_PROTECTED)
 	PHP_ME(Phalcon_Html_Escaper, doEscapeCss, arginfo_phalcon_html_escaper_doescapecss, ZEND_ACC_PRIVATE)
 	PHP_ME(Phalcon_Html_Escaper, doEscapeJs, arginfo_phalcon_html_escaper_doescapejs, ZEND_ACC_PRIVATE)
 	PHP_FE_END
@@ -22322,14 +22343,13 @@ zend_class_entry *phalcon_http_request_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Http_Request);
 
-static PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride);
-static PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride);
 static PHP_METHOD(Phalcon_Http_Request, get);
 static PHP_METHOD(Phalcon_Http_Request, getAcceptableContent);
 static PHP_METHOD(Phalcon_Http_Request, getBasicAuth);
 static PHP_METHOD(Phalcon_Http_Request, getBestAccept);
 static PHP_METHOD(Phalcon_Http_Request, getBestCharset);
 static PHP_METHOD(Phalcon_Http_Request, getBestLanguage);
+static PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride);
 static PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant);
 static PHP_METHOD(Phalcon_Http_Request, getClientAddress);
 static PHP_METHOD(Phalcon_Http_Request, getClientCharsets);
@@ -22381,6 +22401,7 @@ static PHP_METHOD(Phalcon_Http_Request, isSoap);
 static PHP_METHOD(Phalcon_Http_Request, isTrace);
 static PHP_METHOD(Phalcon_Http_Request, isValidHttpMethod);
 static PHP_METHOD(Phalcon_Http_Request, numFiles);
+static PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride);
 static PHP_METHOD(Phalcon_Http_Request, setParameterFilters);
 static PHP_METHOD(Phalcon_Http_Request, setStrictHostCheck);
 static PHP_METHOD(Phalcon_Http_Request, getBestQuality);
@@ -22393,13 +22414,6 @@ static PHP_METHOD(Phalcon_Http_Request, getFilterService);
 static PHP_METHOD(Phalcon_Http_Request, getServerArray);
 zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_gethttpmethodparameteroverride, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_sethttpmethodparameteroverride, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, httpMethodParameterOverride, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_get, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
 	ZEND_ARG_INFO(0, filters)
@@ -22423,6 +22437,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getbestlanguage, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_gethttpmethodparameteroverride, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getpreferredisolocalevariant, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -22620,6 +22637,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_numfiles, 0
 	ZEND_ARG_TYPE_INFO(0, onlySuccessful, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_sethttpmethodparameteroverride, 0, 1, Phalcon\\Http\\Request, 0)
+	ZEND_ARG_TYPE_INFO(0, override, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_setparameterfilters, 0, 1, Phalcon\\Http\\RequestInterface, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -22684,14 +22705,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_zephir_init_properties_phalc
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) {
-	PHP_ME(Phalcon_Http_Request, getHttpMethodParameterOverride, arginfo_phalcon_http_request_gethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Http_Request, setHttpMethodParameterOverride, arginfo_phalcon_http_request_sethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, get, arginfo_phalcon_http_request_get, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getAcceptableContent, arginfo_phalcon_http_request_getacceptablecontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBasicAuth, arginfo_phalcon_http_request_getbasicauth, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestAccept, arginfo_phalcon_http_request_getbestaccept, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestCharset, arginfo_phalcon_http_request_getbestcharset, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestLanguage, arginfo_phalcon_http_request_getbestlanguage, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Http_Request, getHttpMethodParameterOverride, arginfo_phalcon_http_request_gethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getPreferredIsoLocaleVariant, arginfo_phalcon_http_request_getpreferredisolocalevariant, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getClientAddress, arginfo_phalcon_http_request_getclientaddress, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getClientCharsets, arginfo_phalcon_http_request_getclientcharsets, ZEND_ACC_PUBLIC)
@@ -22743,6 +22763,7 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) {
 	PHP_ME(Phalcon_Http_Request, isTrace, arginfo_phalcon_http_request_istrace, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, isValidHttpMethod, arginfo_phalcon_http_request_isvalidhttpmethod, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, numFiles, arginfo_phalcon_http_request_numfiles, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Http_Request, setHttpMethodParameterOverride, arginfo_phalcon_http_request_sethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, setParameterFilters, arginfo_phalcon_http_request_setparameterfilters, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, setStrictHostCheck, arginfo_phalcon_http_request_setstricthostcheck, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestQuality, arginfo_phalcon_http_request_getbestquality, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED)
@@ -22765,10 +22786,10 @@ zend_class_entry *phalcon_http_request_file_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Http_Request_File);
 
+static PHP_METHOD(Phalcon_Http_Request_File, __construct);
 static PHP_METHOD(Phalcon_Http_Request_File, getError);
 static PHP_METHOD(Phalcon_Http_Request_File, getExtension);
 static PHP_METHOD(Phalcon_Http_Request_File, getKey);
-static PHP_METHOD(Phalcon_Http_Request_File, __construct);
 static PHP_METHOD(Phalcon_Http_Request_File, getName);
 static PHP_METHOD(Phalcon_Http_Request_File, getRealType);
 static PHP_METHOD(Phalcon_Http_Request_File, getSize);
@@ -22778,6 +22799,11 @@ static PHP_METHOD(Phalcon_Http_Request_File, isUploadedFile);
 static PHP_METHOD(Phalcon_Http_Request_File, moveTo);
 static PHP_METHOD(Phalcon_Http_Request_File, getArrVal);
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_file___construct, 0, 0, 1)
+	ZEND_ARG_ARRAY_INFO(0, file, 0)
+	ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_file_geterror, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
@@ -22787,11 +22813,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_file_getkey, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_file___construct, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, file, 0)
-	ZEND_ARG_INFO(0, key)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_file_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -22821,10 +22842,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_file_getarrval, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_http_request_file_method_entry) {
+	PHP_ME(Phalcon_Http_Request_File, __construct, arginfo_phalcon_http_request_file___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Http_Request_File, getError, arginfo_phalcon_http_request_file_geterror, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getExtension, arginfo_phalcon_http_request_file_getextension, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getKey, arginfo_phalcon_http_request_file_getkey, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Http_Request_File, __construct, arginfo_phalcon_http_request_file___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Http_Request_File, getName, arginfo_phalcon_http_request_file_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getRealType, arginfo_phalcon_http_request_file_getrealtype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getSize, arginfo_phalcon_http_request_file_getsize, ZEND_ACC_PUBLIC)
@@ -23651,15 +23672,12 @@ zend_class_entry *phalcon_logger_adapter_stream_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream);
 
-static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName);
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct);
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, close);
+static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName);
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, process);
 static PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_getname, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_stream___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -23672,6 +23690,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_close, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_getname, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_process, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_OBJ_INFO(0, item, Phalcon\\Logger\\Item, 0)
@@ -23683,9 +23704,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_stream_phpfopen, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_logger_adapter_stream_method_entry) {
-	PHP_ME(Phalcon_Logger_Adapter_Stream, getName, arginfo_phalcon_logger_adapter_stream_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, __construct, arginfo_phalcon_logger_adapter_stream___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, close, arginfo_phalcon_logger_adapter_stream_close, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Adapter_Stream, getName, arginfo_phalcon_logger_adapter_stream_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, process, arginfo_phalcon_logger_adapter_stream_process, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, phpFopen, arginfo_phalcon_logger_adapter_stream_phpfopen, ZEND_ACC_PROTECTED)
 	PHP_FE_END
@@ -23813,17 +23834,10 @@ zend_class_entry *phalcon_logger_formatter_line_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line);
 
-static PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat);
-static PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat);
 static PHP_METHOD(Phalcon_Logger_Formatter_Line, __construct);
 static PHP_METHOD(Phalcon_Logger_Formatter_Line, format);
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_line_getformat, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_line_setformat, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+static PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat);
+static PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_line___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
@@ -23834,11 +23848,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_line_fo
 	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_formatter_line_getformat, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_formatter_line_setformat, 0, 1, Phalcon\\Logger\\Formatter\\Line, 0)
+	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_line_method_entry) {
-	PHP_ME(Phalcon_Logger_Formatter_Line, getFormat, arginfo_phalcon_logger_formatter_line_getformat, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Logger_Formatter_Line, setFormat, arginfo_phalcon_logger_formatter_line_setformat, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Formatter_Line, __construct, arginfo_phalcon_logger_formatter_line___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Logger_Formatter_Line, format, arginfo_phalcon_logger_formatter_line_format, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Line, getFormat, arginfo_phalcon_logger_formatter_line_getformat, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Line, setFormat, arginfo_phalcon_logger_formatter_line_setformat, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -23846,29 +23867,14 @@ zend_class_entry *phalcon_logger_item_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Item);
 
+static PHP_METHOD(Phalcon_Logger_Item, __construct);
 static PHP_METHOD(Phalcon_Logger_Item, getContext);
+static PHP_METHOD(Phalcon_Logger_Item, getDateTime);
 static PHP_METHOD(Phalcon_Logger_Item, getMessage);
 static PHP_METHOD(Phalcon_Logger_Item, getLevel);
 static PHP_METHOD(Phalcon_Logger_Item, getLevelName);
-static PHP_METHOD(Phalcon_Logger_Item, getDateTime);
-static PHP_METHOD(Phalcon_Logger_Item, __construct);
 zend_object *zephir_init_properties_Phalcon_Logger_Item(zend_class_entry *class_type);
 
-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_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_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)
@@ -23881,20 +23887,31 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item___construct, 0, 0, 4)
 #endif
 ZEND_END_ARG_INFO()
 
+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_OBJ_INFO_EX(arginfo_phalcon_logger_item_getdatetime, 0, 0, DateTimeImmutable, 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_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_zephir_init_properties_phalcon_logger_item, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_logger_item_method_entry) {
+	PHP_ME(Phalcon_Logger_Item, __construct, arginfo_phalcon_logger_item___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Logger_Item, getContext, arginfo_phalcon_logger_item_getcontext, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Item, getDateTime, arginfo_phalcon_logger_item_getdatetime, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Item, getMessage, arginfo_phalcon_logger_item_getmessage, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Item, getLevel, arginfo_phalcon_logger_item_getlevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Item, getLevelName, arginfo_phalcon_logger_item_getlevelname, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Phalcon_Logger_Item, getDateTime, arginfo_phalcon_logger_item_getdatetime, ZEND_ACC_PUBLIC)
-#else
-	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
 };
 
@@ -24071,13 +24088,13 @@ zend_class_entry *phalcon_messages_message_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Messages_Message);
 
+static PHP_METHOD(Phalcon_Messages_Message, __construct);
+static PHP_METHOD(Phalcon_Messages_Message, __toString);
 static PHP_METHOD(Phalcon_Messages_Message, getCode);
 static PHP_METHOD(Phalcon_Messages_Message, getField);
 static PHP_METHOD(Phalcon_Messages_Message, getMessage);
 static PHP_METHOD(Phalcon_Messages_Message, getType);
 static PHP_METHOD(Phalcon_Messages_Message, getMetaData);
-static PHP_METHOD(Phalcon_Messages_Message, __construct);
-static PHP_METHOD(Phalcon_Messages_Message, __toString);
 static PHP_METHOD(Phalcon_Messages_Message, jsonSerialize);
 static PHP_METHOD(Phalcon_Messages_Message, setCode);
 static PHP_METHOD(Phalcon_Messages_Message, setField);
@@ -24086,21 +24103,6 @@ static PHP_METHOD(Phalcon_Messages_Message, setMetaData);
 static PHP_METHOD(Phalcon_Messages_Message, setType);
 zend_object *zephir_init_properties_Phalcon_Messages_Message(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getcode, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getfield, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmessage, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmetadata, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_message___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 	ZEND_ARG_INFO(0, field)
@@ -24116,6 +24118,21 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message___tostring, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getcode, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getfield, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmessage, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmetadata, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_jsonserialize, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -24143,13 +24160,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_message_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_messages_message_method_entry) {
+	PHP_ME(Phalcon_Messages_Message, __construct, arginfo_phalcon_messages_message___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Messages_Message, __toString, arginfo_phalcon_messages_message___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getCode, arginfo_phalcon_messages_message_getcode, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getField, arginfo_phalcon_messages_message_getfield, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getMessage, arginfo_phalcon_messages_message_getmessage, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getType, arginfo_phalcon_messages_message_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getMetaData, arginfo_phalcon_messages_message_getmetadata, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Messages_Message, __construct, arginfo_phalcon_messages_message___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Messages_Message, __toString, arginfo_phalcon_messages_message___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, jsonSerialize, arginfo_phalcon_messages_message_jsonserialize, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, setCode, arginfo_phalcon_messages_message_setcode, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, setField, arginfo_phalcon_messages_message_setfield, ZEND_ACC_PUBLIC)
@@ -24622,7 +24639,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_setservice, 0,
 	ZEND_ARG_TYPE_INFO(0, shared, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_stop, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_stop, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_zephir_init_properties_phalcon_mvc_micro, 0, 0, 0)
@@ -24674,11 +24691,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_micro_method_entry) {
 	PHP_ME(Phalcon_Mvc_Micro, setModelBinder, arginfo_phalcon_mvc_micro_setmodelbinder, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Micro, setResponseHandler, arginfo_phalcon_mvc_micro_setresponsehandler, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Micro, setService, arginfo_phalcon_mvc_micro_setservice, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Mvc_Micro, stop, arginfo_phalcon_mvc_micro_stop, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Mvc_Micro, stop, NULL, ZEND_ACC_PUBLIC)
-#endif
 	PHP_FE_END
 };
 
@@ -24830,16 +24843,10 @@ zend_class_entry *phalcon_mvc_micro_lazyloader_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Micro_LazyLoader);
 
-static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler);
-static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition);
 static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, __construct);
 static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod);
-
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, NULL, 1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_getdefinition, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition);
+static PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, definition, IS_STRING, 0)
@@ -24851,11 +24858,21 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_callmethod, 0, 0, 2)
 	ZEND_ARG_OBJ_INFO(0, modelBinder, Phalcon\\Mvc\\Model\\BinderInterface, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_getdefinition, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, IS_OBJECT, 1)
+#endif
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_mvc_micro_lazyloader_method_entry) {
-	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getHandler, arginfo_phalcon_mvc_micro_lazyloader_gethandler, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getDefinition, arginfo_phalcon_mvc_micro_lazyloader_getdefinition, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, __construct, arginfo_phalcon_mvc_micro_lazyloader___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, callMethod, arginfo_phalcon_mvc_micro_lazyloader_callmethod, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getDefinition, arginfo_phalcon_mvc_micro_lazyloader_getdefinition, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getHandler, arginfo_phalcon_mvc_micro_lazyloader_gethandler, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -24876,7 +24893,6 @@ zend_class_entry *phalcon_mvc_model_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model);
 
-static PHP_METHOD(Phalcon_Mvc_Model, getTransaction);
 static PHP_METHOD(Phalcon_Mvc_Model, __construct);
 static PHP_METHOD(Phalcon_Mvc_Model, __call);
 static PHP_METHOD(Phalcon_Mvc_Model, __callStatic);
@@ -24938,6 +24954,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setReadConnectionService);
 static PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData);
 static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData);
 static PHP_METHOD(Phalcon_Mvc_Model, setTransaction);
+static PHP_METHOD(Phalcon_Mvc_Model, getTransaction);
 static PHP_METHOD(Phalcon_Mvc_Model, setup);
 static PHP_METHOD(Phalcon_Mvc_Model, setWriteConnectionService);
 static PHP_METHOD(Phalcon_Mvc_Model, skipOperation);
@@ -24979,9 +24996,6 @@ static PHP_METHOD(Phalcon_Mvc_Model, validationHasFailed);
 static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap);
 zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, IS_NULL, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, data)
 	ZEND_ARG_OBJ_INFO(0, container, Phalcon\\Di\\DiInterface, 1)
@@ -25236,6 +25250,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_settransaction,
 	ZEND_ARG_OBJ_INFO(0, transaction, Phalcon\\Mvc\\Model\\TransactionInterface, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_gettransaction, 0, 0, Phalcon\\Mvc\\Model\\TransactionInterface, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_setup, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_ARRAY_INFO(0, options, 0)
@@ -25425,7 +25442,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_setsource, 0, 1
 	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_skipattributes, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_skipattributes, 0, 1, IS_VOID, 0)
+
 	ZEND_ARG_ARRAY_INFO(0, attributes, 0)
 ZEND_END_ARG_INFO()
 
@@ -25460,7 +25478,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_zephir_init_properties_phalcon_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) {
-	PHP_ME(Phalcon_Mvc_Model, getTransaction, arginfo_phalcon_mvc_model_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, __construct, arginfo_phalcon_mvc_model___construct, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Model, __call, arginfo_phalcon_mvc_model___call, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, __callStatic, arginfo_phalcon_mvc_model___callstatic, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -25522,6 +25539,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) {
 	PHP_ME(Phalcon_Mvc_Model, setOldSnapshotData, arginfo_phalcon_mvc_model_setoldsnapshotdata, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, setSnapshotData, arginfo_phalcon_mvc_model_setsnapshotdata, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, setTransaction, arginfo_phalcon_mvc_model_settransaction, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Model, getTransaction, arginfo_phalcon_mvc_model_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, setup, arginfo_phalcon_mvc_model_setup, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Phalcon_Mvc_Model, setWriteConnectionService, arginfo_phalcon_mvc_model_setwriteconnectionservice, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model, skipOperation, arginfo_phalcon_mvc_model_skipoperation, ZEND_ACC_PUBLIC)
@@ -25610,23 +25628,17 @@ zend_class_entry *phalcon_mvc_model_binder_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Binder);
 
-static PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels);
-static PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, __construct);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, bindToHandler);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, findBoundModel);
+static PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels);
+static PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, getCache);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromCache);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection);
 static PHP_METHOD(Phalcon_Mvc_Model_Binder, setCache);
 zend_object *zephir_init_properties_Phalcon_Mvc_Model_Binder(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getboundmodels, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getoriginalvalues, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_binder___construct, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO(0, cache, Phalcon\\Cache\\Adapter\\AdapterInterface, 1)
 ZEND_END_ARG_INFO()
@@ -25643,6 +25655,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_binder_findboundmodel, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, className, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getboundmodels, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getoriginalvalues, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_binder_getcache, 0, 0, Phalcon\\Cache\\Adapter\\AdapterInterface, 0)
 ZEND_END_ARG_INFO()
 
@@ -25665,11 +25683,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_binder_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_model_binder_method_entry) {
-	PHP_ME(Phalcon_Mvc_Model_Binder, getBoundModels, arginfo_phalcon_mvc_model_binder_getboundmodels, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Model_Binder, getOriginalValues, arginfo_phalcon_mvc_model_binder_getoriginalvalues, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, __construct, arginfo_phalcon_mvc_model_binder___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Model_Binder, bindToHandler, arginfo_phalcon_mvc_model_binder_bindtohandler, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, findBoundModel, arginfo_phalcon_mvc_model_binder_findboundmodel, ZEND_ACC_PROTECTED)
+	PHP_ME(Phalcon_Mvc_Model_Binder, getBoundModels, arginfo_phalcon_mvc_model_binder_getboundmodels, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Model_Binder, getOriginalValues, arginfo_phalcon_mvc_model_binder_getoriginalvalues, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, getCache, arginfo_phalcon_mvc_model_binder_getcache, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, getParamsFromCache, arginfo_phalcon_mvc_model_binder_getparamsfromcache, ZEND_ACC_PROTECTED)
 	PHP_ME(Phalcon_Mvc_Model_Binder, getParamsFromReflection, arginfo_phalcon_mvc_model_binder_getparamsfromreflection, ZEND_ACC_PROTECTED)
@@ -26700,7 +26718,6 @@ zend_class_entry *phalcon_mvc_model_query_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Query);
 
-static PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, __construct);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, cache);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, clean);
@@ -26715,6 +26732,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleResult);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, getType);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, getUniqueRow);
+static PHP_METHOD(Phalcon_Mvc_Model_Query, getTransaction);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, parse);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, setBindParams);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, setBindTypes);
@@ -26752,9 +26770,6 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect);
 static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate);
 zend_object *zephir_init_properties_Phalcon_Mvc_Model_Query(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_query_gettransaction, 0, 0, IS_NULL, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_query___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, phql, IS_STRING, 1)
 	ZEND_ARG_OBJ_INFO(0, container, Phalcon\\Di\\DiInterface, 1)
@@ -26825,6 +26840,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_query_getuniquerow, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_query_gettransaction, 0, 0, Phalcon\\Mvc\\Model\\TransactionInterface, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_query_parse, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -27022,7 +27040,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_query_zephir_init_properties_ph
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_model_query_method_entry) {
-	PHP_ME(Phalcon_Mvc_Model_Query, getTransaction, arginfo_phalcon_mvc_model_query_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, __construct, arginfo_phalcon_mvc_model_query___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Model_Query, cache, arginfo_phalcon_mvc_model_query_cache, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, clean, arginfo_phalcon_mvc_model_query_clean, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -27037,6 +27054,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_query_method_entry) {
 	PHP_ME(Phalcon_Mvc_Model_Query, getSql, arginfo_phalcon_mvc_model_query_getsql, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, getType, arginfo_phalcon_mvc_model_query_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, getUniqueRow, arginfo_phalcon_mvc_model_query_getuniquerow, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Model_Query, getTransaction, arginfo_phalcon_mvc_model_query_gettransaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, parse, arginfo_phalcon_mvc_model_query_parse, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, setBindParams, arginfo_phalcon_mvc_model_query_setbindparams, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Query, setBindTypes, arginfo_phalcon_mvc_model_query_setbindtypes, ZEND_ACC_PUBLIC)
@@ -28416,7 +28434,6 @@ zend_class_entry *phalcon_mvc_router_route_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Route);
 
-static PHP_METHOD(Phalcon_Mvc_Router_Route, getId);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, __construct);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, beforeMatch);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, compilePattern);
@@ -28428,6 +28445,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getConverters);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getGroup);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getHttpMethods);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getHostname);
+static PHP_METHOD(Phalcon_Mvc_Router_Route, getId);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getMatch);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getName);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, getPaths);
@@ -28445,9 +28463,6 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, setName);
 static PHP_METHOD(Phalcon_Mvc_Router_Route, via);
 zend_object *zephir_init_properties_Phalcon_Mvc_Router_Route(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_getid, 0, 0, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_INFO(0, paths)
@@ -28489,6 +28504,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_gethostname, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_getid, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route_getmatch, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -28548,7 +28566,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_router_route_method_entry) {
-	PHP_ME(Phalcon_Mvc_Router_Route, getId, arginfo_phalcon_mvc_router_route_getid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router_Route, __construct, arginfo_phalcon_mvc_router_route___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Router_Route, beforeMatch, arginfo_phalcon_mvc_router_route_beforematch, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router_Route, compilePattern, arginfo_phalcon_mvc_router_route_compilepattern, ZEND_ACC_PUBLIC)
@@ -28568,6 +28585,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_router_route_method_entry) {
 	PHP_ME(Phalcon_Mvc_Router_Route, getHttpMethods, NULL, ZEND_ACC_PUBLIC)
 #endif
 	PHP_ME(Phalcon_Mvc_Router_Route, getHostname, arginfo_phalcon_mvc_router_route_gethostname, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router_Route, getId, arginfo_phalcon_mvc_router_route_getid, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Mvc_Router_Route, getMatch, arginfo_phalcon_mvc_router_route_getmatch, ZEND_ACC_PUBLIC)
 #else
@@ -28668,9 +28686,6 @@ zend_class_entry *phalcon_mvc_view_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_View);
 
-static PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel);
-static PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines);
-static PHP_METHOD(Phalcon_Mvc_View, getRenderLevel);
 static PHP_METHOD(Phalcon_Mvc_View, __construct);
 static PHP_METHOD(Phalcon_Mvc_View, __get);
 static PHP_METHOD(Phalcon_Mvc_View, __isset);
@@ -28687,6 +28702,9 @@ static PHP_METHOD(Phalcon_Mvc_View, getActiveRenderPath);
 static PHP_METHOD(Phalcon_Mvc_View, getBasePath);
 static PHP_METHOD(Phalcon_Mvc_View, getContent);
 static PHP_METHOD(Phalcon_Mvc_View, getControllerName);
+static PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel);
+static PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines);
+static PHP_METHOD(Phalcon_Mvc_View, getRenderLevel);
 static PHP_METHOD(Phalcon_Mvc_View, getEventsManager);
 static PHP_METHOD(Phalcon_Mvc_View, getLayout);
 static PHP_METHOD(Phalcon_Mvc_View, getLayoutsDir);
@@ -28728,15 +28746,6 @@ static PHP_METHOD(Phalcon_Mvc_View, processRender);
 static PHP_METHOD(Phalcon_Mvc_View, getDirSeparator);
 zend_object *zephir_init_properties_Phalcon_Mvc_View(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getcurrentrenderlevel, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getregisteredengines, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getrenderlevel, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
@@ -28796,6 +28805,15 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getcontrollername, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getcurrentrenderlevel, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getregisteredengines, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getrenderlevel, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_view_geteventsmanager, 0, 0, Phalcon\\Events\\ManagerInterface, 1)
 ZEND_END_ARG_INFO()
 
@@ -28979,9 +28997,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_zephir_init_properties_phalcon_m
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_view_method_entry) {
-	PHP_ME(Phalcon_Mvc_View, getCurrentRenderLevel, arginfo_phalcon_mvc_view_getcurrentrenderlevel, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_View, getRegisteredEngines, arginfo_phalcon_mvc_view_getregisteredengines, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_View, getRenderLevel, arginfo_phalcon_mvc_view_getrenderlevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, __construct, arginfo_phalcon_mvc_view___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_View, __get, arginfo_phalcon_mvc_view___get, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, __isset, arginfo_phalcon_mvc_view___isset, ZEND_ACC_PUBLIC)
@@ -29002,6 +29017,9 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_view_method_entry) {
 	PHP_ME(Phalcon_Mvc_View, getBasePath, arginfo_phalcon_mvc_view_getbasepath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getContent, arginfo_phalcon_mvc_view_getcontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getControllerName, arginfo_phalcon_mvc_view_getcontrollername, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View, getCurrentRenderLevel, arginfo_phalcon_mvc_view_getcurrentrenderlevel, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View, getRegisteredEngines, arginfo_phalcon_mvc_view_getregisteredengines, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View, getRenderLevel, arginfo_phalcon_mvc_view_getrenderlevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getEventsManager, arginfo_phalcon_mvc_view_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getLayout, arginfo_phalcon_mvc_view_getlayout, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getLayoutsDir, arginfo_phalcon_mvc_view_getlayoutsdir, ZEND_ACC_PUBLIC)
@@ -29507,7 +29525,6 @@ zend_class_entry *phalcon_mvc_view_simple_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_View_Simple);
 
-static PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, __construct);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, __get);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, __set);
@@ -29515,6 +29532,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, getActiveRenderPath);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getContent);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getEventsManager);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getParamsToView);
+static PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getVar);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getViewsDir);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, partial);
@@ -29531,9 +29549,6 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender);
 static PHP_METHOD(Phalcon_Mvc_View_Simple, getDirSeparator);
 zend_object *zephir_init_properties_Phalcon_Mvc_View_Simple(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_simple_getregisteredengines, 0, 0, IS_ARRAY, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_simple___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
@@ -29564,6 +29579,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_simple_getparamstoview, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_simple_getregisteredengines, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_simple_getvar, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -29637,7 +29655,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_simple_zephir_init_properties_ph
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_view_simple_method_entry) {
-	PHP_ME(Phalcon_Mvc_View_Simple, getRegisteredEngines, arginfo_phalcon_mvc_view_simple_getregisteredengines, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, __construct, arginfo_phalcon_mvc_view_simple___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_View_Simple, __get, arginfo_phalcon_mvc_view_simple___get, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, __set, arginfo_phalcon_mvc_view_simple___set, ZEND_ACC_PUBLIC)
@@ -29645,6 +29662,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_view_simple_method_entry) {
 	PHP_ME(Phalcon_Mvc_View_Simple, getContent, arginfo_phalcon_mvc_view_simple_getcontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getEventsManager, arginfo_phalcon_mvc_view_simple_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getParamsToView, arginfo_phalcon_mvc_view_simple_getparamstoview, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View_Simple, getRegisteredEngines, arginfo_phalcon_mvc_view_simple_getregisteredengines, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getVar, arginfo_phalcon_mvc_view_simple_getvar, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getViewsDir, arginfo_phalcon_mvc_view_simple_getviewsdir, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, partial, arginfo_phalcon_mvc_view_simple_partial, ZEND_ACC_PUBLIC)
@@ -30708,10 +30726,10 @@ zend_class_entry *phalcon_support_debug_dump_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Support_Debug_Dump);
 
-static PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed);
-static PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed);
 static PHP_METHOD(Phalcon_Support_Debug_Dump, __construct);
 static PHP_METHOD(Phalcon_Support_Debug_Dump, all);
+static PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed);
+static PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed);
 static PHP_METHOD(Phalcon_Support_Debug_Dump, one);
 static PHP_METHOD(Phalcon_Support_Debug_Dump, setStyles);
 static PHP_METHOD(Phalcon_Support_Debug_Dump, toJson);
@@ -30722,13 +30740,6 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output);
 static PHP_METHOD(Phalcon_Support_Debug_Dump, encode);
 zend_object *zephir_init_properties_Phalcon_Support_Debug_Dump(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_getdetailed, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump_setdetailed, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, detailed, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, styles, IS_ARRAY, 0, "[]")
@@ -30741,6 +30752,14 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_all, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_getdetailed, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_setdetailed, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, detailed, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_one, 0, 1, IS_STRING, 0)
 	ZEND_ARG_INFO(0, variable)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
@@ -30786,10 +30805,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump_zephir_init_properties
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_support_debug_dump_method_entry) {
-	PHP_ME(Phalcon_Support_Debug_Dump, getDetailed, arginfo_phalcon_support_debug_dump_getdetailed, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Support_Debug_Dump, setDetailed, arginfo_phalcon_support_debug_dump_setdetailed, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, __construct, arginfo_phalcon_support_debug_dump___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Support_Debug_Dump, all, arginfo_phalcon_support_debug_dump_all, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Support_Debug_Dump, getDetailed, arginfo_phalcon_support_debug_dump_getdetailed, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Support_Debug_Dump, setDetailed, arginfo_phalcon_support_debug_dump_setdetailed, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, one, arginfo_phalcon_support_debug_dump_one, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, setStyles, arginfo_phalcon_support_debug_dump_setstyles, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, toJson, arginfo_phalcon_support_debug_dump_tojson, ZEND_ACC_PUBLIC)
@@ -31194,7 +31213,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Support_Helper_Arr_ToObject);
 
 static PHP_METHOD(Phalcon_Support_Helper_Arr_ToObject, __invoke);
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_support_helper_arr_toobject___invoke, 0, 1, NULL, 0)
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_support_helper_arr_toobject___invoke, 0, 1, MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_helper_arr_toobject___invoke, 0, 1, IS_OBJECT, 0)
+#endif
 	ZEND_ARG_ARRAY_INFO(0, collection, 0)
 ZEND_END_ARG_INFO()
 
@@ -32588,12 +32611,12 @@ zend_class_entry *phalcon_translate_adapter_gettext_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Translate_Adapter_Gettext);
 
+static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct);
+static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, exists);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getCategory);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDefaultDomain);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDirectory);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getLocale);
-static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct);
-static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, exists);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, has);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query);
@@ -32606,25 +32629,25 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getOptionsDefault);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions);
 static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, phpFunctionExists);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getcategory, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext___construct, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, interpolator, Phalcon\\Translate\\InterpolatorFactory, 0)
+	ZEND_ARG_ARRAY_INFO(0, options, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdefaultdomain, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_exists, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdirectory, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getcategory, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getlocale, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdefaultdomain, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext___construct, 0, 0, 2)
-	ZEND_ARG_OBJ_INFO(0, interpolator, Phalcon\\Translate\\InterpolatorFactory, 0)
-	ZEND_ARG_ARRAY_INFO(0, options, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdirectory, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_exists, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getlocale, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_has, 0, 1, _IS_BOOL, 0)
@@ -32691,6 +32714,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettex
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) {
+	PHP_ME(Phalcon_Translate_Adapter_Gettext, __construct, arginfo_phalcon_translate_adapter_gettext___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Translate_Adapter_Gettext, exists, arginfo_phalcon_translate_adapter_gettext_exists, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getCategory, arginfo_phalcon_translate_adapter_gettext_getcategory, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getDefaultDomain, arginfo_phalcon_translate_adapter_gettext_getdefaultdomain, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
@@ -32699,8 +32724,6 @@ ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) {
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getDirectory, NULL, ZEND_ACC_PUBLIC)
 #endif
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getLocale, arginfo_phalcon_translate_adapter_gettext_getlocale, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Translate_Adapter_Gettext, __construct, arginfo_phalcon_translate_adapter_gettext___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Translate_Adapter_Gettext, exists, arginfo_phalcon_translate_adapter_gettext_exists, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, has, arginfo_phalcon_translate_adapter_gettext_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, nquery, arginfo_phalcon_translate_adapter_gettext_nquery, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, query, arginfo_phalcon_translate_adapter_gettext_query, ZEND_ACC_PUBLIC)
diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h
index 75defc3f19f..22f4d2df3cf 100644
--- a/build/phalcon/php_phalcon.h
+++ b/build/phalcon/php_phalcon.h
@@ -103,10 +103,10 @@ typedef zend_function zephir_fcall_cache_entry;
 
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "5.0.0RC4"
+#define PHP_PHALCON_VERSION     "5.0.0"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.0-4fac47b"
+#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

From bd6bc1d34bb856aae14299eff3d7bc138b6ad290 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 17:35:39 -0400
Subject: [PATCH 72/76] [#.0.x] - rebuilding ext

---
 ext/phalcon/acl/adapter/abstractadapter.zep.c |  35 +-
 ext/phalcon/acl/adapter/abstractadapter.zep.h |   8 +-
 ext/phalcon/acl/adapter/memory.zep.c          | 138 ++--
 ext/phalcon/acl/adapter/memory.zep.h          |  38 +-
 ext/phalcon/acl/component.zep.c               |  67 +-
 ext/phalcon/acl/component.zep.h               |  20 +-
 ext/phalcon/acl/role.zep.c                    |  75 +-
 ext/phalcon/acl/role.zep.h                    |  16 +-
 .../annotations/adapter/abstractadapter.zep.c |   5 +-
 ext/phalcon/annotations/collection.zep.h      |   2 +-
 ext/phalcon/annotations/reader.zep.c          |  24 +-
 ext/phalcon/annotations/reflection.zep.c      | 412 +++++-----
 ext/phalcon/annotations/reflection.zep.h      |  24 +-
 .../application/abstractapplication.zep.c     |   4 +-
 ext/phalcon/assets/asset.zep.c                | 151 ++--
 ext/phalcon/assets/asset.zep.h                |  70 +-
 ext/phalcon/assets/collection.zep.c           | 261 +++----
 ext/phalcon/assets/collection.zep.h           | 106 +--
 ext/phalcon/assets/inline.zep.c               |  94 +--
 ext/phalcon/assets/inline.zep.h               |  32 +-
 ext/phalcon/cli/console.zep.c                 | 231 +++---
 ext/phalcon/cli/dispatcher.zep.c              |   4 +-
 ext/phalcon/db/adapter/abstractadapter.zep.c  | 168 ++---
 ext/phalcon/db/adapter/abstractadapter.zep.h  |  20 +-
 ext/phalcon/db/adapter/pdo/abstractpdo.zep.c  | 252 ++++---
 ext/phalcon/db/column.zep.c                   | 210 +++---
 ext/phalcon/db/column.zep.h                   |  42 +-
 ext/phalcon/db/index.zep.c                    |  72 +-
 ext/phalcon/db/index.zep.h                    |  16 +-
 ext/phalcon/db/profiler/item.zep.c            | 170 ++---
 ext/phalcon/db/profiler/item.zep.h            |  52 +-
 ext/phalcon/db/rawvalue.zep.c                 |  44 +-
 ext/phalcon/db/rawvalue.zep.h                 |  14 +-
 ext/phalcon/db/reference.zep.c                | 170 ++---
 ext/phalcon/db/reference.zep.h                |  14 +-
 ext/phalcon/db/result/pdoresult.zep.c         |   4 +-
 ext/phalcon/di/di.zep.c                       |  12 +-
 ext/phalcon/di/di.zep.h                       |   2 +-
 .../serviceresolutionexception.zep.c          |   4 +-
 .../di/initializationawareinterface.zep.c     |   8 +
 ext/phalcon/di/injectable.zep.c               |   6 +-
 ext/phalcon/di/service.zep.c                  |   4 +-
 ext/phalcon/di/service/builder.zep.c          | 124 ++-
 .../dispatcher/abstractdispatcher.zep.c       |  50 +-
 ext/phalcon/domain/payload/payload.zep.c      |  38 +-
 ext/phalcon/domain/payload/payload.zep.h      |  10 +-
 ext/phalcon/encryption/security.zep.c         |  25 +-
 ext/phalcon/encryption/security.zep.h         |  10 +-
 ext/phalcon/events/event.zep.c                |  64 +-
 ext/phalcon/events/event.zep.h                |  28 +-
 ext/phalcon/filter/validation.zep.c           | 142 ++--
 ext/phalcon/filter/validation.zep.h           |  28 +-
 .../abstractvalidatorcomposite.zep.c          |   5 +-
 .../validator/file/abstractfile.zep.c         | 264 ++++---
 .../validator/file/abstractfile.zep.h         |  69 +-
 ext/phalcon/flash/abstractflash.zep.c         | 112 +--
 ext/phalcon/flash/abstractflash.zep.h         |  37 +-
 ext/phalcon/forms/form.zep.h                  |   2 +-
 ext/phalcon/html/breadcrumbs.zep.c            |  96 +--
 ext/phalcon/html/breadcrumbs.zep.h            |  22 +-
 ext/phalcon/html/escaper.zep.c                | 240 +++++-
 ext/phalcon/html/escaper.zep.h                |  28 +-
 ext/phalcon/http/cookie.zep.c                 |   6 +-
 ext/phalcon/http/request.zep.c                | 638 ++++++++--------
 ext/phalcon/http/request.zep.h                |  22 +-
 ext/phalcon/http/request/file.zep.c           |  71 +-
 ext/phalcon/http/request/file.zep.h           |  14 +-
 ext/phalcon/http/request/fileinterface.zep.c  |   3 -
 ext/phalcon/http/response.zep.c               |   4 +-
 ext/phalcon/http/response/cookies.zep.c       |   2 +-
 ext/phalcon/logger/adapter/stream.zep.c       |  30 +-
 ext/phalcon/logger/adapter/stream.zep.h       |  10 +-
 .../logger/formatter/abstractformatter.zep.c  |  66 +-
 .../logger/formatter/abstractformatter.zep.h  |  13 +-
 ext/phalcon/logger/formatter/json.zep.c       |   2 -
 ext/phalcon/logger/formatter/line.zep.c       |  90 +--
 ext/phalcon/logger/formatter/line.zep.h       |  22 +-
 ext/phalcon/logger/item.zep.c                 | 123 +--
 ext/phalcon/logger/item.zep.h                 |  42 +-
 ext/phalcon/messages/message.zep.c            | 115 +--
 ext/phalcon/messages/message.zep.h            |  38 +-
 ext/phalcon/messages/messages.zep.h           |   2 +-
 ext/phalcon/mvc/dispatcher.zep.c              |   2 +-
 ext/phalcon/mvc/micro.zep.c                   | 330 ++++----
 ext/phalcon/mvc/micro.zep.h                   |   8 +-
 ext/phalcon/mvc/micro/lazyloader.zep.c        |  54 +-
 ext/phalcon/mvc/micro/lazyloader.zep.h        |  28 +-
 ext/phalcon/mvc/model.zep.c                   | 705 +++++++++---------
 .../mvc/model/behavior/timestampable.zep.c    |   4 +-
 ext/phalcon/mvc/model/binder.zep.c            |  80 +-
 ext/phalcon/mvc/model/binder.zep.h            |  20 +-
 ext/phalcon/mvc/model/criteria.zep.c          |   8 +-
 ext/phalcon/mvc/model/manager.zep.c           |  30 +-
 ext/phalcon/mvc/model/metadata/stream.zep.c   |   4 +-
 ext/phalcon/mvc/model/query.zep.c             | 202 ++---
 ext/phalcon/mvc/model/query/builder.zep.c     |  60 +-
 ext/phalcon/mvc/model/resultset.zep.h         |   2 +-
 ext/phalcon/mvc/model/resultset/complex.zep.c |   2 +-
 ext/phalcon/mvc/model/resultset/complex.zep.h |   2 +-
 ext/phalcon/mvc/model/row.zep.c               |   2 +-
 ext/phalcon/mvc/model/row.zep.h               |   2 +-
 ext/phalcon/mvc/model/transaction.zep.c       |   4 +-
 .../mvc/model/transaction/manager.zep.c       |   6 +-
 ext/phalcon/mvc/router.zep.c                  | 302 ++++----
 ext/phalcon/mvc/router.zep.h                  |  54 +-
 ext/phalcon/mvc/router/annotations.zep.c      |   4 +-
 ext/phalcon/mvc/router/group.zep.c            |   2 +-
 ext/phalcon/mvc/router/route.zep.c            |  47 +-
 ext/phalcon/mvc/router/route.zep.h            |  10 +-
 ext/phalcon/mvc/url.zep.c                     |  10 +-
 ext/phalcon/mvc/view.zep.c                    | 139 ++--
 ext/phalcon/mvc/view.zep.h                    |  30 +-
 ext/phalcon/mvc/view/engine/php.zep.c         |   4 +-
 ext/phalcon/mvc/view/engine/volt.zep.c        |  20 +-
 .../mvc/view/engine/volt/compiler.zep.c       | 382 +++++-----
 ext/phalcon/mvc/view/simple.zep.c             |  65 +-
 ext/phalcon/mvc/view/simple.zep.h             |  10 +-
 .../paginator/adapter/nativearray.zep.c       |   2 +-
 ext/phalcon/session/adapter/stream.zep.c      |   8 +-
 .../storage/adapter/abstractadapter.zep.c     |  32 +-
 .../storage/adapter/abstractadapter.zep.h     |  10 +-
 ext/phalcon/storage/serializer/none.zep.h     |   2 +-
 ext/phalcon/storage/serializer/php.zep.h      |   2 +-
 ext/phalcon/support/collection.zep.h          |   2 +-
 ext/phalcon/support/debug.zep.c               |   2 +-
 ext/phalcon/support/debug/dump.zep.c          |  95 ++-
 ext/phalcon/support/debug/dump.zep.h          |  23 +-
 ext/phalcon/support/helper/arr/first.zep.c    |   2 +-
 .../support/helper/arr/sliceleft.zep.c        |   2 +-
 .../support/helper/arr/sliceright.zep.c       |   2 +-
 ext/phalcon/support/helper/str/concat.zep.c   |   6 +-
 ext/phalcon/support/registry.zep.h            |   2 +-
 ext/phalcon/support/version.zep.c             |   4 +-
 ext/phalcon/tag.zep.c                         |  10 +-
 .../translate/adapter/abstractadapter.zep.h   |   2 +-
 ext/phalcon/translate/adapter/gettext.zep.c   | 110 +--
 ext/phalcon/translate/adapter/gettext.zep.h   |  26 +-
 ext/php_phalcon.h                             |   4 +-
 138 files changed, 4523 insertions(+), 4267 deletions(-)

diff --git a/ext/phalcon/acl/adapter/abstractadapter.zep.c b/ext/phalcon/acl/adapter/abstractadapter.zep.c
index 475d8a238fb..f58d8f1f036 100644
--- a/ext/phalcon/acl/adapter/abstractadapter.zep.c
+++ b/ext/phalcon/acl/adapter/abstractadapter.zep.c
@@ -32,12 +32,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_AbstractAdapter)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Acl\\Adapter, AbstractAdapter, phalcon, acl_adapter_abstractadapter, phalcon_events_abstracteventsaware_ce, phalcon_acl_adapter_abstractadapter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
 
-	/**
-	 * Active access which the list is checking if some role can access it
-	 *
-	 * @var string|null
-	 */
-	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeAccess"), ZEND_ACC_PROTECTED);
 	/**
 	 * Access Granted
 	 *
@@ -45,18 +39,24 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_AbstractAdapter)
 	 */
 	zend_declare_property_bool(phalcon_acl_adapter_abstractadapter_ce, SL("accessGranted"), 0, ZEND_ACC_PROTECTED);
 	/**
-	 * Role which the list is checking if it's allowed to certain
-	 * component/access
+	 * Active access which the list is checking if some role can access it
 	 *
 	 * @var string|null
 	 */
-	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeRole"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeAccess"), ZEND_ACC_PROTECTED);
 	/**
 	 * Component which the list is checking if some role can access it
 	 *
 	 * @var string|null
 	 */
 	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeComponent"), ZEND_ACC_PROTECTED);
+	/**
+	 * Role which the list is checking if it's allowed to certain
+	 * component/access
+	 *
+	 * @var string|null
+	 */
+	zend_declare_property_null(phalcon_acl_adapter_abstractadapter_ce, SL("activeRole"), ZEND_ACC_PROTECTED);
 	/**
 	 * Default access
 	 *
@@ -81,31 +81,28 @@ PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveAccess)
 }
 
 /**
- * Role which the list is checking if it's allowed to certain
- *
- *
- * component/access
- *
+ * Component which the list is checking if some role can access it
  */
-PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole)
+PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent)
 {
 	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "activeRole");
+	RETURN_MEMBER(getThis(), "activeComponent");
 }
 
 /**
- * Component which the list is checking if some role can access it
+ * Role which the list is checking if it's allowed to certain
+ * component/access
  */
-PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent)
+PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole)
 {
 	zval *this_ptr = getThis();
 
 
 
-	RETURN_MEMBER(getThis(), "activeComponent");
+	RETURN_MEMBER(getThis(), "activeRole");
 }
 
 /**
diff --git a/ext/phalcon/acl/adapter/abstractadapter.zep.h b/ext/phalcon/acl/adapter/abstractadapter.zep.h
index 6f103c02146..3c06fb87c5e 100644
--- a/ext/phalcon/acl/adapter/abstractadapter.zep.h
+++ b/ext/phalcon/acl/adapter/abstractadapter.zep.h
@@ -4,18 +4,18 @@ extern zend_class_entry *phalcon_acl_adapter_abstractadapter_ce;
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_AbstractAdapter);
 
 PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveAccess);
-PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole);
 PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent);
+PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole);
 PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getDefaultAction);
 PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, setDefaultAction);
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactiveaccess, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactivecomponent, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactivecomponent, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_abstractadapter_getdefaultaction, 0, 0, IS_LONG, 0)
@@ -28,8 +28,8 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_adapter_abstractadapter_method_entry) {
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveAccess, arginfo_phalcon_acl_adapter_abstractadapter_getactiveaccess, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole, arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveComponent, arginfo_phalcon_acl_adapter_abstractadapter_getactivecomponent, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getActiveRole, arginfo_phalcon_acl_adapter_abstractadapter_getactiverole, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, getDefaultAction, arginfo_phalcon_acl_adapter_abstractadapter_getdefaultaction, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_AbstractAdapter, setDefaultAction, arginfo_phalcon_acl_adapter_abstractadapter_setdefaultaction, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c
index 186584bcc30..12efae6f8e9 100644
--- a/ext/phalcon/acl/adapter/memory.zep.c
+++ b/ext/phalcon/acl/adapter/memory.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/array.h"
+#include "kernel/object.h"
 #include "kernel/fcall.h"
 #include "kernel/exception.h"
 #include "kernel/concat.h"
@@ -165,42 +165,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_Memory)
 	return SUCCESS;
 }
 
-/**
- * Returns latest function used to acquire access
- */
-PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "activeFunction");
-}
-
-/**
- * Returns number of additional arguments(excluding role and resource) for active function
- */
-PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "activeFunctionCustomArgumentsCount");
-}
-
-/**
- * Returns latest key used to acquire access
- */
-PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "activeKey");
-}
-
 /**
  * Phalcon\Acl\Adapter\Memory constructor
  */
@@ -1186,6 +1150,44 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, dropComponentAccess)
 	ZEPHIR_MM_RESTORE();
 }
 
+/**
+ * Returns latest function used to acquire access
+ *
+ * @return mixed
+ */
+PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "activeFunction");
+}
+
+/**
+ * Returns number of additional arguments(excluding role and resource) for active function
+ */
+PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "activeFunctionCustomArgumentsCount");
+}
+
+/**
+ * Returns latest key used to acquire access
+ */
+PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "activeKey");
+}
+
 /**
  * Return an array with every component registered in the list
  */
@@ -1407,7 +1409,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 			ZEPHIR_CONCAT_SS(&_2$$6, "Object passed as roleName must implement ", "Phalcon\\Acl\\RoleAwareInterface or Phalcon\\Acl\\RoleInterface");
 			ZEPHIR_CALL_METHOD(NULL, &_1$$6, "__construct", NULL, 29, &_2$$6);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_1$$6, "phalcon/Acl/Adapter/Memory.zep", 587);
+			zephir_throw_exception_debug(&_1$$6, "phalcon/Acl/Adapter/Memory.zep", 613);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -1428,7 +1430,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 			ZEPHIR_CONCAT_SS(&_5$$10, "Object passed as componentName must implement ", "Phalcon\\Acl\\ComponentAwareInterface or Phalcon\\Acl\\ComponentInterface");
 			ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", NULL, 29, &_5$$10);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_4$$10, "phalcon/Acl/Adapter/Memory.zep", 601);
+			zephir_throw_exception_debug(&_4$$10, "phalcon/Acl/Adapter/Memory.zep", 627);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -1466,7 +1468,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 	}
 	if (_10) {
 		ZEPHIR_OBS_NVAR(&haveAccess);
-		zephir_array_fetch(&haveAccess, &accessList, &accessKey, PH_NOISY, "phalcon/Acl/Adapter/Memory.zep", 633);
+		zephir_array_fetch(&haveAccess, &accessList, &accessKey, PH_NOISY, "phalcon/Acl/Adapter/Memory.zep", 659);
 		ZEPHIR_OBS_NVAR(&funcAccess);
 		zephir_array_isset_fetch(&funcAccess, &funcList, &accessKey, 0);
 	}
@@ -1508,7 +1510,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 		ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 148);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, &parameterNumber);
-		zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 736);
+		zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 762);
 		if (Z_TYPE_P(&reflectionParameters) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&reflectionParameters), _15$$15)
 			{
@@ -1531,7 +1533,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 					}
 					if (_19$$18) {
 						hasRole = 1;
-						zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 689);
+						zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 715);
 						ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 						zephir_decrement(&userParametersSizeShouldBe);
 						continue;
@@ -1548,19 +1550,19 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 					}
 					if (_22$$18) {
 						hasComponent = 1;
-						zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 701);
+						zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 727);
 						ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 						zephir_decrement(&userParametersSizeShouldBe);
 						continue;
 					}
 					_23$$18 = zephir_array_isset(&parameters, &parameterToCheck);
 					if (_23$$18) {
-						zephir_array_fetch(&_24$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 712);
+						zephir_array_fetch(&_24$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 738);
 						_23$$18 = Z_TYPE_P(&_24$$18) == IS_OBJECT;
 					}
 					_25$$18 = _23$$18;
 					if (_25$$18) {
-						zephir_array_fetch(&_27$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 713);
+						zephir_array_fetch(&_27$$18, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 739);
 						ZEPHIR_CALL_METHOD(&_26$$18, &reflectionClass, "isinstance", NULL, 0, &_27$$18);
 						zephir_check_call_status();
 						_25$$18 = !zephir_is_true(&_26$$18);
@@ -1569,7 +1571,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						ZEPHIR_INIT_NVAR(&_28$$21);
 						object_init_ex(&_28$$21, phalcon_acl_exception_ce);
 						ZEPHIR_INIT_NVAR(&_29$$21);
-						zephir_array_fetch(&_30$$21, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 720);
+						zephir_array_fetch(&_30$$21, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 746);
 						zephir_get_class(&_29$$21, &_30$$21, 0);
 						ZEPHIR_CALL_METHOD(&_31$$21, &reflectionClass, "getname", NULL, 0);
 						zephir_check_call_status();
@@ -1577,14 +1579,14 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_32$$21, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_29$$21, " , Class in defined function: ", &_31$$21, ".");
 						ZEPHIR_CALL_METHOD(NULL, &_28$$21, "__construct", NULL, 29, &_32$$21);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_28$$21, "phalcon/Acl/Adapter/Memory.zep", 723);
+						zephir_throw_exception_debug(&_28$$21, "phalcon/Acl/Adapter/Memory.zep", 749);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				}
 				if (zephir_array_isset(&parameters, &parameterToCheck)) {
-					zephir_array_fetch(&_33$$22, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 732);
-					zephir_array_append(&parametersForFunction, &_33$$22, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 732);
+					zephir_array_fetch(&_33$$22, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 758);
+					zephir_array_append(&parametersForFunction, &_33$$22, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 758);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -1615,7 +1617,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						}
 						if (_36$$24) {
 							hasRole = 1;
-							zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 689);
+							zephir_array_append(&parametersForFunction, &roleObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 715);
 							ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 							zephir_decrement(&userParametersSizeShouldBe);
 							continue;
@@ -1632,19 +1634,19 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 						}
 						if (_39$$24) {
 							hasComponent = 1;
-							zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 701);
+							zephir_array_append(&parametersForFunction, &componentObject, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 727);
 							ZEPHIR_SEPARATE(&userParametersSizeShouldBe);
 							zephir_decrement(&userParametersSizeShouldBe);
 							continue;
 						}
 						_40$$24 = zephir_array_isset(&parameters, &parameterToCheck);
 						if (_40$$24) {
-							zephir_array_fetch(&_41$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 712);
+							zephir_array_fetch(&_41$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 738);
 							_40$$24 = Z_TYPE_P(&_41$$24) == IS_OBJECT;
 						}
 						_42$$24 = _40$$24;
 						if (_42$$24) {
-							zephir_array_fetch(&_44$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 713);
+							zephir_array_fetch(&_44$$24, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 739);
 							ZEPHIR_CALL_METHOD(&_43$$24, &reflectionClass, "isinstance", NULL, 0, &_44$$24);
 							zephir_check_call_status();
 							_42$$24 = !zephir_is_true(&_43$$24);
@@ -1653,7 +1655,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 							ZEPHIR_INIT_NVAR(&_45$$27);
 							object_init_ex(&_45$$27, phalcon_acl_exception_ce);
 							ZEPHIR_INIT_NVAR(&_46$$27);
-							zephir_array_fetch(&_47$$27, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 720);
+							zephir_array_fetch(&_47$$27, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 746);
 							zephir_get_class(&_46$$27, &_47$$27, 0);
 							ZEPHIR_CALL_METHOD(&_48$$27, &reflectionClass, "getname", NULL, 0);
 							zephir_check_call_status();
@@ -1661,14 +1663,14 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 							ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_49$$27, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_46$$27, " , Class in defined function: ", &_48$$27, ".");
 							ZEPHIR_CALL_METHOD(NULL, &_45$$27, "__construct", NULL, 29, &_49$$27);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_45$$27, "phalcon/Acl/Adapter/Memory.zep", 723);
+							zephir_throw_exception_debug(&_45$$27, "phalcon/Acl/Adapter/Memory.zep", 749);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
 					}
 					if (zephir_array_isset(&parameters, &parameterToCheck)) {
-						zephir_array_fetch(&_50$$28, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 732);
-						zephir_array_append(&parametersForFunction, &_50$$28, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 732);
+						zephir_array_fetch(&_50$$28, &parameters, &parameterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 758);
+						zephir_array_append(&parametersForFunction, &_50$$28, PH_SEPARATE, "phalcon/Acl/Adapter/Memory.zep", 758);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &reflectionParameters, "next", NULL, 0);
 				zephir_check_call_status();
@@ -1721,7 +1723,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed)
 		ZEPHIR_CONCAT_SSVSVSVS(&_61$$15, "You did not provide all necessary parameters for the ", "defined function when checking if '", roleName, "' can '", &access, "' for '", componentName, "'.");
 		ZEPHIR_CALL_METHOD(NULL, &_60$$15, "__construct", NULL, 29, &_61$$15);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_60$$15, "phalcon/Acl/Adapter/Memory.zep", 777);
+		zephir_throw_exception_debug(&_60$$15, "phalcon/Acl/Adapter/Memory.zep", 803);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -1884,7 +1886,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("accessList"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&accessList, &_3);
 	if (Z_TYPE_P(access) == IS_ARRAY) {
-		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 833);
+		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 859);
 		if (Z_TYPE_P(access) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(access), _4$$3)
 			{
@@ -1899,7 +1901,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 					ZEPHIR_CONCAT_SVSVS(&_7$$5, "Access '", &accessName, "' does not exist in component '", &componentName, "'");
 					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_8, 29, &_7$$5);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_6$$5, "phalcon/Acl/Adapter/Memory.zep", 829);
+					zephir_throw_exception_debug(&_6$$5, "phalcon/Acl/Adapter/Memory.zep", 855);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -1924,7 +1926,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 						ZEPHIR_CONCAT_SVSVS(&_10$$7, "Access '", &accessName, "' does not exist in component '", &componentName, "'");
 						ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 29, &_10$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_9$$7, "phalcon/Acl/Adapter/Memory.zep", 829);
+						zephir_throw_exception_debug(&_9$$7, "phalcon/Acl/Adapter/Memory.zep", 855);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1933,7 +1935,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 			}
 		}
 		ZEPHIR_INIT_NVAR(&accessName);
-		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 841);
+		zephir_is_iterable(access, 0, "phalcon/Acl/Adapter/Memory.zep", 867);
 		if (Z_TYPE_P(access) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(access), _11$$3)
 			{
@@ -1979,7 +1981,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny)
 				ZEPHIR_CONCAT_SVSVS(&_14$$14, "Access '", access, "' does not exist in component '", &componentName, "'");
 				ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 29, &_14$$14);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_13$$14, "phalcon/Acl/Adapter/Memory.zep", 849);
+				zephir_throw_exception_debug(&_13$$14, "phalcon/Acl/Adapter/Memory.zep", 875);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -2067,8 +2069,8 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess)
 		ZEPHIR_INIT_VAR(&checkRoleToInherits);
 		array_init(&checkRoleToInherits);
 		zephir_read_property(&_1$$6, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$6, &_1$$6, &roleName, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 910);
-		zephir_is_iterable(&_2$$6, 0, "phalcon/Acl/Adapter/Memory.zep", 914);
+		zephir_array_fetch(&_2$$6, &_1$$6, &roleName, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 936);
+		zephir_is_iterable(&_2$$6, 0, "phalcon/Acl/Adapter/Memory.zep", 940);
 		if (Z_TYPE_P(&_2$$6) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2$$6), _3$$6)
 			{
@@ -2134,8 +2136,8 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess)
 			zephir_read_property(&_10$$9, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY);
 			if (zephir_array_isset(&_10$$9, &checkRoleToInherit)) {
 				zephir_read_property(&_11$$14, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY);
-				zephir_array_fetch(&_12$$14, &_11$$14, &checkRoleToInherit, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 957);
-				zephir_is_iterable(&_12$$14, 0, "phalcon/Acl/Adapter/Memory.zep", 960);
+				zephir_array_fetch(&_12$$14, &_11$$14, &checkRoleToInherit, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 983);
+				zephir_is_iterable(&_12$$14, 0, "phalcon/Acl/Adapter/Memory.zep", 986);
 				if (Z_TYPE_P(&_12$$14) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_12$$14), _13$$14)
 					{
@@ -2227,7 +2229,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, checkExists)
 		ZEPHIR_CONCAT_VSVSV(&_1$$3, &elementName, " '", &element, "' does not exist in the ", &suffix);
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Acl/Adapter/Memory.zep", 985);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Acl/Adapter/Memory.zep", 1011);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
diff --git a/ext/phalcon/acl/adapter/memory.zep.h b/ext/phalcon/acl/adapter/memory.zep.h
index d2c6b718da5..e59ec468c52 100644
--- a/ext/phalcon/acl/adapter/memory.zep.h
+++ b/ext/phalcon/acl/adapter/memory.zep.h
@@ -3,9 +3,6 @@ extern zend_class_entry *phalcon_acl_adapter_memory_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Adapter_Memory);
 
-PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction);
-PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount);
-PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, __construct);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponent);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponentAccess);
@@ -14,6 +11,9 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addRole);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, dropComponentAccess);
+PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunction);
+PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount);
+PHP_METHOD(Phalcon_Acl_Adapter_Memory, getActiveKey);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, getComponents);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, getInheritedRoles);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, getNoArgumentsDefaultAction);
@@ -26,15 +26,6 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess);
 PHP_METHOD(Phalcon_Acl_Adapter_Memory, checkExists);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunction, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivekey, 0, 0, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_adapter_memory___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -80,6 +71,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_dropc
 	ZEND_ARG_INFO(0, accessList)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunction, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getactivekey, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_getcomponents, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -141,13 +141,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_adapter_memory_check
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_adapter_memory_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, arginfo_phalcon_acl_adapter_memory_getactivefunction, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, NULL, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount, arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveKey, arginfo_phalcon_acl_adapter_memory_getactivekey, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Acl_Adapter_Memory, __construct, arginfo_phalcon_acl_adapter_memory___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 #else
@@ -160,6 +153,13 @@ ZEPHIR_INIT_FUNCS(phalcon_acl_adapter_memory_method_entry) {
 	PHP_ME(Phalcon_Acl_Adapter_Memory, allow, arginfo_phalcon_acl_adapter_memory_allow, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, deny, arginfo_phalcon_acl_adapter_memory_deny, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, dropComponentAccess, arginfo_phalcon_acl_adapter_memory_dropcomponentaccess, ZEND_ACC_PUBLIC)
+#if PHP_VERSION_ID >= 80000
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, arginfo_phalcon_acl_adapter_memory_getactivefunction, ZEND_ACC_PUBLIC)
+#else
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunction, NULL, ZEND_ACC_PUBLIC)
+#endif
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveFunctionCustomArgumentsCount, arginfo_phalcon_acl_adapter_memory_getactivefunctioncustomargumentscount, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Acl_Adapter_Memory, getActiveKey, arginfo_phalcon_acl_adapter_memory_getactivekey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, getComponents, arginfo_phalcon_acl_adapter_memory_getcomponents, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, getInheritedRoles, arginfo_phalcon_acl_adapter_memory_getinheritedroles, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Adapter_Memory, getNoArgumentsDefaultAction, arginfo_phalcon_acl_adapter_memory_getnoargumentsdefaultaction, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/acl/component.zep.c b/ext/phalcon/acl/component.zep.c
index 78da4b5c6d1..d5a4239a6ce 100644
--- a/ext/phalcon/acl/component.zep.c
+++ b/ext/phalcon/acl/component.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
+#include "kernel/object.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/memory.h"
 
@@ -50,42 +50,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Component)
 	return SUCCESS;
 }
 
-/**
- * Component description
- */
-PHP_METHOD(Phalcon_Acl_Component, getDescription)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "description");
-}
-
-/**
- * Component name
- */
-PHP_METHOD(Phalcon_Acl_Component, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-/**
- * Component name
- */
-PHP_METHOD(Phalcon_Acl_Component, __toString)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
 /**
  * Phalcon\Acl\Component constructor
  */
@@ -126,7 +90,7 @@ PHP_METHOD(Phalcon_Acl_Component, __construct)
 	}
 
 
-	if (UNEXPECTED(ZEPHIR_IS_STRING(&name, "*"))) {
+	if (UNEXPECTED(ZEPHIR_IS_STRING_IDENTICAL(&name, "*"))) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Component name cannot be '*'", "phalcon/Acl/Component.zep", 38);
 		return;
 	}
@@ -135,3 +99,30 @@ PHP_METHOD(Phalcon_Acl_Component, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+PHP_METHOD(Phalcon_Acl_Component, __toString)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+PHP_METHOD(Phalcon_Acl_Component, getDescription)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "description");
+}
+
+PHP_METHOD(Phalcon_Acl_Component, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
diff --git a/ext/phalcon/acl/component.zep.h b/ext/phalcon/acl/component.zep.h
index d7e8206566a..e6509e3c713 100644
--- a/ext/phalcon/acl/component.zep.h
+++ b/ext/phalcon/acl/component.zep.h
@@ -3,29 +3,29 @@ extern zend_class_entry *phalcon_acl_component_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Component);
 
+PHP_METHOD(Phalcon_Acl_Component, __construct);
+PHP_METHOD(Phalcon_Acl_Component, __toString);
 PHP_METHOD(Phalcon_Acl_Component, getDescription);
 PHP_METHOD(Phalcon_Acl_Component, getName);
-PHP_METHOD(Phalcon_Acl_Component, __toString);
-PHP_METHOD(Phalcon_Acl_Component, __construct);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getdescription, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_component___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getname, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component___tostring, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component___tostring, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getdescription, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_component___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_component_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_component_method_entry) {
+	PHP_ME(Phalcon_Acl_Component, __construct, arginfo_phalcon_acl_component___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Acl_Component, __toString, arginfo_phalcon_acl_component___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Component, getDescription, arginfo_phalcon_acl_component_getdescription, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Component, getName, arginfo_phalcon_acl_component_getname, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Component, __toString, arginfo_phalcon_acl_component___tostring, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Component, __construct, arginfo_phalcon_acl_component___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/acl/role.zep.c b/ext/phalcon/acl/role.zep.c
index b6839823cd0..63fff2ec054 100644
--- a/ext/phalcon/acl/role.zep.c
+++ b/ext/phalcon/acl/role.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
+#include "kernel/object.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/memory.h"
 
@@ -35,57 +35,21 @@ ZEPHIR_INIT_CLASS(Phalcon_Acl_Role)
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Acl, Role, phalcon, acl_role, phalcon_acl_role_method_entry, 0);
 
 	/**
-	 * Role name
+	 * Role description
 	 *
 	 * @var string
 	 */
-	zend_declare_property_null(phalcon_acl_role_ce, SL("name"), ZEND_ACC_PRIVATE);
+	zend_declare_property_null(phalcon_acl_role_ce, SL("description"), ZEND_ACC_PRIVATE);
 	/**
-	 * Role description
+	 * Role name
 	 *
 	 * @var string
 	 */
-	zend_declare_property_null(phalcon_acl_role_ce, SL("description"), ZEND_ACC_PRIVATE);
+	zend_declare_property_null(phalcon_acl_role_ce, SL("name"), ZEND_ACC_PRIVATE);
 	zend_class_implements(phalcon_acl_role_ce, 1, phalcon_acl_roleinterface_ce);
 	return SUCCESS;
 }
 
-/**
- * Role name
- */
-PHP_METHOD(Phalcon_Acl_Role, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-/**
- * Role name
- */
-PHP_METHOD(Phalcon_Acl_Role, __toString)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-/**
- * Role description
- */
-PHP_METHOD(Phalcon_Acl_Role, getDescription)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "description");
-}
-
 /**
  * Phalcon\Acl\Role constructor
  */
@@ -126,7 +90,7 @@ PHP_METHOD(Phalcon_Acl_Role, __construct)
 	}
 
 
-	if (UNEXPECTED(ZEPHIR_IS_STRING(&name, "*"))) {
+	if (UNEXPECTED(ZEPHIR_IS_STRING_IDENTICAL(&name, "*"))) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role name cannot be '*'", "phalcon/Acl/Role.zep", 38);
 		return;
 	}
@@ -135,3 +99,30 @@ PHP_METHOD(Phalcon_Acl_Role, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+PHP_METHOD(Phalcon_Acl_Role, __toString)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+PHP_METHOD(Phalcon_Acl_Role, getDescription)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "description");
+}
+
+PHP_METHOD(Phalcon_Acl_Role, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
diff --git a/ext/phalcon/acl/role.zep.h b/ext/phalcon/acl/role.zep.h
index 7509a5636e8..a089e4f106f 100644
--- a/ext/phalcon/acl/role.zep.h
+++ b/ext/phalcon/acl/role.zep.h
@@ -3,12 +3,14 @@ extern zend_class_entry *phalcon_acl_role_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Acl_Role);
 
-PHP_METHOD(Phalcon_Acl_Role, getName);
+PHP_METHOD(Phalcon_Acl_Role, __construct);
 PHP_METHOD(Phalcon_Acl_Role, __toString);
 PHP_METHOD(Phalcon_Acl_Role, getDescription);
-PHP_METHOD(Phalcon_Acl_Role, __construct);
+PHP_METHOD(Phalcon_Acl_Role, getName);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role_getname, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_role___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role___tostring, 0, 0, IS_STRING, 0)
@@ -17,15 +19,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role_getdescription, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_acl_role___construct, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_acl_role_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_acl_role_method_entry) {
-	PHP_ME(Phalcon_Acl_Role, getName, arginfo_phalcon_acl_role_getname, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Acl_Role, __construct, arginfo_phalcon_acl_role___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Acl_Role, __toString, arginfo_phalcon_acl_role___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Acl_Role, getDescription, arginfo_phalcon_acl_role_getdescription, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Acl_Role, __construct, arginfo_phalcon_acl_role___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Acl_Role, getName, arginfo_phalcon_acl_role_getname, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/annotations/adapter/abstractadapter.zep.c b/ext/phalcon/annotations/adapter/abstractadapter.zep.c
index 2f56baa6ac9..d2cf703d1af 100644
--- a/ext/phalcon/annotations/adapter/abstractadapter.zep.c
+++ b/ext/phalcon/annotations/adapter/abstractadapter.zep.c
@@ -405,9 +405,8 @@ PHP_METHOD(Phalcon_Annotations_Adapter_AbstractAdapter, getReader)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("reader"), PH_NOISY_CC);
-	if (Z_TYPE_P(&_0) != IS_OBJECT) {
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reader"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$3);
 		object_init_ex(&_1$$3, phalcon_annotations_reader_ce);
 		if (zephir_has_constructor(&_1$$3)) {
diff --git a/ext/phalcon/annotations/collection.zep.h b/ext/phalcon/annotations/collection.zep.h
index 3e1ae8da6d0..82c2ec4e30e 100644
--- a/ext/phalcon/annotations/collection.zep.h
+++ b/ext/phalcon/annotations/collection.zep.h
@@ -29,7 +29,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_NULL, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/annotations/reader.zep.c b/ext/phalcon/annotations/reader.zep.c
index de8f888f24f..f30583d89f4 100644
--- a/ext/phalcon/annotations/reader.zep.c
+++ b/ext/phalcon/annotations/reader.zep.c
@@ -14,9 +14,9 @@
 #include "kernel/main.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
+#include "kernel/operators.h"
 #include "kernel/array.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "phalcon/annotations/scanner.h"
 #include "phalcon/annotations/annot.h"
 
@@ -114,7 +114,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 153);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&comment) == IS_STRING) {
+	if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 		ZEPHIR_INIT_VAR(&classAnnotations);
 		ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 154);
 		zephir_check_call_status();
@@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 		zephir_array_keys(&arrayKeys, &constants);
 		ZEPHIR_INIT_VAR(&anotationsConstants);
 		array_init(&anotationsConstants);
-		zephir_is_iterable(&arrayKeys, 0, "phalcon/Annotations/Reader.zep", 93);
+		zephir_is_iterable(&arrayKeys, 0, "phalcon/Annotations/Reader.zep", 92);
 		if (Z_TYPE_P(&arrayKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arrayKeys), _2$$5)
 			{
@@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0);
 				zephir_check_call_status();
-				if (Z_TYPE_P(&comment) == IS_STRING) {
+				if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 					ZEPHIR_INIT_NVAR(&constantAnnotations);
 					ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 154);
 					zephir_check_call_status();
@@ -171,7 +171,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 					zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0);
 					zephir_check_call_status();
-					if (Z_TYPE_P(&comment) == IS_STRING) {
+					if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 						ZEPHIR_INIT_NVAR(&constantAnnotations);
 						ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 154);
 						zephir_check_call_status();
@@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 		line = 1;
 		ZEPHIR_INIT_VAR(&annotationsProperties);
 		array_init(&annotationsProperties);
-		zephir_is_iterable(&properties, 0, "phalcon/Annotations/Reader.zep", 132);
+		zephir_is_iterable(&properties, 0, "phalcon/Annotations/Reader.zep", 130);
 		if (Z_TYPE_P(&properties) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&properties), _9$$13)
 			{
@@ -205,7 +205,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				ZVAL_COPY(&property, _9$$13);
 				ZEPHIR_CALL_METHOD(&comment, &property, "getdoccomment", NULL, 0);
 				zephir_check_call_status();
-				if (Z_TYPE_P(&comment) == IS_STRING) {
+				if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 					ZEPHIR_INIT_NVAR(&propertyAnnotations);
 					ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 154);
 					zephir_check_call_status();
@@ -232,7 +232,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&comment, &property, "getdoccomment", NULL, 0);
 					zephir_check_call_status();
-					if (Z_TYPE_P(&comment) == IS_STRING) {
+					if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 						ZEPHIR_INIT_NVAR(&propertyAnnotations);
 						ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 154);
 						zephir_check_call_status();
@@ -256,10 +256,10 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 	}
 	ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 159);
 	zephir_check_call_status();
-	if (zephir_fast_count_int(&methods)) {
+	if (0 == ZEPHIR_IS_EMPTY(&methods)) {
 		ZEPHIR_INIT_VAR(&annotationsMethods);
 		array_init(&annotationsMethods);
-		zephir_is_iterable(&methods, 0, "phalcon/Annotations/Reader.zep", 167);
+		zephir_is_iterable(&methods, 0, "phalcon/Annotations/Reader.zep", 164);
 		if (Z_TYPE_P(&methods) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&methods), _17$$21)
 			{
@@ -267,7 +267,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				ZVAL_COPY(&method, _17$$21);
 				ZEPHIR_CALL_METHOD(&comment, &method, "getdoccomment", NULL, 0);
 				zephir_check_call_status();
-				if (Z_TYPE_P(&comment) == IS_STRING) {
+				if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 					ZEPHIR_INIT_NVAR(&methodAnnotations);
 					ZEPHIR_CALL_METHOD(&_19$$23, &method, "getfilename", NULL, 0);
 					zephir_check_call_status();
@@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&comment, &method, "getdoccomment", NULL, 0);
 					zephir_check_call_status();
-					if (Z_TYPE_P(&comment) == IS_STRING) {
+					if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) {
 						ZEPHIR_INIT_NVAR(&methodAnnotations);
 						ZEPHIR_CALL_METHOD(&_22$$26, &method, "getfilename", NULL, 0);
 						zephir_check_call_status();
diff --git a/ext/phalcon/annotations/reflection.zep.c b/ext/phalcon/annotations/reflection.zep.c
index 29e2caa7b59..d129bbdf726 100644
--- a/ext/phalcon/annotations/reflection.zep.c
+++ b/ext/phalcon/annotations/reflection.zep.c
@@ -50,23 +50,19 @@ ZEPHIR_INIT_CLASS(Phalcon_Annotations_Reflection)
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Annotations, Reflection, phalcon, annotations_reflection, phalcon_annotations_reflection_method_entry, 0);
 
 	/**
-	 * @var array
-	 * TODO: Make always array
+	 * @var Collection|null
 	 */
 	zend_declare_property_null(phalcon_annotations_reflection_ce, SL("classAnnotations"), ZEND_ACC_PROTECTED);
 	/**
 	 * @var array
-	 * TODO: Make always array
 	 */
 	zend_declare_property_null(phalcon_annotations_reflection_ce, SL("constantAnnotations"), ZEND_ACC_PROTECTED);
 	/**
 	 * @var array
-	 * TODO: Make always array
 	 */
 	zend_declare_property_null(phalcon_annotations_reflection_ce, SL("propertyAnnotations"), ZEND_ACC_PROTECTED);
 	/**
 	 * @var array
-	 * TODO: Make always array
 	 */
 	zend_declare_property_null(phalcon_annotations_reflection_ce, SL("methodAnnotations"), ZEND_ACC_PROTECTED);
 	/**
@@ -78,9 +74,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Annotations_Reflection)
 	return SUCCESS;
 }
 
-/**
- * Phalcon\Annotations\Reflection constructor
- */
 PHP_METHOD(Phalcon_Annotations_Reflection, __construct)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
@@ -114,16 +107,16 @@ PHP_METHOD(Phalcon_Annotations_Reflection, __construct)
 
 /**
  * Returns the annotations found in the class docblock
+ *
+ * @return Collection|null
  */
 PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations)
 {
+	zval reflectionClass, _0, _1$$3, _2$$4;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionClass, _0, _1$$3, _2$$4;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionClass);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
@@ -141,12 +134,6 @@ PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations)
 			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 34, &reflectionClass);
 			zephir_check_call_status();
 			zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &_2$$4);
-		} else {
-			if (0) {
-				zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &__$true);
-			} else {
-				zephir_update_property_zval(this_ptr, ZEND_STRL("classAnnotations"), &__$false);
-			}
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "classAnnotations");
@@ -154,90 +141,81 @@ PHP_METHOD(Phalcon_Annotations_Reflection, getClassAnnotations)
 
 /**
  * Returns the annotations found in the constants' docblocks
+ *
+ * @return Collection[]
  */
 PHP_METHOD(Phalcon_Annotations_Reflection, getConstantsAnnotations)
 {
-	zend_string *_6$$5;
-	zend_ulong _5$$5;
+	zend_string *_5$$4;
+	zend_ulong _4$$4;
+	zend_bool _1$$3;
+	zval reflectionConstants, constant, reflectionConstant, _0, *_2$$4, _3$$4, _6$$5, _8$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionConstants, constant, reflectionConstant, _0, _1$$3, _2$$5, *_3$$5, _4$$5, _7$$6, _9$$7;
-	zephir_fcall_cache_entry *_8 = NULL;
+	zephir_fcall_cache_entry *_7 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionConstants);
 	ZVAL_UNDEF(&constant);
 	ZVAL_UNDEF(&reflectionConstant);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_7$$6);
-	ZVAL_UNDEF(&_9$$7);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$6);
 
 
 	ZEPHIR_MM_GROW();
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("constantAnnotations"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_NULL) {
-		ZEPHIR_OBS_VAR(&reflectionConstants);
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset_string_fetch(&reflectionConstants, &_1$$3, SL("constants"), 0)) {
-			if (zephir_fast_count_int(&reflectionConstants)) {
-				ZEPHIR_INIT_VAR(&_2$$5);
-				array_init(&_2$$5);
-				zephir_update_property_zval(this_ptr, ZEND_STRL("constantAnnotations"), &_2$$5);
-				zephir_is_iterable(&reflectionConstants, 0, "phalcon/Annotations/Reflection.zep", 106);
-				if (Z_TYPE_P(&reflectionConstants) == IS_ARRAY) {
-					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionConstants), _5$$5, _6$$5, _3$$5)
-					{
-						ZEPHIR_INIT_NVAR(&constant);
-						if (_6$$5 != NULL) { 
-							ZVAL_STR_COPY(&constant, _6$$5);
-						} else {
-							ZVAL_LONG(&constant, _5$$5);
-						}
-						ZEPHIR_INIT_NVAR(&reflectionConstant);
-						ZVAL_COPY(&reflectionConstant, _3$$5);
-						ZEPHIR_INIT_NVAR(&_7$$6);
-						object_init_ex(&_7$$6, phalcon_annotations_collection_ce);
-						ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 34, &reflectionConstant);
-						zephir_check_call_status();
-						zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_7$$6);
-					} ZEND_HASH_FOREACH_END();
-				} else {
-					ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "rewind", NULL, 0);
+	ZEPHIR_OBS_VAR(&reflectionConstants);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
+	if (zephir_array_isset_string_fetch(&reflectionConstants, &_0, SL("constants"), 0)) {
+		_1$$3 = Z_TYPE_P(&reflectionConstants) == IS_ARRAY;
+		if (_1$$3) {
+			_1$$3 = zephir_fast_count_int(&reflectionConstants) > 0;
+		}
+		if (_1$$3) {
+			zephir_is_iterable(&reflectionConstants, 0, "phalcon/Annotations/Reflection.zep", 97);
+			if (Z_TYPE_P(&reflectionConstants) == IS_ARRAY) {
+				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionConstants), _4$$4, _5$$4, _2$$4)
+				{
+					ZEPHIR_INIT_NVAR(&constant);
+					if (_5$$4 != NULL) { 
+						ZVAL_STR_COPY(&constant, _5$$4);
+					} else {
+						ZVAL_LONG(&constant, _4$$4);
+					}
+					ZEPHIR_INIT_NVAR(&reflectionConstant);
+					ZVAL_COPY(&reflectionConstant, _2$$4);
+					ZEPHIR_INIT_NVAR(&_6$$5);
+					object_init_ex(&_6$$5, phalcon_annotations_collection_ce);
+					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_7, 34, &reflectionConstant);
 					zephir_check_call_status();
-					while (1) {
-						ZEPHIR_CALL_METHOD(&_4$$5, &reflectionConstants, "valid", NULL, 0);
-						zephir_check_call_status();
-						if (!zend_is_true(&_4$$5)) {
-							break;
-						}
-						ZEPHIR_CALL_METHOD(&constant, &reflectionConstants, "key", NULL, 0);
-						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&reflectionConstant, &reflectionConstants, "current", NULL, 0);
-						zephir_check_call_status();
-							ZEPHIR_INIT_NVAR(&_9$$7);
-							object_init_ex(&_9$$7, phalcon_annotations_collection_ce);
-							ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 34, &reflectionConstant);
-							zephir_check_call_status();
-							zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_9$$7);
-						ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "next", NULL, 0);
-						zephir_check_call_status();
+					zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_6$$5);
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "rewind", NULL, 0);
+				zephir_check_call_status();
+				while (1) {
+					ZEPHIR_CALL_METHOD(&_3$$4, &reflectionConstants, "valid", NULL, 0);
+					zephir_check_call_status();
+					if (!zend_is_true(&_3$$4)) {
+						break;
 					}
+					ZEPHIR_CALL_METHOD(&constant, &reflectionConstants, "key", NULL, 0);
+					zephir_check_call_status();
+					ZEPHIR_CALL_METHOD(&reflectionConstant, &reflectionConstants, "current", NULL, 0);
+					zephir_check_call_status();
+						ZEPHIR_INIT_NVAR(&_8$$6);
+						object_init_ex(&_8$$6, phalcon_annotations_collection_ce);
+						ZEPHIR_CALL_METHOD(NULL, &_8$$6, "__construct", &_7, 34, &reflectionConstant);
+						zephir_check_call_status();
+						zephir_update_property_array(this_ptr, SL("constantAnnotations"), &constant, &_8$$6);
+					ZEPHIR_CALL_METHOD(NULL, &reflectionConstants, "next", NULL, 0);
+					zephir_check_call_status();
 				}
-				ZEPHIR_INIT_NVAR(&reflectionConstant);
-				ZEPHIR_INIT_NVAR(&constant);
-				RETURN_MM_MEMBER(getThis(), "constantAnnotations");
 			}
-		}
-		if (0) {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("constantAnnotations"), &__$true);
-		} else {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("constantAnnotations"), &__$false);
+			ZEPHIR_INIT_NVAR(&reflectionConstant);
+			ZEPHIR_INIT_NVAR(&constant);
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "constantAnnotations");
@@ -245,90 +223,81 @@ PHP_METHOD(Phalcon_Annotations_Reflection, getConstantsAnnotations)
 
 /**
  * Returns the annotations found in the properties' docblocks
+ *
+ * @return Collection[]
  */
 PHP_METHOD(Phalcon_Annotations_Reflection, getPropertiesAnnotations)
 {
-	zend_string *_6$$5;
-	zend_ulong _5$$5;
+	zend_string *_5$$4;
+	zend_ulong _4$$4;
+	zend_bool _1$$3;
+	zval reflectionProperties, property, reflectionProperty, _0, *_2$$4, _3$$4, _6$$5, _8$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionProperties, property, reflectionProperty, _0, _1$$3, _2$$5, *_3$$5, _4$$5, _7$$6, _9$$7;
-	zephir_fcall_cache_entry *_8 = NULL;
+	zephir_fcall_cache_entry *_7 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionProperties);
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&reflectionProperty);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_7$$6);
-	ZVAL_UNDEF(&_9$$7);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$6);
 
 
 	ZEPHIR_MM_GROW();
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("propertyAnnotations"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_NULL) {
-		ZEPHIR_OBS_VAR(&reflectionProperties);
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset_string_fetch(&reflectionProperties, &_1$$3, SL("properties"), 0)) {
-			if (zephir_fast_count_int(&reflectionProperties)) {
-				ZEPHIR_INIT_VAR(&_2$$5);
-				array_init(&_2$$5);
-				zephir_update_property_zval(this_ptr, ZEND_STRL("propertyAnnotations"), &_2$$5);
-				zephir_is_iterable(&reflectionProperties, 0, "phalcon/Annotations/Reflection.zep", 134);
-				if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) {
-					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionProperties), _5$$5, _6$$5, _3$$5)
-					{
-						ZEPHIR_INIT_NVAR(&property);
-						if (_6$$5 != NULL) { 
-							ZVAL_STR_COPY(&property, _6$$5);
-						} else {
-							ZVAL_LONG(&property, _5$$5);
-						}
-						ZEPHIR_INIT_NVAR(&reflectionProperty);
-						ZVAL_COPY(&reflectionProperty, _3$$5);
-						ZEPHIR_INIT_NVAR(&_7$$6);
-						object_init_ex(&_7$$6, phalcon_annotations_collection_ce);
-						ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 34, &reflectionProperty);
-						zephir_check_call_status();
-						zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_7$$6);
-					} ZEND_HASH_FOREACH_END();
-				} else {
-					ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "rewind", NULL, 0);
+	ZEPHIR_OBS_VAR(&reflectionProperties);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
+	if (zephir_array_isset_string_fetch(&reflectionProperties, &_0, SL("properties"), 0)) {
+		_1$$3 = Z_TYPE_P(&reflectionProperties) == IS_ARRAY;
+		if (_1$$3) {
+			_1$$3 = zephir_fast_count_int(&reflectionProperties) > 0;
+		}
+		if (_1$$3) {
+			zephir_is_iterable(&reflectionProperties, 0, "phalcon/Annotations/Reflection.zep", 119);
+			if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) {
+				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionProperties), _4$$4, _5$$4, _2$$4)
+				{
+					ZEPHIR_INIT_NVAR(&property);
+					if (_5$$4 != NULL) { 
+						ZVAL_STR_COPY(&property, _5$$4);
+					} else {
+						ZVAL_LONG(&property, _4$$4);
+					}
+					ZEPHIR_INIT_NVAR(&reflectionProperty);
+					ZVAL_COPY(&reflectionProperty, _2$$4);
+					ZEPHIR_INIT_NVAR(&_6$$5);
+					object_init_ex(&_6$$5, phalcon_annotations_collection_ce);
+					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_7, 34, &reflectionProperty);
 					zephir_check_call_status();
-					while (1) {
-						ZEPHIR_CALL_METHOD(&_4$$5, &reflectionProperties, "valid", NULL, 0);
-						zephir_check_call_status();
-						if (!zend_is_true(&_4$$5)) {
-							break;
-						}
-						ZEPHIR_CALL_METHOD(&property, &reflectionProperties, "key", NULL, 0);
-						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&reflectionProperty, &reflectionProperties, "current", NULL, 0);
-						zephir_check_call_status();
-							ZEPHIR_INIT_NVAR(&_9$$7);
-							object_init_ex(&_9$$7, phalcon_annotations_collection_ce);
-							ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 34, &reflectionProperty);
-							zephir_check_call_status();
-							zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_9$$7);
-						ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "next", NULL, 0);
-						zephir_check_call_status();
+					zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_6$$5);
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "rewind", NULL, 0);
+				zephir_check_call_status();
+				while (1) {
+					ZEPHIR_CALL_METHOD(&_3$$4, &reflectionProperties, "valid", NULL, 0);
+					zephir_check_call_status();
+					if (!zend_is_true(&_3$$4)) {
+						break;
 					}
+					ZEPHIR_CALL_METHOD(&property, &reflectionProperties, "key", NULL, 0);
+					zephir_check_call_status();
+					ZEPHIR_CALL_METHOD(&reflectionProperty, &reflectionProperties, "current", NULL, 0);
+					zephir_check_call_status();
+						ZEPHIR_INIT_NVAR(&_8$$6);
+						object_init_ex(&_8$$6, phalcon_annotations_collection_ce);
+						ZEPHIR_CALL_METHOD(NULL, &_8$$6, "__construct", &_7, 34, &reflectionProperty);
+						zephir_check_call_status();
+						zephir_update_property_array(this_ptr, SL("propertyAnnotations"), &property, &_8$$6);
+					ZEPHIR_CALL_METHOD(NULL, &reflectionProperties, "next", NULL, 0);
+					zephir_check_call_status();
 				}
-				ZEPHIR_INIT_NVAR(&reflectionProperty);
-				ZEPHIR_INIT_NVAR(&property);
-				RETURN_MM_MEMBER(getThis(), "propertyAnnotations");
 			}
-		}
-		if (0) {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("propertyAnnotations"), &__$true);
-		} else {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("propertyAnnotations"), &__$false);
+			ZEPHIR_INIT_NVAR(&reflectionProperty);
+			ZEPHIR_INIT_NVAR(&property);
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "propertyAnnotations");
@@ -336,90 +305,81 @@ PHP_METHOD(Phalcon_Annotations_Reflection, getPropertiesAnnotations)
 
 /**
  * Returns the annotations found in the methods' docblocks
+ *
+ * @return Collection[]
  */
 PHP_METHOD(Phalcon_Annotations_Reflection, getMethodsAnnotations)
 {
-	zend_string *_6$$5;
-	zend_ulong _5$$5;
+	zend_string *_5$$4;
+	zend_ulong _4$$4;
+	zend_bool _1$$3;
+	zval reflectionMethods, methodName, reflectionMethod, _0, *_2$$4, _3$$4, _6$$5, _8$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval __$true, __$false, reflectionMethods, methodName, reflectionMethod, _0, _1$$3, _2$$5, *_3$$5, _4$$5, _7$$6, _9$$7;
-	zephir_fcall_cache_entry *_8 = NULL;
+	zephir_fcall_cache_entry *_7 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&reflectionMethods);
 	ZVAL_UNDEF(&methodName);
 	ZVAL_UNDEF(&reflectionMethod);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_7$$6);
-	ZVAL_UNDEF(&_9$$7);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$6);
 
 
 	ZEPHIR_MM_GROW();
 
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("methodAnnotations"), PH_NOISY_CC | PH_READONLY);
-	if (Z_TYPE_P(&_0) == IS_NULL) {
-		ZEPHIR_OBS_VAR(&reflectionMethods);
-		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset_string_fetch(&reflectionMethods, &_1$$3, SL("methods"), 0)) {
-			if (zephir_fast_count_int(&reflectionMethods)) {
-				ZEPHIR_INIT_VAR(&_2$$5);
-				array_init(&_2$$5);
-				zephir_update_property_zval(this_ptr, ZEND_STRL("methodAnnotations"), &_2$$5);
-				zephir_is_iterable(&reflectionMethods, 0, "phalcon/Annotations/Reflection.zep", 162);
-				if (Z_TYPE_P(&reflectionMethods) == IS_ARRAY) {
-					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionMethods), _5$$5, _6$$5, _3$$5)
-					{
-						ZEPHIR_INIT_NVAR(&methodName);
-						if (_6$$5 != NULL) { 
-							ZVAL_STR_COPY(&methodName, _6$$5);
-						} else {
-							ZVAL_LONG(&methodName, _5$$5);
-						}
-						ZEPHIR_INIT_NVAR(&reflectionMethod);
-						ZVAL_COPY(&reflectionMethod, _3$$5);
-						ZEPHIR_INIT_NVAR(&_7$$6);
-						object_init_ex(&_7$$6, phalcon_annotations_collection_ce);
-						ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 34, &reflectionMethod);
-						zephir_check_call_status();
-						zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_7$$6);
-					} ZEND_HASH_FOREACH_END();
-				} else {
-					ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "rewind", NULL, 0);
+	ZEPHIR_OBS_VAR(&reflectionMethods);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("reflectionData"), PH_NOISY_CC | PH_READONLY);
+	if (zephir_array_isset_string_fetch(&reflectionMethods, &_0, SL("methods"), 0)) {
+		_1$$3 = Z_TYPE_P(&reflectionMethods) == IS_ARRAY;
+		if (_1$$3) {
+			_1$$3 = zephir_fast_count_int(&reflectionMethods) > 0;
+		}
+		if (_1$$3) {
+			zephir_is_iterable(&reflectionMethods, 0, "phalcon/Annotations/Reflection.zep", 141);
+			if (Z_TYPE_P(&reflectionMethods) == IS_ARRAY) {
+				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&reflectionMethods), _4$$4, _5$$4, _2$$4)
+				{
+					ZEPHIR_INIT_NVAR(&methodName);
+					if (_5$$4 != NULL) { 
+						ZVAL_STR_COPY(&methodName, _5$$4);
+					} else {
+						ZVAL_LONG(&methodName, _4$$4);
+					}
+					ZEPHIR_INIT_NVAR(&reflectionMethod);
+					ZVAL_COPY(&reflectionMethod, _2$$4);
+					ZEPHIR_INIT_NVAR(&_6$$5);
+					object_init_ex(&_6$$5, phalcon_annotations_collection_ce);
+					ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", &_7, 34, &reflectionMethod);
 					zephir_check_call_status();
-					while (1) {
-						ZEPHIR_CALL_METHOD(&_4$$5, &reflectionMethods, "valid", NULL, 0);
-						zephir_check_call_status();
-						if (!zend_is_true(&_4$$5)) {
-							break;
-						}
-						ZEPHIR_CALL_METHOD(&methodName, &reflectionMethods, "key", NULL, 0);
-						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&reflectionMethod, &reflectionMethods, "current", NULL, 0);
-						zephir_check_call_status();
-							ZEPHIR_INIT_NVAR(&_9$$7);
-							object_init_ex(&_9$$7, phalcon_annotations_collection_ce);
-							ZEPHIR_CALL_METHOD(NULL, &_9$$7, "__construct", &_8, 34, &reflectionMethod);
-							zephir_check_call_status();
-							zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_9$$7);
-						ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "next", NULL, 0);
-						zephir_check_call_status();
+					zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_6$$5);
+				} ZEND_HASH_FOREACH_END();
+			} else {
+				ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "rewind", NULL, 0);
+				zephir_check_call_status();
+				while (1) {
+					ZEPHIR_CALL_METHOD(&_3$$4, &reflectionMethods, "valid", NULL, 0);
+					zephir_check_call_status();
+					if (!zend_is_true(&_3$$4)) {
+						break;
 					}
+					ZEPHIR_CALL_METHOD(&methodName, &reflectionMethods, "key", NULL, 0);
+					zephir_check_call_status();
+					ZEPHIR_CALL_METHOD(&reflectionMethod, &reflectionMethods, "current", NULL, 0);
+					zephir_check_call_status();
+						ZEPHIR_INIT_NVAR(&_8$$6);
+						object_init_ex(&_8$$6, phalcon_annotations_collection_ce);
+						ZEPHIR_CALL_METHOD(NULL, &_8$$6, "__construct", &_7, 34, &reflectionMethod);
+						zephir_check_call_status();
+						zephir_update_property_array(this_ptr, SL("methodAnnotations"), &methodName, &_8$$6);
+					ZEPHIR_CALL_METHOD(NULL, &reflectionMethods, "next", NULL, 0);
+					zephir_check_call_status();
 				}
-				ZEPHIR_INIT_NVAR(&reflectionMethod);
-				ZEPHIR_INIT_NVAR(&methodName);
-				RETURN_MM_MEMBER(getThis(), "methodAnnotations");
 			}
-		}
-		if (0) {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("methodAnnotations"), &__$true);
-		} else {
-			zephir_update_property_zval(this_ptr, ZEND_STRL("methodAnnotations"), &__$false);
+			ZEPHIR_INIT_NVAR(&reflectionMethod);
+			ZEPHIR_INIT_NVAR(&methodName);
 		}
 	}
 	RETURN_MM_MEMBER(getThis(), "methodAnnotations");
@@ -428,6 +388,8 @@ PHP_METHOD(Phalcon_Annotations_Reflection, getMethodsAnnotations)
 /**
  * Returns the raw parsing intermediate definitions used to construct the
  * reflection
+ *
+ * @return array
  */
 PHP_METHOD(Phalcon_Annotations_Reflection, getReflectionData)
 {
@@ -440,10 +402,16 @@ PHP_METHOD(Phalcon_Annotations_Reflection, getReflectionData)
 
 zend_object *zephir_init_properties_Phalcon_Annotations_Reflection(zend_class_entry *class_type)
 {
-		zval _0, _1$$3;
+		zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_1$$3);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_5$$5);
+	ZVAL_UNDEF(&_7$$6);
 	
 
 		ZEPHIR_MM_GROW();
@@ -457,6 +425,24 @@ zend_object *zephir_init_properties_Phalcon_Annotations_Reflection(zend_class_en
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("reflectionData"), &_1$$3);
 		}
+		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("methodAnnotations"), 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("methodAnnotations"), &_3$$4);
+		}
+		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("propertyAnnotations"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_4) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_5$$5);
+			array_init(&_5$$5);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("propertyAnnotations"), &_5$$5);
+		}
+		zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("constantAnnotations"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_6) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_7$$6);
+			array_init(&_7$$6);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("constantAnnotations"), &_7$$6);
+		}
 		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
diff --git a/ext/phalcon/annotations/reflection.zep.h b/ext/phalcon/annotations/reflection.zep.h
index 15d98e73d5e..3ec463348fe 100644
--- a/ext/phalcon/annotations/reflection.zep.h
+++ b/ext/phalcon/annotations/reflection.zep.h
@@ -19,16 +19,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection___construct, 0, 0,
 #endif
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getclassannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_annotations_reflection_getclassannotations, 0, 0, Phalcon\\Annotations\\Collection, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getconstantsannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getconstantsannotations, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getpropertiesannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getpropertiesannotations, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_reflection_getmethodsannotations, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getmethodsannotations, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_reflection_getreflectiondata, 0, 0, IS_ARRAY, 0)
@@ -39,26 +39,10 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_annotations_reflection_method_entry) {
 	PHP_ME(Phalcon_Annotations_Reflection, __construct, arginfo_phalcon_annotations_reflection___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getClassAnnotations, arginfo_phalcon_annotations_reflection_getclassannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getClassAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getConstantsAnnotations, arginfo_phalcon_annotations_reflection_getconstantsannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getConstantsAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getPropertiesAnnotations, arginfo_phalcon_annotations_reflection_getpropertiesannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getPropertiesAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Annotations_Reflection, getMethodsAnnotations, arginfo_phalcon_annotations_reflection_getmethodsannotations, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Annotations_Reflection, getMethodsAnnotations, NULL, ZEND_ACC_PUBLIC)
-#endif
 	PHP_ME(Phalcon_Annotations_Reflection, getReflectionData, arginfo_phalcon_annotations_reflection_getreflectiondata, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/application/abstractapplication.zep.c b/ext/phalcon/application/abstractapplication.zep.c
index 081b454d8c5..19e65360f4b 100644
--- a/ext/phalcon/application/abstractapplication.zep.c
+++ b/ext/phalcon/application/abstractapplication.zep.c
@@ -12,6 +12,7 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
+#include "kernel/operators.h"
 #include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/array.h"
@@ -19,7 +20,6 @@
 #include "kernel/fcall.h"
 #include "kernel/concat.h"
 #include "ext/spl/spl_exceptions.h"
-#include "kernel/operators.h"
 
 
 /**
@@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Application_AbstractApplication, __construct)
 	}
 
 
-	if (Z_TYPE_P(container) == IS_OBJECT) {
+	if (Z_TYPE_P(container) != IS_NULL) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), container);
 	}
 }
diff --git a/ext/phalcon/assets/asset.zep.c b/ext/phalcon/assets/asset.zep.c
index b8940158018..f6117b3e47d 100644
--- a/ext/phalcon/assets/asset.zep.c
+++ b/ext/phalcon/assets/asset.zep.c
@@ -98,84 +98,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Asset)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Assets_Asset, getFilter)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "filter");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Asset, getPath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "path");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Asset, getSourcePath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sourcePath");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Asset, getTargetPath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetPath");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Asset, getTargetUri)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetUri");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Asset, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
-/**
- * Version of resource
- */
-PHP_METHOD(Phalcon_Assets_Asset, getVersion)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "version");
-}
-
 /**
  * Asset constructor.
  *
@@ -385,6 +307,24 @@ PHP_METHOD(Phalcon_Assets_Asset, getContent)
 	RETURN_CCTOR(&content);
 }
 
+PHP_METHOD(Phalcon_Assets_Asset, getFilter)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "filter");
+}
+
+PHP_METHOD(Phalcon_Assets_Asset, getPath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "path");
+}
+
 /**
  * Returns the complete location where the asset is located
  *
@@ -565,6 +505,59 @@ PHP_METHOD(Phalcon_Assets_Asset, getRealTargetUri)
 	RETURN_CCTOR(&target);
 }
 
+PHP_METHOD(Phalcon_Assets_Asset, getSourcePath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sourcePath");
+}
+
+PHP_METHOD(Phalcon_Assets_Asset, getTargetPath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetPath");
+}
+
+PHP_METHOD(Phalcon_Assets_Asset, getTargetUri)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetUri");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Asset, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
+/**
+ * Version of resource
+ *
+ * @return string|null
+ */
+PHP_METHOD(Phalcon_Assets_Asset, getVersion)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "version");
+}
+
 /**
  * Checks if the asset is using auto version
  *
@@ -993,7 +986,7 @@ PHP_METHOD(Phalcon_Assets_Asset, throwException)
 	ZEPHIR_CONCAT_SVS(&_1, "Asset's content for '", &completePath, "' cannot be read");
 	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &_1);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_0, "phalcon/Assets/Asset.zep", 441);
+	zephir_throw_exception_debug(&_0, "phalcon/Assets/Asset.zep", 484);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
diff --git a/ext/phalcon/assets/asset.zep.h b/ext/phalcon/assets/asset.zep.h
index 3f34f73bd62..816c32d3f6f 100644
--- a/ext/phalcon/assets/asset.zep.h
+++ b/ext/phalcon/assets/asset.zep.h
@@ -3,20 +3,20 @@ extern zend_class_entry *phalcon_assets_asset_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Assets_Asset);
 
-PHP_METHOD(Phalcon_Assets_Asset, getFilter);
-PHP_METHOD(Phalcon_Assets_Asset, getPath);
-PHP_METHOD(Phalcon_Assets_Asset, getSourcePath);
-PHP_METHOD(Phalcon_Assets_Asset, getTargetPath);
-PHP_METHOD(Phalcon_Assets_Asset, getTargetUri);
-PHP_METHOD(Phalcon_Assets_Asset, getType);
-PHP_METHOD(Phalcon_Assets_Asset, getVersion);
 PHP_METHOD(Phalcon_Assets_Asset, __construct);
 PHP_METHOD(Phalcon_Assets_Asset, getAssetKey);
 PHP_METHOD(Phalcon_Assets_Asset, getAttributes);
 PHP_METHOD(Phalcon_Assets_Asset, getContent);
+PHP_METHOD(Phalcon_Assets_Asset, getFilter);
+PHP_METHOD(Phalcon_Assets_Asset, getPath);
 PHP_METHOD(Phalcon_Assets_Asset, getRealSourcePath);
 PHP_METHOD(Phalcon_Assets_Asset, getRealTargetPath);
 PHP_METHOD(Phalcon_Assets_Asset, getRealTargetUri);
+PHP_METHOD(Phalcon_Assets_Asset, getSourcePath);
+PHP_METHOD(Phalcon_Assets_Asset, getTargetPath);
+PHP_METHOD(Phalcon_Assets_Asset, getTargetUri);
+PHP_METHOD(Phalcon_Assets_Asset, getType);
+PHP_METHOD(Phalcon_Assets_Asset, getVersion);
 PHP_METHOD(Phalcon_Assets_Asset, isAutoVersion);
 PHP_METHOD(Phalcon_Assets_Asset, isLocal);
 PHP_METHOD(Phalcon_Assets_Asset, setAttributes);
@@ -34,27 +34,6 @@ PHP_METHOD(Phalcon_Assets_Asset, throwException);
 PHP_METHOD(Phalcon_Assets_Asset, phpFileExists);
 PHP_METHOD(Phalcon_Assets_Asset, phpFileGetContents);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getfilter, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getpath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getsourcepath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargetpath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargeturi, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getversion, 0, 0, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_asset___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
@@ -79,6 +58,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getcontent,
 	ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getfilter, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getpath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getrealsourcepath, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 1)
 ZEND_END_ARG_INFO()
@@ -90,6 +75,21 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getrealtargeturi, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getsourcepath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargetpath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettargeturi, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_getversion, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_asset_isautoversion, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
@@ -154,20 +154,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_asset_phpfilegetcontents, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_assets_asset_method_entry) {
-	PHP_ME(Phalcon_Assets_Asset, getFilter, arginfo_phalcon_assets_asset_getfilter, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getPath, arginfo_phalcon_assets_asset_getpath, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getSourcePath, arginfo_phalcon_assets_asset_getsourcepath, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getTargetPath, arginfo_phalcon_assets_asset_gettargetpath, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getTargetUri, arginfo_phalcon_assets_asset_gettargeturi, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getType, arginfo_phalcon_assets_asset_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Asset, getVersion, arginfo_phalcon_assets_asset_getversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, __construct, arginfo_phalcon_assets_asset___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Assets_Asset, getAssetKey, arginfo_phalcon_assets_asset_getassetkey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getAttributes, arginfo_phalcon_assets_asset_getattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getContent, arginfo_phalcon_assets_asset_getcontent, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getFilter, arginfo_phalcon_assets_asset_getfilter, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getPath, arginfo_phalcon_assets_asset_getpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getRealSourcePath, arginfo_phalcon_assets_asset_getrealsourcepath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getRealTargetPath, arginfo_phalcon_assets_asset_getrealtargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, getRealTargetUri, arginfo_phalcon_assets_asset_getrealtargeturi, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getSourcePath, arginfo_phalcon_assets_asset_getsourcepath, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getTargetPath, arginfo_phalcon_assets_asset_gettargetpath, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getTargetUri, arginfo_phalcon_assets_asset_gettargeturi, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getType, arginfo_phalcon_assets_asset_gettype, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Asset, getVersion, arginfo_phalcon_assets_asset_getversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, isAutoVersion, arginfo_phalcon_assets_asset_isautoversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, isLocal, arginfo_phalcon_assets_asset_islocal, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Asset, setAttributes, arginfo_phalcon_assets_asset_setattributes, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c
index 77136c174c7..86db8d40132 100644
--- a/ext/phalcon/assets/collection.zep.c
+++ b/ext/phalcon/assets/collection.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/fcall.h"
 #include "kernel/memory.h"
+#include "kernel/object.h"
 #include "kernel/operators.h"
 #include "ext/spl/spl_array.h"
 #include "kernel/concat.h"
@@ -77,11 +77,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Collection)
 	/**
 	 * @var bool
 	 */
-	zend_declare_property_bool(phalcon_assets_collection_ce, SL("join"), 1, ZEND_ACC_PROTECTED);
+	zend_declare_property_bool(phalcon_assets_collection_ce, SL("isLocal"), 1, ZEND_ACC_PROTECTED);
 	/**
 	 * @var bool
 	 */
-	zend_declare_property_bool(phalcon_assets_collection_ce, SL("isLocal"), 1, ZEND_ACC_PROTECTED);
+	zend_declare_property_bool(phalcon_assets_collection_ce, SL("join"), 1, ZEND_ACC_PROTECTED);
 	/**
 	 * @var string
 	 */
@@ -113,127 +113,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Collection)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getAssets)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "assets");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getAttributes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "attributes");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getCodes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "codes");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getFilters)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "filters");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getJoin)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "join");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getPrefix)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "prefix");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getSourcePath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sourcePath");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getTargetIsLocal)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetIsLocal");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getTargetPath)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetPath");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getTargetUri)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "targetUri");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Collection, getVersion)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "version");
-}
-
 /**
  * Adds an asset to the collection
  *
@@ -638,6 +517,54 @@ PHP_METHOD(Phalcon_Assets_Collection, count)
 	RETURN_LONG(zephir_fast_count_int(&_0));
 }
 
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getAssets)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "assets");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getAttributes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "attributes");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getCodes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "codes");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getFilters)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "filters");
+}
+
 /**
  * Returns the generator of the class
  *
@@ -662,6 +589,30 @@ PHP_METHOD(Phalcon_Assets_Collection, getIterator)
 	RETURN_MM();
 }
 
+/**
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getJoin)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "join");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getPrefix)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "prefix");
+}
+
 /**
  * Returns the complete location where the joined/filtered collection must
  * be written
@@ -713,6 +664,66 @@ PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath)
 	RETURN_CCTOR(&completePath);
 }
 
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getSourcePath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sourcePath");
+}
+
+/**
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getTargetIsLocal)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetIsLocal");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getTargetPath)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetPath");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getTargetUri)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "targetUri");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Collection, getVersion)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "version");
+}
+
 /**
  * Checks this the asset is added to the collection.
  *
@@ -761,7 +772,7 @@ PHP_METHOD(Phalcon_Assets_Collection, has)
 	ZEPHIR_CALL_METHOD(&key, asset, "getassetkey", NULL, 0);
 	zephir_check_call_status();
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("assets"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_0, 0, "phalcon/Assets/Collection.zep", 307);
+	zephir_is_iterable(&_0, 0, "phalcon/Assets/Collection.zep", 395);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
diff --git a/ext/phalcon/assets/collection.zep.h b/ext/phalcon/assets/collection.zep.h
index 80b15faaaf2..83c606ad68c 100644
--- a/ext/phalcon/assets/collection.zep.h
+++ b/ext/phalcon/assets/collection.zep.h
@@ -3,27 +3,27 @@ extern zend_class_entry *phalcon_assets_collection_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Assets_Collection);
 
+PHP_METHOD(Phalcon_Assets_Collection, add);
+PHP_METHOD(Phalcon_Assets_Collection, addCss);
+PHP_METHOD(Phalcon_Assets_Collection, addFilter);
+PHP_METHOD(Phalcon_Assets_Collection, addInline);
+PHP_METHOD(Phalcon_Assets_Collection, addInlineCss);
+PHP_METHOD(Phalcon_Assets_Collection, addInlineJs);
+PHP_METHOD(Phalcon_Assets_Collection, addJs);
+PHP_METHOD(Phalcon_Assets_Collection, count);
 PHP_METHOD(Phalcon_Assets_Collection, getAssets);
 PHP_METHOD(Phalcon_Assets_Collection, getAttributes);
 PHP_METHOD(Phalcon_Assets_Collection, getCodes);
 PHP_METHOD(Phalcon_Assets_Collection, getFilters);
+PHP_METHOD(Phalcon_Assets_Collection, getIterator);
 PHP_METHOD(Phalcon_Assets_Collection, getJoin);
 PHP_METHOD(Phalcon_Assets_Collection, getPrefix);
+PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath);
 PHP_METHOD(Phalcon_Assets_Collection, getSourcePath);
 PHP_METHOD(Phalcon_Assets_Collection, getTargetIsLocal);
 PHP_METHOD(Phalcon_Assets_Collection, getTargetPath);
 PHP_METHOD(Phalcon_Assets_Collection, getTargetUri);
 PHP_METHOD(Phalcon_Assets_Collection, getVersion);
-PHP_METHOD(Phalcon_Assets_Collection, add);
-PHP_METHOD(Phalcon_Assets_Collection, addCss);
-PHP_METHOD(Phalcon_Assets_Collection, addFilter);
-PHP_METHOD(Phalcon_Assets_Collection, addInline);
-PHP_METHOD(Phalcon_Assets_Collection, addInlineCss);
-PHP_METHOD(Phalcon_Assets_Collection, addInlineJs);
-PHP_METHOD(Phalcon_Assets_Collection, addJs);
-PHP_METHOD(Phalcon_Assets_Collection, count);
-PHP_METHOD(Phalcon_Assets_Collection, getIterator);
-PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath);
 PHP_METHOD(Phalcon_Assets_Collection, has);
 PHP_METHOD(Phalcon_Assets_Collection, isAutoVersion);
 PHP_METHOD(Phalcon_Assets_Collection, isLocal);
@@ -44,39 +44,6 @@ PHP_METHOD(Phalcon_Assets_Collection, processAddInline);
 PHP_METHOD(Phalcon_Assets_Collection, processAttributes);
 zend_object *zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getassets, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getattributes, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getcodes, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getfilters, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getjoin, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getprefix, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getsourcepath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetislocal, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetpath, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargeturi, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getversion, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_collection_add, 0, 1, Phalcon\\Assets\\Collection, 0)
 	ZEND_ARG_OBJ_INFO(0, asset, Phalcon\\Assets\\AssetInterface, 0)
 ZEND_END_ARG_INFO()
@@ -138,13 +105,46 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getassets, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getattributes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getcodes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getfilters, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_collection_getiterator, 0, 0, Traversable, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getjoin, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getprefix, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getrealtargetpath, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getsourcepath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetislocal, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargetpath, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_gettargeturi, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_getversion, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_collection_has, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, asset, Phalcon\\Assets\\AssetInterface, 0)
 ZEND_END_ARG_INFO()
@@ -236,27 +236,27 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_zephir_init_properties_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_assets_collection_method_entry) {
+	PHP_ME(Phalcon_Assets_Collection, add, arginfo_phalcon_assets_collection_add, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addCss, arginfo_phalcon_assets_collection_addcss, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addFilter, arginfo_phalcon_assets_collection_addfilter, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addInline, arginfo_phalcon_assets_collection_addinline, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addInlineCss, arginfo_phalcon_assets_collection_addinlinecss, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addInlineJs, arginfo_phalcon_assets_collection_addinlinejs, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, addJs, arginfo_phalcon_assets_collection_addjs, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, count, arginfo_phalcon_assets_collection_count, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getAssets, arginfo_phalcon_assets_collection_getassets, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getAttributes, arginfo_phalcon_assets_collection_getattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getCodes, arginfo_phalcon_assets_collection_getcodes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getFilters, arginfo_phalcon_assets_collection_getfilters, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, getIterator, arginfo_phalcon_assets_collection_getiterator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getJoin, arginfo_phalcon_assets_collection_getjoin, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getPrefix, arginfo_phalcon_assets_collection_getprefix, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Assets_Collection, getRealTargetPath, arginfo_phalcon_assets_collection_getrealtargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getSourcePath, arginfo_phalcon_assets_collection_getsourcepath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getTargetIsLocal, arginfo_phalcon_assets_collection_gettargetislocal, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getTargetPath, arginfo_phalcon_assets_collection_gettargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getTargetUri, arginfo_phalcon_assets_collection_gettargeturi, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, getVersion, arginfo_phalcon_assets_collection_getversion, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, add, arginfo_phalcon_assets_collection_add, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addCss, arginfo_phalcon_assets_collection_addcss, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addFilter, arginfo_phalcon_assets_collection_addfilter, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addInline, arginfo_phalcon_assets_collection_addinline, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addInlineCss, arginfo_phalcon_assets_collection_addinlinecss, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addInlineJs, arginfo_phalcon_assets_collection_addinlinejs, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, addJs, arginfo_phalcon_assets_collection_addjs, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, count, arginfo_phalcon_assets_collection_count, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, getIterator, arginfo_phalcon_assets_collection_getiterator, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Collection, getRealTargetPath, arginfo_phalcon_assets_collection_getrealtargetpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, has, arginfo_phalcon_assets_collection_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, isAutoVersion, arginfo_phalcon_assets_collection_isautoversion, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Collection, isLocal, arginfo_phalcon_assets_collection_islocal, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/assets/inline.zep.c b/ext/phalcon/assets/inline.zep.c
index aec3be5b521..eb9cfe16a20 100644
--- a/ext/phalcon/assets/inline.zep.c
+++ b/ext/phalcon/assets/inline.zep.c
@@ -39,7 +39,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Inline)
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Assets, Inline, phalcon, assets_inline, phalcon_assets_inline_method_entry, 0);
 
 	/**
-	 * @var array | null
+	 * @var array
 	 */
 	zend_declare_property_null(phalcon_assets_inline_ce, SL("attributes"), ZEND_ACC_PROTECTED);
 	/**
@@ -58,50 +58,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Assets_Inline)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Assets_Inline, getAttributes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "attributes");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Inline, getContent)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "content");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Inline, getFilter)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "filter");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Assets_Inline, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 /**
  * Phalcon\Assets\Inline constructor
  */
@@ -190,6 +146,54 @@ PHP_METHOD(Phalcon_Assets_Inline, getAssetKey)
 	RETURN_MM();
 }
 
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Assets_Inline, getAttributes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "attributes");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Inline, getContent)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "content");
+}
+
+/**
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Assets_Inline, getFilter)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "filter");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Assets_Inline, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
 /**
  * Sets extra HTML attributes
  */
diff --git a/ext/phalcon/assets/inline.zep.h b/ext/phalcon/assets/inline.zep.h
index 11a0aa49354..8151a1cfd6f 100644
--- a/ext/phalcon/assets/inline.zep.h
+++ b/ext/phalcon/assets/inline.zep.h
@@ -3,28 +3,16 @@ extern zend_class_entry *phalcon_assets_inline_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Assets_Inline);
 
+PHP_METHOD(Phalcon_Assets_Inline, __construct);
+PHP_METHOD(Phalcon_Assets_Inline, getAssetKey);
 PHP_METHOD(Phalcon_Assets_Inline, getAttributes);
 PHP_METHOD(Phalcon_Assets_Inline, getContent);
 PHP_METHOD(Phalcon_Assets_Inline, getFilter);
 PHP_METHOD(Phalcon_Assets_Inline, getType);
-PHP_METHOD(Phalcon_Assets_Inline, __construct);
-PHP_METHOD(Phalcon_Assets_Inline, getAssetKey);
 PHP_METHOD(Phalcon_Assets_Inline, setAttributes);
 PHP_METHOD(Phalcon_Assets_Inline, setFilter);
 PHP_METHOD(Phalcon_Assets_Inline, setType);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getattributes, 0, 0, IS_ARRAY, 1)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getcontent, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getfilter, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_inline___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
@@ -39,6 +27,18 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getassetkey, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getattributes, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getcontent, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_getfilter, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_assets_inline_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_inline_setattributes, 0, 1, Phalcon\\Assets\\AssetInterface, 0)
 	ZEND_ARG_ARRAY_INFO(0, attributes, 0)
 ZEND_END_ARG_INFO()
@@ -52,12 +52,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_assets_inline_settype, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_assets_inline_method_entry) {
+	PHP_ME(Phalcon_Assets_Inline, __construct, arginfo_phalcon_assets_inline___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Assets_Inline, getAssetKey, arginfo_phalcon_assets_inline_getassetkey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getAttributes, arginfo_phalcon_assets_inline_getattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getContent, arginfo_phalcon_assets_inline_getcontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getFilter, arginfo_phalcon_assets_inline_getfilter, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, getType, arginfo_phalcon_assets_inline_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Assets_Inline, __construct, arginfo_phalcon_assets_inline___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Assets_Inline, getAssetKey, arginfo_phalcon_assets_inline_getassetkey, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, setAttributes, arginfo_phalcon_assets_inline_setattributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, setFilter, arginfo_phalcon_assets_inline_setfilter, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Assets_Inline, setType, arginfo_phalcon_assets_inline_settype, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c
index 96ad07c66da..4e40ecef1f6 100644
--- a/ext/phalcon/cli/console.zep.c
+++ b/ext/phalcon/cli/console.zep.c
@@ -13,10 +13,10 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
+#include "kernel/operators.h"
 #include "kernel/exception.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
-#include "kernel/operators.h"
 #include "kernel/array.h"
 #include "kernel/concat.h"
 #include "kernel/file.h"
@@ -58,19 +58,17 @@ ZEPHIR_INIT_CLASS(Phalcon_Cli_Console)
  */
 PHP_METHOD(Phalcon_Cli_Console, handle)
 {
-	zend_bool _5;
+	zend_bool _8;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *arguments_param = NULL, __$false, className, container, dispatcher, eventsManager, module, moduleName, moduleObject, modules, path, router, task, _0, _3, _4, _16, _17, _18, _19, _1$$4, _2$$4, _6$$6, _7$$10, _8$$10, _9$$9, _10$$12, _11$$12, _12$$16, _13$$16, _14$$18, _15$$18, _20$$20, _21$$20, _22$$22;
+	zval *arguments_param = NULL, __$false, className, dispatcher, module, moduleName, moduleObject, modules, path, router, task, _0, _1, _5, _6, _7, _9, _26, _27, _28, _29, _30, _31, _35, _2$$4, _3$$4, _4$$4, _10$$6, _11$$9, _15$$9, _20$$9, _21$$9, _22$$9, _12$$10, _13$$10, _14$$10, _16$$12, _17$$12, _18$$16, _19$$16, _23$$18, _24$$18, _25$$18, _32$$20, _33$$20, _34$$20, _36$$22, _37$$22;
 	zval arguments;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arguments);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&className);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&dispatcher);
-	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&module);
 	ZVAL_UNDEF(&moduleName);
 	ZVAL_UNDEF(&moduleObject);
@@ -79,27 +77,42 @@ PHP_METHOD(Phalcon_Cli_Console, handle)
 	ZVAL_UNDEF(&router);
 	ZVAL_UNDEF(&task);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_3);
-	ZVAL_UNDEF(&_4);
-	ZVAL_UNDEF(&_16);
-	ZVAL_UNDEF(&_17);
-	ZVAL_UNDEF(&_18);
-	ZVAL_UNDEF(&_19);
-	ZVAL_UNDEF(&_1$$4);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_26);
+	ZVAL_UNDEF(&_27);
+	ZVAL_UNDEF(&_28);
+	ZVAL_UNDEF(&_29);
+	ZVAL_UNDEF(&_30);
+	ZVAL_UNDEF(&_31);
+	ZVAL_UNDEF(&_35);
 	ZVAL_UNDEF(&_2$$4);
-	ZVAL_UNDEF(&_6$$6);
-	ZVAL_UNDEF(&_7$$10);
-	ZVAL_UNDEF(&_8$$10);
-	ZVAL_UNDEF(&_9$$9);
-	ZVAL_UNDEF(&_10$$12);
-	ZVAL_UNDEF(&_11$$12);
-	ZVAL_UNDEF(&_12$$16);
-	ZVAL_UNDEF(&_13$$16);
-	ZVAL_UNDEF(&_14$$18);
-	ZVAL_UNDEF(&_15$$18);
-	ZVAL_UNDEF(&_20$$20);
-	ZVAL_UNDEF(&_21$$20);
-	ZVAL_UNDEF(&_22$$22);
+	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_4$$4);
+	ZVAL_UNDEF(&_10$$6);
+	ZVAL_UNDEF(&_11$$9);
+	ZVAL_UNDEF(&_15$$9);
+	ZVAL_UNDEF(&_20$$9);
+	ZVAL_UNDEF(&_21$$9);
+	ZVAL_UNDEF(&_22$$9);
+	ZVAL_UNDEF(&_12$$10);
+	ZVAL_UNDEF(&_13$$10);
+	ZVAL_UNDEF(&_14$$10);
+	ZVAL_UNDEF(&_16$$12);
+	ZVAL_UNDEF(&_17$$12);
+	ZVAL_UNDEF(&_18$$16);
+	ZVAL_UNDEF(&_19$$16);
+	ZVAL_UNDEF(&_23$$18);
+	ZVAL_UNDEF(&_24$$18);
+	ZVAL_UNDEF(&_25$$18);
+	ZVAL_UNDEF(&_32$$20);
+	ZVAL_UNDEF(&_33$$20);
+	ZVAL_UNDEF(&_34$$20);
+	ZVAL_UNDEF(&_36$$22);
+	ZVAL_UNDEF(&_37$$22);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -119,35 +132,35 @@ PHP_METHOD(Phalcon_Cli_Console, handle)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Cli/Console.zep", 47);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Cli/Console.zep", 45);
 		return;
 	}
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_0);
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_2$$4);
-		ZVAL_STRING(&_2$$4, "console:boot");
-		ZEPHIR_CALL_METHOD(&_1$$4, &eventsManager, "fire", NULL, 0, &_2$$4, this_ptr);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_1) != IS_NULL) {
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_4$$4);
+		ZVAL_STRING(&_4$$4, "console:boot");
+		ZEPHIR_CALL_METHOD(&_3$$4, &_2$$4, "fire", NULL, 0, &_4$$4, this_ptr);
 		zephir_check_call_status();
-		if (ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)) {
+		if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$4)) {
 			RETURN_MM_BOOL(0);
 		}
 	}
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "router");
-	ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4);
+	zephir_read_property(&_5, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_INIT_VAR(&_7);
+	ZVAL_STRING(&_7, "router");
+	ZEPHIR_CALL_METHOD(&_6, &_5, "getshared", NULL, 0, &_7);
 	zephir_check_call_status();
-	ZEPHIR_CPY_WRT(&router, &_3);
-	_5 = !(zephir_fast_count_int(&arguments));
-	if (_5) {
-		zephir_read_property(&_0, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
-		_5 = zephir_is_true(&_0);
+	ZEPHIR_CPY_WRT(&router, &_6);
+	_8 = !(zephir_fast_count_int(&arguments));
+	if (_8) {
+		zephir_read_property(&_9, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
+		_8 = zephir_is_true(&_9);
 	}
-	if (_5) {
-		zephir_read_property(&_6$$6, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &_6$$6);
+	if (_8) {
+		zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("arguments"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &_10$$6);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &arguments);
@@ -160,32 +173,34 @@ PHP_METHOD(Phalcon_Cli_Console, handle)
 		zephir_read_property(&moduleName, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC);
 	}
 	if (zephir_is_true(&moduleName)) {
-		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_8$$10);
-			ZVAL_STRING(&_8$$10, "console:beforeStartModule");
-			ZEPHIR_CALL_METHOD(&_7$$10, &eventsManager, "fire", NULL, 0, &_8$$10, this_ptr, &moduleName);
+		zephir_read_property(&_11$$9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_11$$9) != IS_NULL) {
+			zephir_read_property(&_12$$10, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+			ZEPHIR_INIT_VAR(&_14$$10);
+			ZVAL_STRING(&_14$$10, "console:beforeStartModule");
+			ZEPHIR_CALL_METHOD(&_13$$10, &_12$$10, "fire", NULL, 0, &_14$$10, this_ptr, &moduleName);
 			zephir_check_call_status();
-			if (ZEPHIR_IS_FALSE_IDENTICAL(&_7$$10)) {
+			if (ZEPHIR_IS_FALSE_IDENTICAL(&_13$$10)) {
 				RETURN_MM_BOOL(0);
 			}
 		}
-		zephir_read_property(&_9$$9, this_ptr, ZEND_STRL("modules"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CPY_WRT(&modules, &_9$$9);
+		zephir_read_property(&_15$$9, this_ptr, ZEND_STRL("modules"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CPY_WRT(&modules, &_15$$9);
 		if (UNEXPECTED(!(zephir_array_isset(&modules, &moduleName)))) {
-			ZEPHIR_INIT_VAR(&_10$$12);
-			object_init_ex(&_10$$12, phalcon_cli_console_exception_ce);
-			ZEPHIR_INIT_VAR(&_11$$12);
-			ZEPHIR_CONCAT_SVS(&_11$$12, "Module '", &moduleName, "' isn't registered in the console container");
-			ZEPHIR_CALL_METHOD(NULL, &_10$$12, "__construct", NULL, 29, &_11$$12);
+			ZEPHIR_INIT_VAR(&_16$$12);
+			object_init_ex(&_16$$12, phalcon_cli_console_exception_ce);
+			ZEPHIR_INIT_VAR(&_17$$12);
+			ZEPHIR_CONCAT_SVS(&_17$$12, "Module '", &moduleName, "' isn't registered in the console container");
+			ZEPHIR_CALL_METHOD(NULL, &_16$$12, "__construct", NULL, 29, &_17$$12);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_10$$12, "phalcon/Cli/Console.zep", 91);
+			zephir_throw_exception_debug(&_16$$12, "phalcon/Cli/Console.zep", 87);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZEPHIR_OBS_VAR(&module);
-		zephir_array_fetch(&module, &modules, &moduleName, PH_NOISY, "phalcon/Cli/Console.zep", 94);
+		zephir_array_fetch(&module, &modules, &moduleName, PH_NOISY, "phalcon/Cli/Console.zep", 90);
 		if (UNEXPECTED(Z_TYPE_P(&module) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "Invalid module definition path", "phalcon/Cli/Console.zep", 97);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cli_console_exception_ce, "Invalid module definition path", "phalcon/Cli/Console.zep", 93);
 			return;
 		}
 		ZEPHIR_OBS_VAR(&className);
@@ -196,13 +211,13 @@ PHP_METHOD(Phalcon_Cli_Console, handle)
 		ZEPHIR_OBS_VAR(&path);
 		if (zephir_array_isset_string_fetch(&path, &module, SL("path"), 0)) {
 			if (UNEXPECTED(!((zephir_file_exists(&path) == SUCCESS)))) {
-				ZEPHIR_INIT_VAR(&_12$$16);
-				object_init_ex(&_12$$16, phalcon_cli_console_exception_ce);
-				ZEPHIR_INIT_VAR(&_13$$16);
-				ZEPHIR_CONCAT_SVS(&_13$$16, "Module definition path '", &path, "' doesn't exist");
-				ZEPHIR_CALL_METHOD(NULL, &_12$$16, "__construct", NULL, 29, &_13$$16);
+				ZEPHIR_INIT_VAR(&_18$$16);
+				object_init_ex(&_18$$16, phalcon_cli_console_exception_ce);
+				ZEPHIR_INIT_VAR(&_19$$16);
+				ZEPHIR_CONCAT_SVS(&_19$$16, "Module definition path '", &path, "' doesn't exist");
+				ZEPHIR_CALL_METHOD(NULL, &_18$$16, "__construct", NULL, 29, &_19$$16);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_12$$16, "phalcon/Cli/Console.zep", 108);
+				zephir_throw_exception_debug(&_18$$16, "phalcon/Cli/Console.zep", 104);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -212,61 +227,71 @@ PHP_METHOD(Phalcon_Cli_Console, handle)
 				}
 			}
 		}
-		ZEPHIR_CALL_METHOD(&moduleObject, &container, "get", NULL, 0, &className);
+		zephir_read_property(&_15$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(&moduleObject, &_15$$9, "get", NULL, 0, &className);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &container);
+		zephir_read_property(&_20$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &_20$$9);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &container);
+		zephir_read_property(&_21$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &_21$$9);
 		zephir_check_call_status();
-		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_15$$18);
-			ZVAL_STRING(&_15$$18, "console:afterStartModule");
-			ZEPHIR_CALL_METHOD(&_14$$18, &eventsManager, "fire", NULL, 0, &_15$$18, this_ptr, &moduleObject);
+		zephir_read_property(&_22$$9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_22$$9) != IS_NULL) {
+			zephir_read_property(&_23$$18, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+			ZEPHIR_INIT_VAR(&_25$$18);
+			ZVAL_STRING(&_25$$18, "console:afterStartModule");
+			ZEPHIR_CALL_METHOD(&_24$$18, &_23$$18, "fire", NULL, 0, &_25$$18, this_ptr, &moduleObject);
 			zephir_check_call_status();
-			if (ZEPHIR_IS_FALSE_IDENTICAL(&_14$$18)) {
+			if (ZEPHIR_IS_FALSE_IDENTICAL(&_24$$18)) {
 				RETURN_MM_BOOL(0);
 			}
 		}
 	}
-	ZEPHIR_INIT_NVAR(&_4);
-	ZVAL_STRING(&_4, "dispatcher");
-	ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4);
+	zephir_read_property(&_26, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_INIT_NVAR(&_7);
+	ZVAL_STRING(&_7, "dispatcher");
+	ZEPHIR_CALL_METHOD(&_6, &_26, "getshared", NULL, 0, &_7);
 	zephir_check_call_status();
-	ZEPHIR_CPY_WRT(&dispatcher, &_3);
-	ZEPHIR_CALL_METHOD(&_3, &router, "getmodulename", NULL, 0);
+	ZEPHIR_CPY_WRT(&dispatcher, &_6);
+	ZEPHIR_CALL_METHOD(&_6, &router, "getmodulename", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_3);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_6);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&_16, &router, "gettaskname", NULL, 0);
+	ZEPHIR_CALL_METHOD(&_27, &router, "gettaskname", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "settaskname", NULL, 0, &_16);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "settaskname", NULL, 0, &_27);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&_17, &router, "getactionname", NULL, 0);
+	ZEPHIR_CALL_METHOD(&_28, &router, "getactionname", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setactionname", NULL, 0, &_17);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setactionname", NULL, 0, &_28);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&_18, &router, "getparams", NULL, 0);
+	ZEPHIR_CALL_METHOD(&_29, &router, "getparams", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setparams", NULL, 0, &_18);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setparams", NULL, 0, &_29);
 	zephir_check_call_status();
-	zephir_read_property(&_19, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setoptions", NULL, 0, &_19);
+	zephir_read_property(&_30, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setoptions", NULL, 0, &_30);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_21$$20);
-		ZVAL_STRING(&_21$$20, "console:beforeHandleTask");
-		ZEPHIR_CALL_METHOD(&_20$$20, &eventsManager, "fire", NULL, 0, &_21$$20, this_ptr, &dispatcher);
+	zephir_read_property(&_31, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_31) != IS_NULL) {
+		zephir_read_property(&_32$$20, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_34$$20);
+		ZVAL_STRING(&_34$$20, "console:beforeHandleTask");
+		ZEPHIR_CALL_METHOD(&_33$$20, &_32$$20, "fire", NULL, 0, &_34$$20, this_ptr, &dispatcher);
 		zephir_check_call_status();
-		if (ZEPHIR_IS_FALSE_IDENTICAL(&_20$$20)) {
+		if (ZEPHIR_IS_FALSE_IDENTICAL(&_33$$20)) {
 			RETURN_MM_BOOL(0);
 		}
 	}
 	ZEPHIR_CALL_METHOD(&task, &dispatcher, "dispatch", NULL, 0);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_22$$22);
-		ZVAL_STRING(&_22$$22, "console:afterHandleTask");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_22$$22, this_ptr, &task);
+	zephir_read_property(&_35, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	if (Z_TYPE_P(&_35) != IS_NULL) {
+		zephir_read_property(&_36$$22, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_INIT_VAR(&_37$$22);
+		ZVAL_STRING(&_37$$22, "console:afterHandleTask");
+		ZEPHIR_CALL_METHOD(NULL, &_36$$22, "fire", NULL, 0, &_37$$22, this_ptr, &task);
 		zephir_check_call_status();
 	}
 	RETURN_CCTOR(&task);
@@ -390,7 +415,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument)
 		ZEPHIR_UNREF(&arguments);
 		zephir_check_call_status();
 	}
-	zephir_is_iterable(&arguments, 0, "phalcon/Cli/Console.zep", 189);
+	zephir_is_iterable(&arguments, 0, "phalcon/Cli/Console.zep", 185);
 	if (Z_TYPE_P(&arguments) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _1)
 		{
@@ -440,11 +465,11 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument)
 						zephir_substr(&_22$$10, &arg, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 						zephir_array_update_zval(&opts, &_22$$10, &__$true, PH_COPY | PH_SEPARATE);
 					} else {
-						zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
+						zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 177);
 					}
 				}
 			} else {
-				zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 185);
+				zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -502,11 +527,11 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument)
 							zephir_substr(&_41$$19, &arg, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 							zephir_array_update_zval(&opts, &_41$$19, &__$true, PH_COPY | PH_SEPARATE);
 						} else {
-							zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
+							zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 177);
 						}
 					}
 				} else {
-					zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 185);
+					zephir_array_append(&args, &arg, PH_SEPARATE, "phalcon/Cli/Console.zep", 181);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
 			zephir_check_call_status();
diff --git a/ext/phalcon/cli/dispatcher.zep.c b/ext/phalcon/cli/dispatcher.zep.c
index 5f0573d5aa7..7de933cda1b 100644
--- a/ext/phalcon/cli/dispatcher.zep.c
+++ b/ext/phalcon/cli/dispatcher.zep.c
@@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Cli_Dispatcher, getOption)
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$5);
 		ZVAL_STRING(&_1$$5, "A dependency injection container is required to access the 'filter' service");
 		ZVAL_LONG(&_2$$5, 0);
@@ -436,7 +436,7 @@ PHP_METHOD(Phalcon_Cli_Dispatcher, handleException)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&eventsManager, &_0);
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
+	if (Z_TYPE_P(&eventsManager) != IS_NULL) {
 		ZEPHIR_INIT_VAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "dispatch:beforeException");
 		ZEPHIR_CALL_METHOD(&_1$$3, &eventsManager, "fire", NULL, 0, &_2$$3, this_ptr, exception);
diff --git a/ext/phalcon/db/adapter/abstractadapter.zep.c b/ext/phalcon/db/adapter/abstractadapter.zep.c
index f663601a88e..929fe8dc20a 100644
--- a/ext/phalcon/db/adapter/abstractadapter.zep.c
+++ b/ext/phalcon/db/adapter/abstractadapter.zep.c
@@ -123,30 +123,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_AbstractAdapter)
 	return SUCCESS;
 }
 
-/**
- * Name of the dialect used
- */
-PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "dialectType");
-}
-
-/**
- * Type of database system the adapter is used for
- */
-PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 /**
  * Phalcon\Db\Adapter constructor
  *
@@ -2044,6 +2020,18 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialect)
 	RETURN_MEMBER(getThis(), "dialect");
 }
 
+/**
+ * Name of the dialect used
+ */
+PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "dialectType");
+}
+
 /**
  * Returns the internal event manager
  */
@@ -2121,6 +2109,18 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLVariables)
 	RETURN_MEMBER(getThis(), "sqlVariables");
 }
 
+/**
+ * Type of database system the adapter is used for
+ */
+PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
 /**
  * Inserts data into a table using custom RDBMS SQL syntax
  *
@@ -2215,7 +2215,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 		ZEPHIR_CONCAT_SVS(&_1$$3, "Unable to insert into ", &table, " without data");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Db/Adapter/AbstractAdapter.zep", 810);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Db/Adapter/AbstractAdapter.zep", 826);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -2225,7 +2225,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 	array_init(&insertValues);
 	ZEPHIR_INIT_VAR(&bindDataTypes);
 	array_init(&bindDataTypes);
-	zephir_is_iterable(&values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 848);
+	zephir_is_iterable(&values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 864);
 	if (Z_TYPE_P(&values) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2)
 		{
@@ -2243,7 +2243,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 			}
 			if (_6$$4) {
 				zephir_cast_to_string(&_7$$5, &value);
-				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 823);
+				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
 			} else {
 				if (Z_TYPE_P(&value) == IS_OBJECT) {
 					zephir_cast_to_string(&_8$$7, &value);
@@ -2252,19 +2252,19 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					ZEPHIR_INIT_NVAR(&_9$$8);
 					ZVAL_STRING(&_9$$8, "null");
-					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 830);
+					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 846);
 				} else {
 					ZEPHIR_INIT_NVAR(&_10$$9);
 					ZVAL_STRING(&_10$$9, "?");
-					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 832);
-					zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 833);
+					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 848);
+					zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 849);
 					if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&bindType);
 						if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 855);
 							return;
 						}
-						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 842);
+						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 858);
 					}
 				}
 			}
@@ -2288,7 +2288,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				}
 				if (_11$$12) {
 					zephir_cast_to_string(&_12$$13, &value);
-					zephir_array_append(&placeholders, &_12$$13, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 823);
+					zephir_array_append(&placeholders, &_12$$13, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
 				} else {
 					if (Z_TYPE_P(&value) == IS_OBJECT) {
 						zephir_cast_to_string(&_13$$15, &value);
@@ -2297,19 +2297,19 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						ZEPHIR_INIT_NVAR(&_14$$16);
 						ZVAL_STRING(&_14$$16, "null");
-						zephir_array_append(&placeholders, &_14$$16, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 830);
+						zephir_array_append(&placeholders, &_14$$16, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 846);
 					} else {
 						ZEPHIR_INIT_NVAR(&_15$$17);
 						ZVAL_STRING(&_15$$17, "?");
-						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 832);
-						zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 833);
+						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 848);
+						zephir_array_append(&insertValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 849);
 						if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 							ZEPHIR_OBS_NVAR(&bindType);
 							if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 839);
+								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 855);
 								return;
 							}
-							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 842);
+							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 858);
 						}
 					}
 				}
@@ -2337,7 +2337,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 	if (Z_TYPE_P(fields) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&escapedFields);
 		array_init(&escapedFields);
-		zephir_is_iterable(fields, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 868);
+		zephir_is_iterable(fields, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 884);
 		if (Z_TYPE_P(fields) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(fields), _18$$22)
 			{
@@ -2345,7 +2345,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				ZVAL_COPY(&field, _18$$22);
 				ZEPHIR_CALL_METHOD(&_20$$23, this_ptr, "escapeidentifier", NULL, 0, &field);
 				zephir_check_call_status();
-				zephir_array_append(&escapedFields, &_20$$23, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 865);
+				zephir_array_append(&escapedFields, &_20$$23, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 881);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, fields, "rewind", NULL, 0);
@@ -2360,7 +2360,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&_21$$24, this_ptr, "escapeidentifier", NULL, 0, &field);
 					zephir_check_call_status();
-					zephir_array_append(&escapedFields, &_21$$24, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 865);
+					zephir_array_append(&escapedFields, &_21$$24, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 881);
 				ZEPHIR_CALL_METHOD(NULL, fields, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -2450,7 +2450,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 914);
+	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 930);
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), _3, _4, _1)
 		{
@@ -2462,8 +2462,8 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict)
 			}
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
-			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 910);
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 911);
+			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 926);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 927);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, data, "rewind", NULL, 0);
@@ -2478,8 +2478,8 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&value, data, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 910);
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 911);
+				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 926);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 927);
 			ZEPHIR_CALL_METHOD(NULL, data, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -2612,14 +2612,14 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listTables)
 	ZVAL_LONG(&_2, 3);
 	ZEPHIR_CALL_METHOD(&tables, this_ptr, "fetchall", NULL, 0, &_1, &_2);
 	zephir_check_call_status();
-	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 961);
+	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 977);
 	if (Z_TYPE_P(&tables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&tables), _3)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _3);
-			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
-			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
+			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
+			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &tables, "rewind", NULL, 0);
@@ -2632,8 +2632,8 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listTables)
 			}
 			ZEPHIR_CALL_METHOD(&table, &tables, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
-				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 958);
+				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
+				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 974);
 			ZEPHIR_CALL_METHOD(NULL, &tables, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -2703,14 +2703,14 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listViews)
 	ZVAL_LONG(&_2, 3);
 	ZEPHIR_CALL_METHOD(&tables, this_ptr, "fetchall", NULL, 0, &_1, &_2);
 	zephir_check_call_status();
-	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 988);
+	zephir_is_iterable(&tables, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1004);
 	if (Z_TYPE_P(&tables) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&tables), _3)
 		{
 			ZEPHIR_INIT_NVAR(&table);
 			ZVAL_COPY(&table, _3);
-			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
-			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
+			zephir_array_fetch_long(&_5$$3, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
+			zephir_array_append(&allTables, &_5$$3, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &tables, "rewind", NULL, 0);
@@ -2723,8 +2723,8 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, listViews)
 			}
 			ZEPHIR_CALL_METHOD(&table, &tables, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
-				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 985);
+				zephir_array_fetch_long(&_6$$4, &table, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
+				zephir_array_append(&allTables, &_6$$4, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1001);
 			ZEPHIR_CALL_METHOD(NULL, &tables, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -2840,7 +2840,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, releaseSavepoint)
 	ZEPHIR_CALL_METHOD(&_1, &dialect, "supportssavepoints", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1018);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1034);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_2, &dialect, "supportsreleasesavepoints", NULL, 0);
@@ -2897,7 +2897,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, rollbackSavepoint)
 	ZEPHIR_CALL_METHOD(&_1, &dialect, "supportssavepoints", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_1))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1042);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1058);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_2, &dialect, "rollbacksavepoint", NULL, 0, &name);
@@ -2984,14 +2984,14 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, setNestedTransactionsWithSavepoin
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(ZEPHIR_GT_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Nested transaction with savepoints behavior cannot be changed while a transaction is open", "phalcon/Db/Adapter/AbstractAdapter.zep", 1074);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Nested transaction with savepoints behavior cannot be changed while a transaction is open", "phalcon/Db/Adapter/AbstractAdapter.zep", 1090);
 		return;
 	}
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CALL_METHOD(&_2, &_1, "supportssavepoints", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_2))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1080);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Savepoints are not supported by this database adapter", "phalcon/Db/Adapter/AbstractAdapter.zep", 1096);
 		return;
 	}
 	if (nestedTransactionsWithSavepoints) {
@@ -3121,7 +3121,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, tableExists)
 	ZVAL_LONG(&_3, 3);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchone", NULL, 0, &_2, &_3);
 	zephir_check_call_status();
-	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1116);
+	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1132);
 	RETURN_MM_BOOL(ZEPHIR_GT_LONG(&_4, 0));
 }
 
@@ -3187,7 +3187,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, tableOptions)
 	ZVAL_LONG(&_2, 2);
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "fetchall", NULL, 0, &sql, &_2);
 	zephir_check_call_status();
-	zephir_array_fetch_long(&_3, &_1, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1138);
+	zephir_array_fetch_long(&_3, &_1, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1154);
 	RETURN_CTOR(&_3);
 }
 
@@ -3303,7 +3303,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 	array_init(&updateValues);
 	ZEPHIR_INIT_VAR(&bindDataTypes);
 	array_init(&bindDataTypes);
-	zephir_is_iterable(values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1228);
+	zephir_is_iterable(values, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1244);
 	if (Z_TYPE_P(values) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(values), _2, _3, _0)
 		{
@@ -3317,7 +3317,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 			ZVAL_COPY(&value, _0);
 			ZEPHIR_OBS_NVAR(&field);
 			if (UNEXPECTED(!(zephir_array_isset_fetch(&field, fields, &position, 0)))) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1193);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1209);
 				return;
 			}
 			ZEPHIR_CALL_METHOD(&escapedField, this_ptr, "escapeidentifier", &_4, 0, &field);
@@ -3330,7 +3330,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 				zephir_cast_to_string(&_6$$5, &value);
 				ZEPHIR_INIT_NVAR(&_7$$5);
 				ZEPHIR_CONCAT_VSV(&_7$$5, &escapedField, " = ", &_6$$5);
-				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1199);
+				zephir_array_append(&placeholders, &_7$$5, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1215);
 			} else {
 				if (Z_TYPE_P(&value) == IS_OBJECT) {
 					zephir_cast_to_string(&_8$$7, &value);
@@ -3339,20 +3339,20 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					ZEPHIR_INIT_NVAR(&_9$$8);
 					ZEPHIR_CONCAT_VS(&_9$$8, &escapedField, " = null");
-					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1206);
+					zephir_array_append(&placeholders, &_9$$8, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1222);
 				} else {
-					zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1208);
+					zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1224);
 					if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&bindType);
 						if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1214);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1230);
 							return;
 						}
-						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1217);
+						zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1233);
 					}
 					ZEPHIR_INIT_NVAR(&_10$$9);
 					ZEPHIR_CONCAT_VS(&_10$$9, &escapedField, " = ?");
-					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1220);
+					zephir_array_append(&placeholders, &_10$$9, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1236);
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -3371,7 +3371,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&field);
 				if (UNEXPECTED(!(zephir_array_isset_fetch(&field, fields, &position, 0)))) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1193);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The number of values in the update is not the same as fields", "phalcon/Db/Adapter/AbstractAdapter.zep", 1209);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&escapedField, this_ptr, "escapeidentifier", &_4, 0, &field);
@@ -3384,7 +3384,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 					zephir_cast_to_string(&_12$$14, &value);
 					ZEPHIR_INIT_NVAR(&_13$$14);
 					ZEPHIR_CONCAT_VSV(&_13$$14, &escapedField, " = ", &_12$$14);
-					zephir_array_append(&placeholders, &_13$$14, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1199);
+					zephir_array_append(&placeholders, &_13$$14, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1215);
 				} else {
 					if (Z_TYPE_P(&value) == IS_OBJECT) {
 						zephir_cast_to_string(&_14$$16, &value);
@@ -3393,20 +3393,20 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						ZEPHIR_INIT_NVAR(&_15$$17);
 						ZEPHIR_CONCAT_VS(&_15$$17, &escapedField, " = null");
-						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1206);
+						zephir_array_append(&placeholders, &_15$$17, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1222);
 					} else {
-						zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1208);
+						zephir_array_append(&updateValues, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1224);
 						if (Z_TYPE_P(dataTypes) == IS_ARRAY) {
 							ZEPHIR_OBS_NVAR(&bindType);
 							if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, dataTypes, &position, 0)))) {
-								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1214);
+								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Incomplete number of bind types", "phalcon/Db/Adapter/AbstractAdapter.zep", 1230);
 								return;
 							}
-							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1217);
+							zephir_array_append(&bindDataTypes, &bindType, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1233);
 						}
 						ZEPHIR_INIT_NVAR(&_16$$18);
 						ZEPHIR_CONCAT_VS(&_16$$18, &escapedField, " = ?");
-						zephir_array_append(&placeholders, &_16$$18, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1220);
+						zephir_array_append(&placeholders, &_16$$18, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1236);
 					}
 				}
 			ZEPHIR_CALL_METHOD(NULL, values, "next", NULL, 0);
@@ -3436,7 +3436,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, update)
 			zephir_concat_self(&updateSql, whereCondition);
 		} else {
 			if (UNEXPECTED(Z_TYPE_P(whereCondition) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid WHERE clause conditions", "phalcon/Db/Adapter/AbstractAdapter.zep", 1251);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid WHERE clause conditions", "phalcon/Db/Adapter/AbstractAdapter.zep", 1267);
 				return;
 			}
 			ZEPHIR_OBS_VAR(&conditions);
@@ -3540,7 +3540,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, updateAsDict)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1324);
+	zephir_is_iterable(data, 0, "phalcon/Db/Adapter/AbstractAdapter.zep", 1340);
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), _3, _4, _1)
 		{
@@ -3552,8 +3552,8 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, updateAsDict)
 			}
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
-			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1320);
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1321);
+			zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1336);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1337);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, data, "rewind", NULL, 0);
@@ -3568,8 +3568,8 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, updateAsDict)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&value, data, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1320);
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1321);
+				zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1336);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Db/Adapter/AbstractAdapter.zep", 1337);
 			ZEPHIR_CALL_METHOD(NULL, data, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -3675,7 +3675,7 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, viewExists)
 	ZVAL_LONG(&_3, 3);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchone", NULL, 0, &_2, &_3);
 	zephir_check_call_status();
-	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1357);
+	zephir_array_fetch_long(&_4, &_0, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/AbstractAdapter.zep", 1373);
 	RETURN_MM_BOOL(ZEPHIR_GT_LONG(&_4, 0));
 }
 
diff --git a/ext/phalcon/db/adapter/abstractadapter.zep.h b/ext/phalcon/db/adapter/abstractadapter.zep.h
index efae6c27989..f4b0b15698b 100644
--- a/ext/phalcon/db/adapter/abstractadapter.zep.h
+++ b/ext/phalcon/db/adapter/abstractadapter.zep.h
@@ -3,8 +3,6 @@ extern zend_class_entry *phalcon_db_adapter_abstractadapter_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_AbstractAdapter);
 
-PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType);
-PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, __construct);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addColumn);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, addForeignKey);
@@ -34,12 +32,14 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDefaultIdValue);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDefaultValue);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDescriptor);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialect);
+PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getDialectType);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getEventsManager);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getNestedTransactionSavepointName);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getRealSQLStatement);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLBindTypes);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLStatement);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getSQLVariables);
+PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, getType);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insert);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, isNestedTransactionsWithSavepoints);
@@ -63,12 +63,6 @@ PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, supportsDefaultValue);
 PHP_METHOD(Phalcon_Db_Adapter_AbstractAdapter, viewExists);
 zend_object *zephir_init_properties_Phalcon_Db_Adapter_AbstractAdapter(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter___construct, 0, 0, 1)
 	ZEND_ARG_ARRAY_INFO(0, descriptor, 0)
 ZEND_END_ARG_INFO()
@@ -244,6 +238,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getdialect, 0, 0, Phalcon\\Db\\DialectInterface, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_geteventsmanager, 0, 0, Phalcon\\Events\\ManagerInterface, 1)
 ZEND_END_ARG_INFO()
 
@@ -262,6 +259,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_getsqlvariables, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_insert, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
 	ZEND_ARG_ARRAY_INFO(0, values, 0)
@@ -366,8 +366,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_abstractadapter_zephir_init_pr
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_adapter_abstractadapter_method_entry) {
-	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDialectType, arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getType, arginfo_phalcon_db_adapter_abstractadapter_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, __construct, arginfo_phalcon_db_adapter_abstractadapter___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, addColumn, arginfo_phalcon_db_adapter_abstractadapter_addcolumn, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, addForeignKey, arginfo_phalcon_db_adapter_abstractadapter_addforeignkey, ZEND_ACC_PUBLIC)
@@ -397,12 +395,14 @@ ZEPHIR_INIT_FUNCS(phalcon_db_adapter_abstractadapter_method_entry) {
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDefaultValue, arginfo_phalcon_db_adapter_abstractadapter_getdefaultvalue, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDescriptor, arginfo_phalcon_db_adapter_abstractadapter_getdescriptor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDialect, arginfo_phalcon_db_adapter_abstractadapter_getdialect, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getDialectType, arginfo_phalcon_db_adapter_abstractadapter_getdialecttype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getEventsManager, arginfo_phalcon_db_adapter_abstractadapter_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getNestedTransactionSavepointName, arginfo_phalcon_db_adapter_abstractadapter_getnestedtransactionsavepointname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getRealSQLStatement, arginfo_phalcon_db_adapter_abstractadapter_getrealsqlstatement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getSQLBindTypes, arginfo_phalcon_db_adapter_abstractadapter_getsqlbindtypes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getSQLStatement, arginfo_phalcon_db_adapter_abstractadapter_getsqlstatement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getSQLVariables, arginfo_phalcon_db_adapter_abstractadapter_getsqlvariables, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, getType, arginfo_phalcon_db_adapter_abstractadapter_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, insert, arginfo_phalcon_db_adapter_abstractadapter_insert, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, insertAsDict, arginfo_phalcon_db_adapter_abstractadapter_insertasdict, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Adapter_AbstractAdapter, isNestedTransactionsWithSavepoints, arginfo_phalcon_db_adapter_abstractadapter_isnestedtransactionswithsavepoints, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/db/adapter/pdo/abstractpdo.zep.c b/ext/phalcon/db/adapter/pdo/abstractpdo.zep.c
index 7d17855504a..bd354c9e852 100644
--- a/ext/phalcon/db/adapter/pdo/abstractpdo.zep.c
+++ b/ext/phalcon/db/adapter/pdo/abstractpdo.zep.c
@@ -142,19 +142,20 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, affectedRows)
 PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, transactionLevel = 0;
-	zval *nesting_param = NULL, eventsManager, savepointName, _0, _5, _6, _1$$3, _2$$4, _7$$6;
-	zend_bool nesting, _3, _4;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *nesting_param = NULL, eventsManager, savepointName, _0, _3, _6, _7, _1$$3, _2$$4, _8$$6;
+	zend_bool nesting, _4, _5;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&savepointName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_5);
+	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_6);
+	ZVAL_UNDEF(&_7);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$4);
-	ZVAL_UNDEF(&_7$$6);
+	ZVAL_UNDEF(&_8$$6);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -174,10 +175,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 
 
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("transactionLevel")));
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC);
-	transactionLevel = zephir_get_intval(&_0);
-	if (transactionLevel == 1) {
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 1)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&eventsManager, &_1$$3);
 		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
@@ -191,27 +190,28 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	_3 = !transactionLevel;
-	if (!(_3)) {
-		_3 = !nesting;
-	}
-	_4 = _3;
+	zephir_read_property(&_3, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	_4 = ZEPHIR_IS_LONG_IDENTICAL(&_3, 0);
 	if (!(_4)) {
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
+		_4 = !nesting;
+	}
+	_5 = _4;
+	if (!(_5)) {
+		ZEPHIR_CALL_METHOD(&_6, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
 		zephir_check_call_status();
-		_4 = !zephir_is_true(&_5);
+		_5 = !zephir_is_true(&_6);
 	}
-	if (_4) {
+	if (_5) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_read_property(&_6, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_6);
+	zephir_read_property(&_7, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CPY_WRT(&eventsManager, &_7);
 	ZEPHIR_CALL_METHOD(&savepointName, this_ptr, "getnestedtransactionsavepointname", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_7$$6);
-		ZVAL_STRING(&_7$$6, "db:createSavepoint");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_7$$6, this_ptr, &savepointName);
+		ZEPHIR_INIT_VAR(&_8$$6);
+		ZVAL_STRING(&_8$$6, "db:createSavepoint");
+		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_8$$6, this_ptr, &savepointName);
 		zephir_check_call_status();
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createsavepoint", NULL, 0, &savepointName);
@@ -225,19 +225,22 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, begin)
 PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, commit)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, transactionLevel = 0;
-	zval *nesting_param = NULL, eventsManager, savepointName, _0, _5, _6, _1$$4, _2$$5, _7$$8;
-	zend_bool nesting, _3, _4;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *nesting_param = NULL, eventsManager, savepointName, _0, _1, _4, _7, _9, _2$$4, _3$$5, _8$$6, _10$$8;
+	zend_bool nesting, _5, _6;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&savepointName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_5);
-	ZVAL_UNDEF(&_6);
-	ZVAL_UNDEF(&_1$$4);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_7$$8);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_2$$4);
+	ZVAL_UNDEF(&_3$$5);
+	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_10$$8);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -256,52 +259,53 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, commit)
 	}
 
 
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC);
-	transactionLevel = zephir_get_intval(&_0);
-	if (UNEXPECTED(!transactionLevel)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 154);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 0)) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 151);
 		return;
 	}
-	if (transactionLevel == 1) {
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CPY_WRT(&eventsManager, &_1$$4);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_1, 1)) {
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CPY_WRT(&eventsManager, &_2$$4);
 		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_2$$5);
-			ZVAL_STRING(&_2$$5, "db:commitTransaction");
-			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_2$$5, this_ptr);
+			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_STRING(&_3$$5, "db:commitTransaction");
+			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_3$$5, this_ptr);
 			zephir_check_call_status();
 		}
 		RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_METHOD(&_1$$4, "commit", NULL, 0);
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_2$$4, "commit", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	_3 = !transactionLevel;
-	if (!(_3)) {
-		_3 = !nesting;
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	_5 = ZEPHIR_IS_LONG_IDENTICAL(&_4, 0);
+	if (!(_5)) {
+		_5 = !nesting;
 	}
-	_4 = _3;
-	if (!(_4)) {
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
+	_6 = _5;
+	if (!(_6)) {
+		ZEPHIR_CALL_METHOD(&_7, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
 		zephir_check_call_status();
-		_4 = !zephir_is_true(&_5);
+		_6 = !zephir_is_true(&_7);
 	}
-	if (_4) {
-		if (transactionLevel > 0) {
+	if (_6) {
+		zephir_read_property(&_8$$6, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+		if (ZEPHIR_GT_LONG(&_8$$6, 0)) {
 			RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
 		}
 		RETURN_MM_BOOL(0);
 	}
-	zephir_read_property(&_6, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_6);
+	zephir_read_property(&_9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CPY_WRT(&eventsManager, &_9);
 	ZEPHIR_CALL_METHOD(&savepointName, this_ptr, "getnestedtransactionsavepointname", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_7$$8);
-		ZVAL_STRING(&_7$$8, "db:releaseSavepoint");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_7$$8, this_ptr, &savepointName);
+		ZEPHIR_INIT_VAR(&_10$$8);
+		ZVAL_STRING(&_10$$8, "db:releaseSavepoint");
+		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_10$$8, this_ptr, &savepointName);
 		zephir_check_call_status();
 	}
 	RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
@@ -421,12 +425,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 	}
 	_1 = zephir_array_isset_string(&descriptor, SL("options"));
 	if (_1) {
-		zephir_array_fetch_string(&_2, &descriptor, SL("options"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 268);
+		zephir_array_fetch_string(&_2, &descriptor, SL("options"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 265);
 		_1 = Z_TYPE_P(&_2) == IS_ARRAY;
 	}
 	if (_1) {
 		ZEPHIR_OBS_VAR(&options);
-		zephir_array_fetch_string(&options, &descriptor, SL("options"), PH_NOISY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 269);
+		zephir_array_fetch_string(&options, &descriptor, SL("options"), PH_NOISY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 266);
 		zephir_array_unset_string(&descriptor, SL("options"), PH_SEPARATE);
 	} else {
 		ZEPHIR_INIT_NVAR(&options);
@@ -443,14 +447,14 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 	zephir_array_update_long(&options, 3, &_4, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_OBS_VAR(&dsnAttributesCustomRaw);
 	if (zephir_array_isset_string_fetch(&dsnAttributesCustomRaw, &descriptor, SL("dsn"), 0)) {
-		zephir_array_append(&dsnParts, &dsnAttributesCustomRaw, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 285);
+		zephir_array_append(&dsnParts, &dsnAttributesCustomRaw, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 282);
 		zephir_array_unset_string(&descriptor, SL("dsn"), PH_SEPARATE);
 	}
 	ZEPHIR_CALL_METHOD(&_5, this_ptr, "getdsndefaults", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&dsnAttributesMap);
 	zephir_fast_array_merge(&dsnAttributesMap, &_5, &descriptor);
-	zephir_is_iterable(&dsnAttributesMap, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 305);
+	zephir_is_iterable(&dsnAttributesMap, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 302);
 	if (Z_TYPE_P(&dsnAttributesMap) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&dsnAttributesMap), _8, _9, _6)
 		{
@@ -464,7 +468,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 			ZVAL_COPY(&value, _6);
 			ZEPHIR_INIT_NVAR(&_10$$11);
 			ZEPHIR_CONCAT_VSV(&_10$$11, &key, "=", &value);
-			zephir_array_append(&dsnParts, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 301);
+			zephir_array_append(&dsnParts, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 298);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &dsnAttributesMap, "rewind", NULL, 0);
@@ -481,7 +485,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, connect)
 			zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_11$$12);
 				ZEPHIR_CONCAT_VSV(&_11$$12, &key, "=", &value);
-				zephir_array_append(&dsnParts, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 301);
+				zephir_array_append(&dsnParts, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 298);
 			ZEPHIR_CALL_METHOD(NULL, &dsnAttributesMap, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -582,27 +586,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, convertBoundParams)
 	ZVAL_LONG(&_2, setOrder);
 	zephir_preg_match(&_1, &bindPattern, &sql, &matches, 1, zephir_get_intval(&_0) , 0 );
 	if (zephir_is_true(&_1)) {
-		zephir_is_iterable(&matches, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 359);
+		zephir_is_iterable(&matches, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 356);
 		if (Z_TYPE_P(&matches) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$3)
 			{
 				ZEPHIR_INIT_NVAR(&placeMatch);
 				ZVAL_COPY(&placeMatch, _3$$3);
 				ZEPHIR_OBS_NVAR(&value);
-				zephir_array_fetch_long(&_5$$4, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 342);
+				zephir_array_fetch_long(&_5$$4, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 339);
 				if (!(zephir_array_isset_fetch(&value, &params, &_5$$4, 0))) {
 					if (UNEXPECTED(!(zephir_array_isset_long(&placeMatch, 2)))) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 343);
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&value);
-					zephir_array_fetch_long(&_6$$5, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
+					zephir_array_fetch_long(&_6$$5, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
 					if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &params, &_6$$5, 0)))) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 352);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
 						return;
 					}
 				}
-				zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 356);
+				zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 353);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &matches, "rewind", NULL, 0);
@@ -616,20 +620,20 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, convertBoundParams)
 				ZEPHIR_CALL_METHOD(&placeMatch, &matches, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&value);
-					zephir_array_fetch_long(&_7$$8, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 342);
+					zephir_array_fetch_long(&_7$$8, &placeMatch, 1, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 339);
 					if (!(zephir_array_isset_fetch(&value, &params, &_7$$8, 0))) {
 						if (UNEXPECTED(!(zephir_array_isset_long(&placeMatch, 2)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 343);
 							return;
 						}
 						ZEPHIR_OBS_NVAR(&value);
-						zephir_array_fetch_long(&_8$$9, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
+						zephir_array_fetch_long(&_8$$9, &placeMatch, 2, PH_READONLY, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 346);
 						if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &params, &_8$$9, 0)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 352);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Matched parameter was not found in parameters list", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 349);
 							return;
 						}
 					}
-					zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 356);
+					zephir_array_append(&placeHolders, &value, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 353);
 				ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -891,7 +895,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 	ZEPHIR_OBS_COPY_OR_DUP(&placeholders, placeholders_param);
 
 
-	zephir_is_iterable(&placeholders, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 570);
+	zephir_is_iterable(&placeholders, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 567);
 	if (Z_TYPE_P(&placeholders) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&placeholders), _2, _3, _0)
 		{
@@ -909,7 +913,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 			} else if (Z_TYPE_P(&wildcard) == IS_STRING) {
 				ZEPHIR_CPY_WRT(&parameter, &wildcard);
 			} else {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 490);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 487);
 				return;
 			}
 			_4$$3 = Z_TYPE_P(dataTypes) == IS_ARRAY;
@@ -968,7 +972,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 						zephir_check_call_status();
 					}
 				} else {
-					zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 558);
+					zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 555);
 					if (Z_TYPE_P(&castValue) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&castValue), _12$$22, _13$$22, _10$$22)
 						{
@@ -1028,7 +1032,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 					ZEPHIR_CALL_METHOD(NULL, statement, "bindvalue", &_9, 0, &parameter, &value);
 					zephir_check_call_status();
 				} else {
-					zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 566);
+					zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 563);
 					if (Z_TYPE_P(&value) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&value), _20$$31, _21$$31, _18$$31)
 						{
@@ -1090,7 +1094,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 				} else if (Z_TYPE_P(&wildcard) == IS_STRING) {
 					ZEPHIR_CPY_WRT(&parameter, &wildcard);
 				} else {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 490);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Invalid bind parameter (1)", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 487);
 					return;
 				}
 				_24$$34 = Z_TYPE_P(dataTypes) == IS_ARRAY;
@@ -1149,7 +1153,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 							zephir_check_call_status();
 						}
 					} else {
-						zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 558);
+						zephir_is_iterable(&castValue, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 555);
 						if (Z_TYPE_P(&castValue) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&castValue), _30$$53, _31$$53, _28$$53)
 							{
@@ -1209,7 +1213,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, executePrepared)
 						ZEPHIR_CALL_METHOD(NULL, statement, "bindvalue", &_9, 0, &parameter, &value);
 						zephir_check_call_status();
 					} else {
-						zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 566);
+						zephir_is_iterable(&value, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 563);
 						if (Z_TYPE_P(&value) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&value), _38$$62, _39$$62, _36$$62)
 							{
@@ -1566,7 +1570,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, query)
 	ZEPHIR_CALL_METHOD(&statement, &_0, "prepare", NULL, 0, &sqlStatement);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&statement) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Cannot prepare statement", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 720);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Cannot prepare statement", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 717);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "preparerealsql", NULL, 0, &sqlStatement, &bindParams);
@@ -1595,19 +1599,22 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, query)
 PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, rollback)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, transactionLevel = 0;
-	zval *nesting_param = NULL, eventsManager, savepointName, _0, _5, _6, _1$$4, _2$$5, _7$$8;
-	zend_bool nesting, _3, _4;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *nesting_param = NULL, eventsManager, savepointName, _0, _1, _4, _7, _9, _2$$4, _3$$5, _8$$6, _10$$8;
+	zend_bool nesting, _5, _6;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&eventsManager);
 	ZVAL_UNDEF(&savepointName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_5);
-	ZVAL_UNDEF(&_6);
-	ZVAL_UNDEF(&_1$$4);
-	ZVAL_UNDEF(&_2$$5);
-	ZVAL_UNDEF(&_7$$8);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_7);
+	ZVAL_UNDEF(&_9);
+	ZVAL_UNDEF(&_2$$4);
+	ZVAL_UNDEF(&_3$$5);
+	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_10$$8);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -1626,52 +1633,53 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, rollback)
 	}
 
 
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC);
-	transactionLevel = zephir_get_intval(&_0);
-	if (UNEXPECTED(!transactionLevel)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 759);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_0, 0)) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "There is no active transaction", "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 755);
 		return;
 	}
-	if (transactionLevel == 1) {
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CPY_WRT(&eventsManager, &_1$$4);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	if (ZEPHIR_IS_LONG_IDENTICAL(&_1, 1)) {
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CPY_WRT(&eventsManager, &_2$$4);
 		if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-			ZEPHIR_INIT_VAR(&_2$$5);
-			ZVAL_STRING(&_2$$5, "db:rollbackTransaction");
-			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_2$$5, this_ptr);
+			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_STRING(&_3$$5, "db:rollbackTransaction");
+			ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_3$$5, this_ptr);
 			zephir_check_call_status();
 		}
 		RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
-		zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_METHOD(&_1$$4, "rollback", NULL, 0);
+		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("pdo"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_2$$4, "rollback", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	_3 = !transactionLevel;
-	if (!(_3)) {
-		_3 = !nesting;
+	zephir_read_property(&_4, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+	_5 = ZEPHIR_IS_LONG_IDENTICAL(&_4, 0);
+	if (!(_5)) {
+		_5 = !nesting;
 	}
-	_4 = _3;
-	if (!(_4)) {
-		ZEPHIR_CALL_METHOD(&_5, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
+	_6 = _5;
+	if (!(_6)) {
+		ZEPHIR_CALL_METHOD(&_7, this_ptr, "isnestedtransactionswithsavepoints", NULL, 0);
 		zephir_check_call_status();
-		_4 = !zephir_is_true(&_5);
+		_6 = !zephir_is_true(&_7);
 	}
-	if (_4) {
-		if (transactionLevel > 0) {
+	if (_6) {
+		zephir_read_property(&_8$$6, this_ptr, ZEND_STRL("transactionLevel"), PH_NOISY_CC | PH_READONLY);
+		if (ZEPHIR_GT_LONG(&_8$$6, 0)) {
 			RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
 		}
 		RETURN_MM_BOOL(0);
 	}
 	ZEPHIR_CALL_METHOD(&savepointName, this_ptr, "getnestedtransactionsavepointname", NULL, 0);
 	zephir_check_call_status();
-	zephir_read_property(&_6, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&eventsManager, &_6);
+	zephir_read_property(&_9, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_CPY_WRT(&eventsManager, &_9);
 	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_7$$8);
-		ZVAL_STRING(&_7$$8, "db:rollbackSavepoint");
-		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_7$$8, this_ptr, &savepointName);
+		ZEPHIR_INIT_VAR(&_10$$8);
+		ZVAL_STRING(&_10$$8, "db:rollbackSavepoint");
+		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_10$$8, this_ptr, &savepointName);
 		zephir_check_call_status();
 	}
 	RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("transactionLevel")));
@@ -1744,7 +1752,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql)
 	if (!(ZEPHIR_IS_EMPTY(&parameters))) {
 		ZEPHIR_INIT_VAR(&keys);
 		array_init(&keys);
-		zephir_is_iterable(&parameters, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 848);
+		zephir_is_iterable(&parameters, 0, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 844);
 		if (Z_TYPE_P(&parameters) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&parameters), _2$$3, _3$$3, _0$$3)
 			{
@@ -1759,11 +1767,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql)
 				if (Z_TYPE_P(&key) == IS_STRING) {
 					ZEPHIR_INIT_NVAR(&_4$$5);
 					ZEPHIR_CONCAT_SVS(&_4$$5, "/:", &key, "/");
-					zephir_array_append(&keys, &_4$$5, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 834);
+					zephir_array_append(&keys, &_4$$5, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 830);
 				} else {
 					ZEPHIR_INIT_NVAR(&_5$$6);
 					ZVAL_STRING(&_5$$6, "/[?]/");
-					zephir_array_append(&keys, &_5$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 836);
+					zephir_array_append(&keys, &_5$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 832);
 				}
 				if (Z_TYPE_P(&value) == IS_STRING) {
 					ZEPHIR_INIT_NVAR(&_6$$7);
@@ -1797,11 +1805,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_AbstractPdo, prepareRealSql)
 					if (Z_TYPE_P(&key) == IS_STRING) {
 						ZEPHIR_INIT_NVAR(&_10$$11);
 						ZEPHIR_CONCAT_SVS(&_10$$11, "/:", &key, "/");
-						zephir_array_append(&keys, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 834);
+						zephir_array_append(&keys, &_10$$11, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 830);
 					} else {
 						ZEPHIR_INIT_NVAR(&_11$$12);
 						ZVAL_STRING(&_11$$12, "/[?]/");
-						zephir_array_append(&keys, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 836);
+						zephir_array_append(&keys, &_11$$12, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/AbstractPdo.zep", 832);
 					}
 					if (Z_TYPE_P(&value) == IS_STRING) {
 						ZEPHIR_INIT_NVAR(&_12$$13);
diff --git a/ext/phalcon/db/column.zep.c b/ext/phalcon/db/column.zep.c
index 8bb3afad64d..0ad3304e11e 100644
--- a/ext/phalcon/db/column.zep.c
+++ b/ext/phalcon/db/column.zep.c
@@ -75,12 +75,18 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Column)
 	 * @var int
 	 */
 	zend_declare_property_long(phalcon_db_column_ce, SL("bindType"), 2, ZEND_ACC_PROTECTED);
+	/**
+	 * Column's comment
+	 *
+	 * @var string|null
+	 */
+	zend_declare_property_null(phalcon_db_column_ce, SL("comment"), ZEND_ACC_PROTECTED);
 	/**
 	 * Default column value
 	 *
 	 * @var mixed|null
 	 */
-	zend_declare_property_null(phalcon_db_column_ce, SL("_default"), ZEND_ACC_PROTECTED);
+	zend_declare_property_null(phalcon_db_column_ce, SL("defaultValue"), ZEND_ACC_PROTECTED);
 	/**
 	 * Position is first
 	 *
@@ -99,12 +105,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Column)
 	 * @var string
 	 */
 	zend_declare_property_null(phalcon_db_column_ce, SL("name"), ZEND_ACC_PROTECTED);
-	/**
-	 * Column's comment
-	 *
-	 * @var string|null
-	 */
-	zend_declare_property_null(phalcon_db_column_ce, SL("comment"), ZEND_ACC_PROTECTED);
 	/**
 	 * Column not nullable?
 	 *
@@ -339,102 +339,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Column)
 	return SUCCESS;
 }
 
-/**
- * Default column value
- */
-PHP_METHOD(Phalcon_Db_Column, getDefault)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "_default");
-}
-
-/**
- * Column's name
- */
-PHP_METHOD(Phalcon_Db_Column, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-/**
- * Column's comment
- */
-PHP_METHOD(Phalcon_Db_Column, getComment)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "comment");
-}
-
-/**
- * Integer column number scale
- */
-PHP_METHOD(Phalcon_Db_Column, getScale)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "scale");
-}
-
-/**
- * Integer column size
- */
-PHP_METHOD(Phalcon_Db_Column, getSize)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "size");
-}
-
-/**
- * Column data type
- */
-PHP_METHOD(Phalcon_Db_Column, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
-/**
- * Column data type reference
- */
-PHP_METHOD(Phalcon_Db_Column, getTypeReference)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "typeReference");
-}
-
-/**
- * Column data type values
- */
-PHP_METHOD(Phalcon_Db_Column, getTypeValues)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "typeValues");
-}
-
 /**
  * Phalcon\Db\Column constructor
  */
@@ -529,7 +433,7 @@ PHP_METHOD(Phalcon_Db_Column, __construct)
 	}
 	ZEPHIR_OBS_VAR(&defaultValue);
 	if (zephir_array_isset_string_fetch(&defaultValue, &definition, SL("default"), 0)) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("_default"), &defaultValue);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("defaultValue"), &defaultValue);
 	}
 	ZEPHIR_OBS_VAR(&dunsigned);
 	if (zephir_array_isset_string_fetch(&dunsigned, &definition, SL("unsigned"), 0)) {
@@ -602,6 +506,102 @@ PHP_METHOD(Phalcon_Db_Column, getBindType)
 	RETURN_MEMBER(getThis(), "bindType");
 }
 
+/**
+ * Column's comment
+ */
+PHP_METHOD(Phalcon_Db_Column, getComment)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "comment");
+}
+
+/**
+ * Default column value
+ */
+PHP_METHOD(Phalcon_Db_Column, getDefault)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "defaultValue");
+}
+
+/**
+ * Column's name
+ */
+PHP_METHOD(Phalcon_Db_Column, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+/**
+ * Integer column number scale
+ */
+PHP_METHOD(Phalcon_Db_Column, getScale)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "scale");
+}
+
+/**
+ * Integer column size
+ */
+PHP_METHOD(Phalcon_Db_Column, getSize)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "size");
+}
+
+/**
+ * Column data type
+ */
+PHP_METHOD(Phalcon_Db_Column, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
+/**
+ * Column data type reference
+ */
+PHP_METHOD(Phalcon_Db_Column, getTypeReference)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "typeReference");
+}
+
+/**
+ * Column data type values
+ */
+PHP_METHOD(Phalcon_Db_Column, getTypeValues)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "typeValues");
+}
+
 /**
  * Check whether column has default value
  */
@@ -623,7 +623,7 @@ PHP_METHOD(Phalcon_Db_Column, hasDefault)
 	if (zephir_is_true(&_0)) {
 		RETURN_MM_BOOL(0);
 	}
-	zephir_read_property(&_1, this_ptr, ZEND_STRL("_default"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("defaultValue"), PH_NOISY_CC | PH_READONLY);
 	RETURN_MM_BOOL(Z_TYPE_P(&_1) != IS_NULL);
 }
 
diff --git a/ext/phalcon/db/column.zep.h b/ext/phalcon/db/column.zep.h
index 95a723c77ad..ab7ee4c966b 100644
--- a/ext/phalcon/db/column.zep.h
+++ b/ext/phalcon/db/column.zep.h
@@ -3,17 +3,17 @@ extern zend_class_entry *phalcon_db_column_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Column);
 
+PHP_METHOD(Phalcon_Db_Column, __construct);
+PHP_METHOD(Phalcon_Db_Column, getAfterPosition);
+PHP_METHOD(Phalcon_Db_Column, getBindType);
+PHP_METHOD(Phalcon_Db_Column, getComment);
 PHP_METHOD(Phalcon_Db_Column, getDefault);
 PHP_METHOD(Phalcon_Db_Column, getName);
-PHP_METHOD(Phalcon_Db_Column, getComment);
 PHP_METHOD(Phalcon_Db_Column, getScale);
 PHP_METHOD(Phalcon_Db_Column, getSize);
 PHP_METHOD(Phalcon_Db_Column, getType);
 PHP_METHOD(Phalcon_Db_Column, getTypeReference);
 PHP_METHOD(Phalcon_Db_Column, getTypeValues);
-PHP_METHOD(Phalcon_Db_Column, __construct);
-PHP_METHOD(Phalcon_Db_Column, getAfterPosition);
-PHP_METHOD(Phalcon_Db_Column, getBindType);
 PHP_METHOD(Phalcon_Db_Column, hasDefault);
 PHP_METHOD(Phalcon_Db_Column, isAutoIncrement);
 PHP_METHOD(Phalcon_Db_Column, isFirst);
@@ -22,39 +22,39 @@ PHP_METHOD(Phalcon_Db_Column, isNumeric);
 PHP_METHOD(Phalcon_Db_Column, isPrimary);
 PHP_METHOD(Phalcon_Db_Column, isUnsigned);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getdefault, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column___construct, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_ARRAY_INFO(0, definition, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getname, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getafterposition, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getcomment, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getbindtype, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getscale, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getcomment, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getsize, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getdefault, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettype, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettypereference, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getscale, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_gettypevalues, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_getsize, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column___construct, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_ARRAY_INFO(0, definition, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettype, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getafterposition, 0, 0, IS_STRING, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_gettypereference, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_getbindtype, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_column_gettypevalues, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_hasdefault, 0, 0, _IS_BOOL, 0)
@@ -79,13 +79,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_column_isunsigned, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_column_method_entry) {
+	PHP_ME(Phalcon_Db_Column, __construct, arginfo_phalcon_db_column___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Db_Column, getAfterPosition, arginfo_phalcon_db_column_getafterposition, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Column, getBindType, arginfo_phalcon_db_column_getbindtype, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Column, getComment, arginfo_phalcon_db_column_getcomment, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Db_Column, getDefault, arginfo_phalcon_db_column_getdefault, ZEND_ACC_PUBLIC)
 #else
 	PHP_ME(Phalcon_Db_Column, getDefault, NULL, ZEND_ACC_PUBLIC)
 #endif
 	PHP_ME(Phalcon_Db_Column, getName, arginfo_phalcon_db_column_getname, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Column, getComment, arginfo_phalcon_db_column_getcomment, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, getScale, arginfo_phalcon_db_column_getscale, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Db_Column, getSize, arginfo_phalcon_db_column_getsize, ZEND_ACC_PUBLIC)
@@ -99,9 +102,6 @@ ZEPHIR_INIT_FUNCS(phalcon_db_column_method_entry) {
 #else
 	PHP_ME(Phalcon_Db_Column, getTypeValues, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Db_Column, __construct, arginfo_phalcon_db_column___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Db_Column, getAfterPosition, arginfo_phalcon_db_column_getafterposition, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Column, getBindType, arginfo_phalcon_db_column_getbindtype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, hasDefault, arginfo_phalcon_db_column_hasdefault, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, isAutoIncrement, arginfo_phalcon_db_column_isautoincrement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Column, isFirst, arginfo_phalcon_db_column_isfirst, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/db/index.zep.c b/ext/phalcon/db/index.zep.c
index ffdd29924b7..d2b0dd73698 100644
--- a/ext/phalcon/db/index.zep.c
+++ b/ext/phalcon/db/index.zep.c
@@ -82,42 +82,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Index)
 	return SUCCESS;
 }
 
-/**
- * Index columns
- */
-PHP_METHOD(Phalcon_Db_Index, getColumns)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "columns");
-}
-
-/**
- * Index name
- */
-PHP_METHOD(Phalcon_Db_Index, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
-/**
- * Index type
- */
-PHP_METHOD(Phalcon_Db_Index, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 /**
  * Phalcon\Db\Index constructor
  */
@@ -169,3 +133,39 @@ PHP_METHOD(Phalcon_Db_Index, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+/**
+ * Index columns
+ */
+PHP_METHOD(Phalcon_Db_Index, getColumns)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "columns");
+}
+
+/**
+ * Index name
+ */
+PHP_METHOD(Phalcon_Db_Index, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
+/**
+ * Index type
+ */
+PHP_METHOD(Phalcon_Db_Index, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
diff --git a/ext/phalcon/db/index.zep.h b/ext/phalcon/db/index.zep.h
index c5274d26b07..acd7ae5febb 100644
--- a/ext/phalcon/db/index.zep.h
+++ b/ext/phalcon/db/index.zep.h
@@ -3,10 +3,16 @@ extern zend_class_entry *phalcon_db_index_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Index);
 
+PHP_METHOD(Phalcon_Db_Index, __construct);
 PHP_METHOD(Phalcon_Db_Index, getColumns);
 PHP_METHOD(Phalcon_Db_Index, getName);
 PHP_METHOD(Phalcon_Db_Index, getType);
-PHP_METHOD(Phalcon_Db_Index, __construct);
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_index___construct, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_ARRAY_INFO(0, columns, 0)
+	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_index_getcolumns, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -17,16 +23,10 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_index_gettype, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_index___construct, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_ARRAY_INFO(0, columns, 0)
-	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEPHIR_INIT_FUNCS(phalcon_db_index_method_entry) {
+	PHP_ME(Phalcon_Db_Index, __construct, arginfo_phalcon_db_index___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Db_Index, getColumns, arginfo_phalcon_db_index_getcolumns, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Index, getName, arginfo_phalcon_db_index_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Index, getType, arginfo_phalcon_db_index_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Index, __construct, arginfo_phalcon_db_index___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/db/profiler/item.zep.c b/ext/phalcon/db/profiler/item.zep.c
index a966c143039..a2f0e3ee770 100644
--- a/ext/phalcon/db/profiler/item.zep.c
+++ b/ext/phalcon/db/profiler/item.zep.c
@@ -13,8 +13,8 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
 
 
 /**
@@ -66,7 +66,86 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Profiler_Item)
 }
 
 /**
- * Timestamp when the profile ended
+ * Return the timestamp when the profile ended
+ */
+PHP_METHOD(Phalcon_Db_Profiler_Item, getFinalTime)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "finalTime");
+}
+
+/**
+ * Return the timestamp when the profile started
+ */
+PHP_METHOD(Phalcon_Db_Profiler_Item, getInitialTime)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "initialTime");
+}
+
+/**
+ * Return the SQL bind types related to the profile
+ */
+PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlBindTypes)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sqlBindTypes");
+}
+
+/**
+ * Return the SQL statement related to the profile
+ */
+PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlStatement)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sqlStatement");
+}
+
+/**
+ * Return the SQL variables related to the profile
+ */
+PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlVariables)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "sqlVariables");
+}
+
+/**
+ * Returns the total time in seconds spent by the profile
+ */
+PHP_METHOD(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds)
+{
+	zval _0, _1;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+
+
+
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("finalTime"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("initialTime"), PH_NOISY_CC | PH_READONLY);
+	zephir_sub_function(return_value, &_0, &_1);
+	return;
+}
+
+/**
+ * Return the timestamp when the profile ended
  */
 PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime)
 {
@@ -94,19 +173,7 @@ PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime)
 }
 
 /**
- * Timestamp when the profile ended
- */
-PHP_METHOD(Phalcon_Db_Profiler_Item, getFinalTime)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "finalTime");
-}
-
-/**
- * Timestamp when the profile started
+ * Return the timestamp when the profile started
  */
 PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime)
 {
@@ -134,19 +201,7 @@ PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime)
 }
 
 /**
- * Timestamp when the profile started
- */
-PHP_METHOD(Phalcon_Db_Profiler_Item, getInitialTime)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "initialTime");
-}
-
-/**
- * SQL bind types related to the profile
+ * Return the SQL bind types related to the profile
  */
 PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes)
 {
@@ -174,19 +229,7 @@ PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes)
 }
 
 /**
- * SQL bind types related to the profile
- */
-PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlBindTypes)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sqlBindTypes");
-}
-
-/**
- * SQL statement related to the profile
+ * Return the SQL statement related to the profile
  */
 PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement)
 {
@@ -214,19 +257,7 @@ PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement)
 }
 
 /**
- * SQL statement related to the profile
- */
-PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlStatement)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sqlStatement");
-}
-
-/**
- * SQL variables related to the profile
+ * Return the SQL variables related to the profile
  */
 PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables)
 {
@@ -253,34 +284,3 @@ PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables)
 	RETURN_THIS();
 }
 
-/**
- * SQL variables related to the profile
- */
-PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlVariables)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "sqlVariables");
-}
-
-/**
- * Returns the total time in seconds spent by the profile
- */
-PHP_METHOD(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds)
-{
-	zval _0, _1;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
-
-
-
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("finalTime"), PH_NOISY_CC | PH_READONLY);
-	zephir_read_property(&_1, this_ptr, ZEND_STRL("initialTime"), PH_NOISY_CC | PH_READONLY);
-	zephir_sub_function(return_value, &_0, &_1);
-	return;
-}
-
diff --git a/ext/phalcon/db/profiler/item.zep.h b/ext/phalcon/db/profiler/item.zep.h
index c5cc29596fa..6f5590a985a 100644
--- a/ext/phalcon/db/profiler/item.zep.h
+++ b/ext/phalcon/db/profiler/item.zep.h
@@ -3,67 +3,67 @@ extern zend_class_entry *phalcon_db_profiler_item_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Profiler_Item);
 
-PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime);
 PHP_METHOD(Phalcon_Db_Profiler_Item, getFinalTime);
-PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime);
 PHP_METHOD(Phalcon_Db_Profiler_Item, getInitialTime);
-PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes);
 PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlBindTypes);
-PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement);
 PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlStatement);
-PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables);
 PHP_METHOD(Phalcon_Db_Profiler_Item, getSqlVariables);
 PHP_METHOD(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds);
+PHP_METHOD(Phalcon_Db_Profiler_Item, setFinalTime);
+PHP_METHOD(Phalcon_Db_Profiler_Item, setInitialTime);
+PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlBindTypes);
+PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlStatement);
+PHP_METHOD(Phalcon_Db_Profiler_Item, setSqlVariables);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setfinaltime, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, finalTime, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getfinaltime, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getfinaltime, 0, 0, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getinitialtime, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setinitialtime, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, initialTime, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlbindtypes, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getinitialtime, 0, 0, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlstatement, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlbindtypes, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, sqlBindTypes, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlvariables, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlbindtypes, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_gettotalelapsedseconds, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlstatement, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, sqlStatement, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setfinaltime, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_TYPE_INFO(0, finalTime, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlstatement, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setinitialtime, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_TYPE_INFO(0, initialTime, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlvariables, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, sqlVariables, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlbindtypes, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_ARRAY_INFO(0, sqlBindTypes, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_getsqlvariables, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlstatement, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_TYPE_INFO(0, sqlStatement, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_profiler_item_gettotalelapsedseconds, 0, 0, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_db_profiler_item_setsqlvariables, 0, 1, Phalcon\\Db\\Profiler\\Item, 0)
+	ZEND_ARG_ARRAY_INFO(0, sqlVariables, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_profiler_item_method_entry) {
-	PHP_ME(Phalcon_Db_Profiler_Item, setFinalTime, arginfo_phalcon_db_profiler_item_setfinaltime, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getFinalTime, arginfo_phalcon_db_profiler_item_getfinaltime, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setInitialTime, arginfo_phalcon_db_profiler_item_setinitialtime, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getInitialTime, arginfo_phalcon_db_profiler_item_getinitialtime, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setSqlBindTypes, arginfo_phalcon_db_profiler_item_setsqlbindtypes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getSqlBindTypes, arginfo_phalcon_db_profiler_item_getsqlbindtypes, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setSqlStatement, arginfo_phalcon_db_profiler_item_setsqlstatement, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getSqlStatement, arginfo_phalcon_db_profiler_item_getsqlstatement, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Profiler_Item, setSqlVariables, arginfo_phalcon_db_profiler_item_setsqlvariables, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getSqlVariables, arginfo_phalcon_db_profiler_item_getsqlvariables, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Profiler_Item, getTotalElapsedSeconds, arginfo_phalcon_db_profiler_item_gettotalelapsedseconds, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setFinalTime, arginfo_phalcon_db_profiler_item_setfinaltime, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setInitialTime, arginfo_phalcon_db_profiler_item_setinitialtime, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setSqlBindTypes, arginfo_phalcon_db_profiler_item_setsqlbindtypes, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setSqlStatement, arginfo_phalcon_db_profiler_item_setsqlstatement, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_Profiler_Item, setSqlVariables, arginfo_phalcon_db_profiler_item_setsqlvariables, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/db/rawvalue.zep.c b/ext/phalcon/db/rawvalue.zep.c
index c012b1d1fdc..e7ffd0f33f1 100644
--- a/ext/phalcon/db/rawvalue.zep.c
+++ b/ext/phalcon/db/rawvalue.zep.c
@@ -12,8 +12,8 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/operators.h"
+#include "kernel/object.h"
 #include "kernel/memory.h"
 
 
@@ -52,30 +52,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_RawValue)
 	return SUCCESS;
 }
 
-/**
- * Raw value without quoting or formatting
- */
-PHP_METHOD(Phalcon_Db_RawValue, getValue)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "value");
-}
-
-/**
- * Raw value without quoting or formatting
- */
-PHP_METHOD(Phalcon_Db_RawValue, __toString)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "value");
-}
-
 /**
  * Phalcon\Db\RawValue constructor
  */
@@ -119,3 +95,21 @@ PHP_METHOD(Phalcon_Db_RawValue, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+PHP_METHOD(Phalcon_Db_RawValue, __toString)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "value");
+}
+
+PHP_METHOD(Phalcon_Db_RawValue, getValue)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "value");
+}
+
diff --git a/ext/phalcon/db/rawvalue.zep.h b/ext/phalcon/db/rawvalue.zep.h
index 1e64ec5e3b6..2efaedf9499 100644
--- a/ext/phalcon/db/rawvalue.zep.h
+++ b/ext/phalcon/db/rawvalue.zep.h
@@ -3,23 +3,23 @@ extern zend_class_entry *phalcon_db_rawvalue_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_RawValue);
 
-PHP_METHOD(Phalcon_Db_RawValue, getValue);
-PHP_METHOD(Phalcon_Db_RawValue, __toString);
 PHP_METHOD(Phalcon_Db_RawValue, __construct);
+PHP_METHOD(Phalcon_Db_RawValue, __toString);
+PHP_METHOD(Phalcon_Db_RawValue, getValue);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_rawvalue_getvalue, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_rawvalue___construct, 0, 0, 1)
+	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_rawvalue___tostring, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_rawvalue___construct, 0, 0, 1)
-	ZEND_ARG_INFO(0, value)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_rawvalue_getvalue, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_db_rawvalue_method_entry) {
-	PHP_ME(Phalcon_Db_RawValue, getValue, arginfo_phalcon_db_rawvalue_getvalue, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_RawValue, __toString, arginfo_phalcon_db_rawvalue___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_RawValue, __construct, arginfo_phalcon_db_rawvalue___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Db_RawValue, __toString, arginfo_phalcon_db_rawvalue___tostring, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Db_RawValue, getValue, arginfo_phalcon_db_rawvalue_getvalue, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/db/reference.zep.c b/ext/phalcon/db/reference.zep.c
index 925317bd6c3..e16597d7e4b 100644
--- a/ext/phalcon/db/reference.zep.c
+++ b/ext/phalcon/db/reference.zep.c
@@ -105,6 +105,91 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Reference)
 	return SUCCESS;
 }
 
+/**
+ * Phalcon\Db\Reference constructor
+ */
+PHP_METHOD(Phalcon_Db_Reference, __construct)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval definition;
+	zval *name_param = NULL, *definition_param = NULL, columns, schema, referencedTable, referencedSchema, referencedColumns, onDelete, onUpdate;
+	zval name;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&name);
+	ZVAL_UNDEF(&columns);
+	ZVAL_UNDEF(&schema);
+	ZVAL_UNDEF(&referencedTable);
+	ZVAL_UNDEF(&referencedSchema);
+	ZVAL_UNDEF(&referencedColumns);
+	ZVAL_UNDEF(&onDelete);
+	ZVAL_UNDEF(&onUpdate);
+	ZVAL_UNDEF(&definition);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_STR(name)
+		Z_PARAM_ARRAY(definition)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 2, 0, &name_param, &definition_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_OBS_COPY_OR_DUP(&definition, definition_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name);
+	ZEPHIR_OBS_VAR(&referencedTable);
+	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&referencedTable, &definition, SL("referencedTable"), 0)))) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Referenced table is required", "phalcon/Db/Reference.zep", 103);
+		return;
+	}
+	zephir_update_property_zval(this_ptr, ZEND_STRL("referencedTable"), &referencedTable);
+	ZEPHIR_OBS_VAR(&columns);
+	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &definition, SL("columns"), 0)))) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Foreign key columns are required", "phalcon/Db/Reference.zep", 109);
+		return;
+	}
+	zephir_update_property_zval(this_ptr, ZEND_STRL("columns"), &columns);
+	ZEPHIR_OBS_VAR(&referencedColumns);
+	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&referencedColumns, &definition, SL("referencedColumns"), 0)))) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Referenced columns of the foreign key are required", "phalcon/Db/Reference.zep", 117);
+		return;
+	}
+	zephir_update_property_zval(this_ptr, ZEND_STRL("referencedColumns"), &referencedColumns);
+	ZEPHIR_OBS_VAR(&schema);
+	if (zephir_array_isset_string_fetch(&schema, &definition, SL("schema"), 0)) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("schemaName"), &schema);
+	}
+	ZEPHIR_OBS_VAR(&referencedSchema);
+	if (zephir_array_isset_string_fetch(&referencedSchema, &definition, SL("referencedSchema"), 0)) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("referencedSchema"), &referencedSchema);
+	}
+	ZEPHIR_OBS_VAR(&onDelete);
+	if (zephir_array_isset_string_fetch(&onDelete, &definition, SL("onDelete"), 0)) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("onDelete"), &onDelete);
+	}
+	ZEPHIR_OBS_VAR(&onUpdate);
+	if (zephir_array_isset_string_fetch(&onUpdate, &definition, SL("onUpdate"), 0)) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("onUpdate"), &onUpdate);
+	}
+	if (UNEXPECTED(zephir_fast_count_int(&columns) != zephir_fast_count_int(&referencedColumns))) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Number of columns is not equals than the number of columns referenced", "phalcon/Db/Reference.zep", 141);
+		return;
+	}
+	ZEPHIR_MM_RESTORE();
+}
+
 /**
  * Local reference columns
  */
@@ -201,88 +286,3 @@ PHP_METHOD(Phalcon_Db_Reference, getOnUpdate)
 	RETURN_MEMBER(getThis(), "onUpdate");
 }
 
-/**
- * Phalcon\Db\Reference constructor
- */
-PHP_METHOD(Phalcon_Db_Reference, __construct)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval definition;
-	zval *name_param = NULL, *definition_param = NULL, columns, schema, referencedTable, referencedSchema, referencedColumns, onDelete, onUpdate;
-	zval name;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&name);
-	ZVAL_UNDEF(&columns);
-	ZVAL_UNDEF(&schema);
-	ZVAL_UNDEF(&referencedTable);
-	ZVAL_UNDEF(&referencedSchema);
-	ZVAL_UNDEF(&referencedColumns);
-	ZVAL_UNDEF(&onDelete);
-	ZVAL_UNDEF(&onUpdate);
-	ZVAL_UNDEF(&definition);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(2, 2)
-		Z_PARAM_STR(name)
-		Z_PARAM_ARRAY(definition)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 2, 0, &name_param, &definition_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_OBS_COPY_OR_DUP(&definition, definition_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name);
-	ZEPHIR_OBS_VAR(&referencedTable);
-	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&referencedTable, &definition, SL("referencedTable"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Referenced table is required", "phalcon/Db/Reference.zep", 103);
-		return;
-	}
-	zephir_update_property_zval(this_ptr, ZEND_STRL("referencedTable"), &referencedTable);
-	ZEPHIR_OBS_VAR(&columns);
-	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &definition, SL("columns"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Foreign key columns are required", "phalcon/Db/Reference.zep", 109);
-		return;
-	}
-	zephir_update_property_zval(this_ptr, ZEND_STRL("columns"), &columns);
-	ZEPHIR_OBS_VAR(&referencedColumns);
-	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&referencedColumns, &definition, SL("referencedColumns"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Referenced columns of the foreign key are required", "phalcon/Db/Reference.zep", 117);
-		return;
-	}
-	zephir_update_property_zval(this_ptr, ZEND_STRL("referencedColumns"), &referencedColumns);
-	ZEPHIR_OBS_VAR(&schema);
-	if (zephir_array_isset_string_fetch(&schema, &definition, SL("schema"), 0)) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("schemaName"), &schema);
-	}
-	ZEPHIR_OBS_VAR(&referencedSchema);
-	if (zephir_array_isset_string_fetch(&referencedSchema, &definition, SL("referencedSchema"), 0)) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("referencedSchema"), &referencedSchema);
-	}
-	ZEPHIR_OBS_VAR(&onDelete);
-	if (zephir_array_isset_string_fetch(&onDelete, &definition, SL("onDelete"), 0)) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("onDelete"), &onDelete);
-	}
-	ZEPHIR_OBS_VAR(&onUpdate);
-	if (zephir_array_isset_string_fetch(&onUpdate, &definition, SL("onUpdate"), 0)) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("onUpdate"), &onUpdate);
-	}
-	if (UNEXPECTED(zephir_fast_count_int(&columns) != zephir_fast_count_int(&referencedColumns))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "Number of columns is not equals than the number of columns referenced", "phalcon/Db/Reference.zep", 141);
-		return;
-	}
-	ZEPHIR_MM_RESTORE();
-}
-
diff --git a/ext/phalcon/db/reference.zep.h b/ext/phalcon/db/reference.zep.h
index fbee00a1416..93e5776d7a2 100644
--- a/ext/phalcon/db/reference.zep.h
+++ b/ext/phalcon/db/reference.zep.h
@@ -3,6 +3,7 @@ extern zend_class_entry *phalcon_db_reference_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Db_Reference);
 
+PHP_METHOD(Phalcon_Db_Reference, __construct);
 PHP_METHOD(Phalcon_Db_Reference, getColumns);
 PHP_METHOD(Phalcon_Db_Reference, getName);
 PHP_METHOD(Phalcon_Db_Reference, getReferencedColumns);
@@ -11,7 +12,11 @@ PHP_METHOD(Phalcon_Db_Reference, getReferencedTable);
 PHP_METHOD(Phalcon_Db_Reference, getSchemaName);
 PHP_METHOD(Phalcon_Db_Reference, getOnDelete);
 PHP_METHOD(Phalcon_Db_Reference, getOnUpdate);
-PHP_METHOD(Phalcon_Db_Reference, __construct);
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_reference___construct, 0, 0, 2)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_ARRAY_INFO(0, definition, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_reference_getcolumns, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -37,12 +42,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_db_reference_getonupdate, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_reference___construct, 0, 0, 2)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
-	ZEND_ARG_ARRAY_INFO(0, definition, 0)
-ZEND_END_ARG_INFO()
-
 ZEPHIR_INIT_FUNCS(phalcon_db_reference_method_entry) {
+	PHP_ME(Phalcon_Db_Reference, __construct, arginfo_phalcon_db_reference___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Db_Reference, getColumns, arginfo_phalcon_db_reference_getcolumns, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getName, arginfo_phalcon_db_reference_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getReferencedColumns, arginfo_phalcon_db_reference_getreferencedcolumns, ZEND_ACC_PUBLIC)
@@ -51,6 +52,5 @@ ZEPHIR_INIT_FUNCS(phalcon_db_reference_method_entry) {
 	PHP_ME(Phalcon_Db_Reference, getSchemaName, arginfo_phalcon_db_reference_getschemaname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getOnDelete, arginfo_phalcon_db_reference_getondelete, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Db_Reference, getOnUpdate, arginfo_phalcon_db_reference_getonupdate, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Db_Reference, __construct, arginfo_phalcon_db_reference___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/db/result/pdoresult.zep.c b/ext/phalcon/db/result/pdoresult.zep.c
index a2b3cf2f079..97f736a2d8b 100644
--- a/ext/phalcon/db/result/pdoresult.zep.c
+++ b/ext/phalcon/db/result/pdoresult.zep.c
@@ -516,9 +516,9 @@ PHP_METHOD(Phalcon_Db_Result_PdoResult, numRows)
 		ZEPHIR_CPY_WRT(&connection, &_1$$3);
 		ZEPHIR_CALL_METHOD(&type, &connection, "gettype", NULL, 0);
 		zephir_check_call_status();
-		_2$$3 = ZEPHIR_IS_STRING(&type, "mysql");
+		_2$$3 = ZEPHIR_IS_STRING_IDENTICAL(&type, "mysql");
 		if (!(_2$$3)) {
-			_2$$3 = ZEPHIR_IS_STRING(&type, "pgsql");
+			_2$$3 = ZEPHIR_IS_STRING_IDENTICAL(&type, "pgsql");
 		}
 		if (_2$$3) {
 			zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("pdoStatement"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/phalcon/di/di.zep.c b/ext/phalcon/di/di.zep.c
index e239ff61d86..1992b1116be 100644
--- a/ext/phalcon/di/di.zep.c
+++ b/ext/phalcon/di/di.zep.c
@@ -96,7 +96,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Di_Di)
 	 *
 	 * @var DiInterface|null
 	 */
-	zend_declare_property_null(phalcon_di_di_ce, SL("_default"), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC);
+	zend_declare_property_null(phalcon_di_di_ce, SL("defaultDi"), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC);
 	phalcon_di_di_ce->create_object = zephir_init_properties_Phalcon_Di_Di;
 
 	zend_class_implements(phalcon_di_di_ce, 1, phalcon_di_diinterface_ce);
@@ -115,9 +115,9 @@ PHP_METHOD(Phalcon_Di_Di, __construct)
 
 
 
-	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("_default"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("defaultDi"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
-		zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("_default"), this_ptr);
+		zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("defaultDi"), this_ptr);
 	}
 }
 
@@ -468,7 +468,7 @@ PHP_METHOD(Phalcon_Di_Di, getDefault)
 
 
 
-	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("_default"), PH_NOISY_CC | PH_READONLY);
+	zephir_read_static_property_ce(&_0, phalcon_di_di_ce, SL("defaultDi"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
 
@@ -1170,7 +1170,7 @@ PHP_METHOD(Phalcon_Di_Di, reset)
 
 
 
-	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("_default"), &__$null);
+	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("defaultDi"), &__$null);
 }
 
 /**
@@ -1256,7 +1256,7 @@ PHP_METHOD(Phalcon_Di_Di, setDefault)
 	zephir_fetch_params_without_memory_grow(1, 0, &container);
 
 
-	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("_default"), container);
+	zephir_update_static_property_ce(phalcon_di_di_ce, ZEND_STRL("defaultDi"), container);
 }
 
 /**
diff --git a/ext/phalcon/di/di.zep.h b/ext/phalcon/di/di.zep.h
index 51faf51b452..40be02f13f3 100644
--- a/ext/phalcon/di/di.zep.h
+++ b/ext/phalcon/di/di.zep.h
@@ -103,7 +103,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/di/exception/serviceresolutionexception.zep.c b/ext/phalcon/di/exception/serviceresolutionexception.zep.c
index d6943c1af02..07d71553736 100644
--- a/ext/phalcon/di/exception/serviceresolutionexception.zep.c
+++ b/ext/phalcon/di/exception/serviceresolutionexception.zep.c
@@ -23,8 +23,8 @@
  * file that was distributed with this source code.
  */
 /**
-  * Phalcon\Di\Exception\ServiceResolutionException
-  */
+ * Phalcon\Di\Exception\ServiceResolutionException
+ */
 ZEPHIR_INIT_CLASS(Phalcon_Di_Exception_ServiceResolutionException)
 {
 	ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Di\\Exception, ServiceResolutionException, phalcon, di_exception_serviceresolutionexception, phalcon_di_exception_ce, NULL, 0);
diff --git a/ext/phalcon/di/initializationawareinterface.zep.c b/ext/phalcon/di/initializationawareinterface.zep.c
index fbc3b32f2e0..c82c1a8fa79 100644
--- a/ext/phalcon/di/initializationawareinterface.zep.c
+++ b/ext/phalcon/di/initializationawareinterface.zep.c
@@ -12,6 +12,14 @@
 #include "kernel/main.h"
 
 
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 ZEPHIR_INIT_CLASS(Phalcon_Di_InitializationAwareInterface)
 {
 	ZEPHIR_REGISTER_INTERFACE(Phalcon\\Di, InitializationAwareInterface, phalcon, di_initializationawareinterface, phalcon_di_initializationawareinterface_method_entry);
diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c
index a88f6c7470a..8b64c9a8429 100644
--- a/ext/phalcon/di/injectable.zep.c
+++ b/ext/phalcon/di/injectable.zep.c
@@ -118,11 +118,11 @@ PHP_METHOD(Phalcon_Di_Injectable, __get)
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdi", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (ZEPHIR_IS_STRING(&propertyName, "di")) {
+	if (ZEPHIR_IS_STRING_IDENTICAL(&propertyName, "di")) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("di"), &container);
 		RETURN_CCTOR(&container);
 	}
-	if (ZEPHIR_IS_STRING(&propertyName, "persistent")) {
+	if (ZEPHIR_IS_STRING_IDENTICAL(&propertyName, "persistent")) {
 		ZEPHIR_INIT_VAR(&_2$$4);
 		zephir_create_array(&_2$$4, 2, 0);
 		ZEPHIR_INIT_VAR(&_3$$4);
@@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Di_Injectable, getDI)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
 		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c
index 8f30525dff1..bf6cbbad77d 100644
--- a/ext/phalcon/di/service.zep.c
+++ b/ext/phalcon/di/service.zep.c
@@ -310,7 +310,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve)
 		object_init_ex(&_5$$21, phalcon_di_exception_serviceresolutionexception_ce);
 		ZEPHIR_CALL_METHOD(NULL, &_5$$21, "__construct", NULL, 29);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_5$$21, "phalcon/Di/Service.zep", 205);
+		zephir_throw_exception_debug(&_5$$21, "phalcon/Di/Service.zep", 204);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -382,7 +382,7 @@ PHP_METHOD(Phalcon_Di_Service, setParameter)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("definition"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&definition, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&definition) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Definition must be an array to update its parameters", "phalcon/Di/Service.zep", 240);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Definition must be an array to update its parameters", "phalcon/Di/Service.zep", 239);
 		return;
 	}
 	ZEPHIR_OBS_VAR(&arguments);
diff --git a/ext/phalcon/di/service/builder.zep.c b/ext/phalcon/di/service/builder.zep.c
index b6b178b6f4e..cfe6c086e93 100644
--- a/ext/phalcon/di/service/builder.zep.c
+++ b/ext/phalcon/di/service/builder.zep.c
@@ -166,14 +166,14 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 	ZEPHIR_OBS_VAR(&paramCalls);
 	if (zephir_array_isset_string_fetch(&paramCalls, &definition, SL("calls"), 0)) {
 		if (UNEXPECTED(Z_TYPE_P(&instance) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has setter injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 83);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has setter injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 78);
 			return;
 		}
 		if (UNEXPECTED(Z_TYPE_P(&paramCalls) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 89);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 84);
 			return;
 		}
-		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 149);
+		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 143);
 		if (Z_TYPE_P(&paramCalls) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paramCalls), _3$$10, _4$$10, _1$$10)
 			{
@@ -192,7 +192,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_6$$14, "Method call must be an array on position ", &methodPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_7, 29, &_6$$14);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_5$$14, "phalcon/Di/Service/Builder.zep", 103);
+					zephir_throw_exception_debug(&_5$$14, "phalcon/Di/Service/Builder.zep", 97);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_9$$15, "The method name is required on position ", &methodPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_8$$15, "__construct", &_7, 29, &_9$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_8$$15, "phalcon/Di/Service/Builder.zep", 112);
+					zephir_throw_exception_debug(&_8$$15, "phalcon/Di/Service/Builder.zep", 106);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -222,7 +222,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_12$$17, "Call arguments must be an array on position ", &_11$$17);
 						ZEPHIR_CALL_METHOD(NULL, &_10$$17, "__construct", &_7, 29, &_12$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$17, "phalcon/Di/Service/Builder.zep", 125);
+						zephir_throw_exception_debug(&_10$$17, "phalcon/Di/Service/Builder.zep", 119);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_17$$20, "Method call must be an array on position ", &methodPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_16$$20, "__construct", &_7, 29, &_17$$20);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_16$$20, "phalcon/Di/Service/Builder.zep", 103);
+						zephir_throw_exception_debug(&_16$$20, "phalcon/Di/Service/Builder.zep", 97);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -271,7 +271,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_19$$21, "The method name is required on position ", &methodPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_18$$21, "__construct", &_7, 29, &_19$$21);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_18$$21, "phalcon/Di/Service/Builder.zep", 112);
+						zephir_throw_exception_debug(&_18$$21, "phalcon/Di/Service/Builder.zep", 106);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -290,7 +290,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 							ZEPHIR_CONCAT_SV(&_23$$23, "Call arguments must be an array on position ", &_22$$23);
 							ZEPHIR_CALL_METHOD(NULL, &_21$$23, "__construct", &_7, 29, &_23$$23);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_21$$23, "phalcon/Di/Service/Builder.zep", 125);
+							zephir_throw_exception_debug(&_21$$23, "phalcon/Di/Service/Builder.zep", 119);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -316,14 +316,14 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 	ZEPHIR_OBS_NVAR(&paramCalls);
 	if (zephir_array_isset_string_fetch(&paramCalls, &definition, SL("properties"), 0)) {
 		if (UNEXPECTED(Z_TYPE_P(&instance) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has properties injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 159);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The definition has properties injection parameters but the constructor didn't return an instance", "phalcon/Di/Service/Builder.zep", 152);
 			return;
 		}
 		if (UNEXPECTED(Z_TYPE_P(&paramCalls) != IS_ARRAY)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 165);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "Setter injection parameters must be an array", "phalcon/Di/Service/Builder.zep", 158);
 			return;
 		}
-		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 209);
+		zephir_is_iterable(&paramCalls, 0, "phalcon/Di/Service/Builder.zep", 201);
 		if (Z_TYPE_P(&paramCalls) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paramCalls), _29$$25, _30$$25, _27$$25)
 			{
@@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_32$$29, "Property must be an array on position ", &propertyPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_31$$29, "__construct", &_7, 29, &_32$$29);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_31$$29, "phalcon/Di/Service/Builder.zep", 179);
+					zephir_throw_exception_debug(&_31$$29, "phalcon/Di/Service/Builder.zep", 171);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -354,7 +354,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_34$$30, "The property name is required on position ", &propertyPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_33$$30, "__construct", &_7, 29, &_34$$30);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_33$$30, "phalcon/Di/Service/Builder.zep", 188);
+					zephir_throw_exception_debug(&_33$$30, "phalcon/Di/Service/Builder.zep", 180);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -366,7 +366,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 					ZEPHIR_CONCAT_SV(&_36$$31, "The property value is required on position ", &propertyPosition);
 					ZEPHIR_CALL_METHOD(NULL, &_35$$31, "__construct", &_7, 29, &_36$$31);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_35$$31, "phalcon/Di/Service/Builder.zep", 197);
+					zephir_throw_exception_debug(&_35$$31, "phalcon/Di/Service/Builder.zep", 189);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -394,7 +394,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_40$$33, "Property must be an array on position ", &propertyPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_39$$33, "__construct", &_7, 29, &_40$$33);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_39$$33, "phalcon/Di/Service/Builder.zep", 179);
+						zephir_throw_exception_debug(&_39$$33, "phalcon/Di/Service/Builder.zep", 171);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -406,7 +406,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_42$$34, "The property name is required on position ", &propertyPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_41$$34, "__construct", &_7, 29, &_42$$34);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_41$$34, "phalcon/Di/Service/Builder.zep", 188);
+						zephir_throw_exception_debug(&_41$$34, "phalcon/Di/Service/Builder.zep", 180);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -418,7 +418,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
 						ZEPHIR_CONCAT_SV(&_44$$35, "The property value is required on position ", &propertyPosition);
 						ZEPHIR_CALL_METHOD(NULL, &_43$$35, "__construct", &_7, 29, &_44$$35);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_43$$35, "phalcon/Di/Service/Builder.zep", 197);
+						zephir_throw_exception_debug(&_43$$35, "phalcon/Di/Service/Builder.zep", 189);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -442,11 +442,11 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build)
  */
 PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 {
-	zval _2$$3, _5$$5, _8$$8, _11$$10, _14$$13;
+	zval _2$$3, _5$$5, _8$$7, _11$$9, _14$$11;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval argument;
 	zend_long position, ZEPHIR_LAST_CALL_STATUS;
-	zval *container, container_sub, *position_param = NULL, *argument_param = NULL, type, name, value, instanceArguments, _0$$3, _1$$3, _3$$5, _4$$5, _6$$8, _7$$8, _9$$10, _10$$10, _12$$13, _13$$13;
+	zval *container, container_sub, *position_param = NULL, *argument_param = NULL, type, name, value, instanceArguments, _0$$3, _1$$3, _3$$5, _4$$5, _6$$7, _7$$7, _9$$9, _10$$9, _12$$11, _13$$11;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&container_sub);
@@ -458,18 +458,18 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_3$$5);
 	ZVAL_UNDEF(&_4$$5);
-	ZVAL_UNDEF(&_6$$8);
-	ZVAL_UNDEF(&_7$$8);
-	ZVAL_UNDEF(&_9$$10);
-	ZVAL_UNDEF(&_10$$10);
-	ZVAL_UNDEF(&_12$$13);
-	ZVAL_UNDEF(&_13$$13);
+	ZVAL_UNDEF(&_6$$7);
+	ZVAL_UNDEF(&_7$$7);
+	ZVAL_UNDEF(&_9$$9);
+	ZVAL_UNDEF(&_10$$9);
+	ZVAL_UNDEF(&_12$$11);
+	ZVAL_UNDEF(&_13$$11);
 	ZVAL_UNDEF(&argument);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_5$$5);
-	ZVAL_UNDEF(&_8$$8);
-	ZVAL_UNDEF(&_11$$10);
-	ZVAL_UNDEF(&_14$$13);
+	ZVAL_UNDEF(&_8$$7);
+	ZVAL_UNDEF(&_11$$9);
+	ZVAL_UNDEF(&_14$$11);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
@@ -496,7 +496,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 		ZEPHIR_CONCAT_SVS(&_2$$3, "Argument at position ", &_1$$3, " must have a type");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_2$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Di/Service/Builder.zep", 229);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Di/Service/Builder.zep", 221);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -512,14 +512,10 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 				ZEPHIR_CONCAT_SV(&_5$$5, "Service 'name' is required in parameter on position ", &_4$$5);
 				ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 29, &_5$$5);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_3$$5, "phalcon/Di/Service/Builder.zep", 242);
+				zephir_throw_exception_debug(&_3$$5, "phalcon/Di/Service/Builder.zep", 233);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The dependency injector container is not valid", "phalcon/Di/Service/Builder.zep", 248);
-				return;
-			}
 			ZEPHIR_RETURN_CALL_METHOD(container, "get", NULL, 0, &name);
 			zephir_check_call_status();
 			RETURN_MM();
@@ -527,15 +523,15 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 		if (ZEPHIR_IS_STRING(&type, "parameter")) {
 			ZEPHIR_OBS_VAR(&value);
 			if (UNEXPECTED(!(zephir_array_isset_string_fetch(&value, &argument, SL("value"), 0)))) {
-				ZEPHIR_INIT_VAR(&_6$$8);
-				object_init_ex(&_6$$8, phalcon_di_exception_ce);
-				ZEPHIR_INIT_VAR(&_7$$8);
-				ZVAL_LONG(&_7$$8, position);
-				ZEPHIR_INIT_VAR(&_8$$8);
-				ZEPHIR_CONCAT_SV(&_8$$8, "Service 'value' is required in parameter on position ", &_7$$8);
-				ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 29, &_8$$8);
+				ZEPHIR_INIT_VAR(&_6$$7);
+				object_init_ex(&_6$$7, phalcon_di_exception_ce);
+				ZEPHIR_INIT_VAR(&_7$$7);
+				ZVAL_LONG(&_7$$7, position);
+				ZEPHIR_INIT_VAR(&_8$$7);
+				ZEPHIR_CONCAT_SV(&_8$$7, "Service 'value' is required in parameter on position ", &_7$$7);
+				ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", NULL, 29, &_8$$7);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_6$$8, "phalcon/Di/Service/Builder.zep", 260);
+				zephir_throw_exception_debug(&_6$$7, "phalcon/Di/Service/Builder.zep", 245);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -544,22 +540,18 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 		if (ZEPHIR_IS_STRING(&type, "instance")) {
 			ZEPHIR_OBS_NVAR(&name);
 			if (UNEXPECTED(!(zephir_array_isset_string_fetch(&name, &argument, SL("className"), 0)))) {
-				ZEPHIR_INIT_VAR(&_9$$10);
-				object_init_ex(&_9$$10, phalcon_di_exception_ce);
-				ZEPHIR_INIT_VAR(&_10$$10);
-				ZVAL_LONG(&_10$$10, position);
-				ZEPHIR_INIT_VAR(&_11$$10);
-				ZEPHIR_CONCAT_SV(&_11$$10, "Service 'className' is required in parameter on position ", &_10$$10);
-				ZEPHIR_CALL_METHOD(NULL, &_9$$10, "__construct", NULL, 29, &_11$$10);
+				ZEPHIR_INIT_VAR(&_9$$9);
+				object_init_ex(&_9$$9, phalcon_di_exception_ce);
+				ZEPHIR_INIT_VAR(&_10$$9);
+				ZVAL_LONG(&_10$$9, position);
+				ZEPHIR_INIT_VAR(&_11$$9);
+				ZEPHIR_CONCAT_SV(&_11$$9, "Service 'className' is required in parameter on position ", &_10$$9);
+				ZEPHIR_CALL_METHOD(NULL, &_9$$9, "__construct", NULL, 29, &_11$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_9$$10, "phalcon/Di/Service/Builder.zep", 273);
+				zephir_throw_exception_debug(&_9$$9, "phalcon/Di/Service/Builder.zep", 257);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_di_exception_ce, "The dependency injector container is not valid", "phalcon/Di/Service/Builder.zep", 279);
-				return;
-			}
 			ZEPHIR_OBS_VAR(&instanceArguments);
 			if (zephir_array_isset_string_fetch(&instanceArguments, &argument, SL("arguments"), 0)) {
 				ZEPHIR_RETURN_CALL_METHOD(container, "get", NULL, 0, &name, &instanceArguments);
@@ -570,15 +562,15 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameter)
 			zephir_check_call_status();
 			RETURN_MM();
 		}
-		ZEPHIR_INIT_VAR(&_12$$13);
-		object_init_ex(&_12$$13, phalcon_di_exception_ce);
-		ZEPHIR_INIT_VAR(&_13$$13);
-		ZVAL_LONG(&_13$$13, position);
-		ZEPHIR_INIT_VAR(&_14$$13);
-		ZEPHIR_CONCAT_SV(&_14$$13, "Unknown service type in parameter on position ", &_13$$13);
-		ZEPHIR_CALL_METHOD(NULL, &_12$$13, "__construct", NULL, 29, &_14$$13);
+		ZEPHIR_INIT_VAR(&_12$$11);
+		object_init_ex(&_12$$11, phalcon_di_exception_ce);
+		ZEPHIR_INIT_VAR(&_13$$11);
+		ZVAL_LONG(&_13$$11, position);
+		ZEPHIR_INIT_VAR(&_14$$11);
+		ZEPHIR_CONCAT_SV(&_14$$11, "Unknown service type in parameter on position ", &_13$$11);
+		ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 29, &_14$$11);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_12$$13, "phalcon/Di/Service/Builder.zep", 301);
+		zephir_throw_exception_debug(&_12$$11, "phalcon/Di/Service/Builder.zep", 279);
 		ZEPHIR_MM_RESTORE();
 		return;
 	} while(0);
@@ -624,7 +616,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters)
 
 	ZEPHIR_INIT_VAR(&buildArguments);
 	array_init(&buildArguments);
-	zephir_is_iterable(&arguments, 0, "phalcon/Di/Service/Builder.zep", 323);
+	zephir_is_iterable(&arguments, 0, "phalcon/Di/Service/Builder.zep", 301);
 	if (Z_TYPE_P(&arguments) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&arguments), _2, _3, _0)
 		{
@@ -638,7 +630,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters)
 			ZVAL_COPY(&argument, _0);
 			ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 220, container, &position, &argument);
 			zephir_check_call_status();
-			zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320);
+			zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0);
@@ -655,7 +647,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters)
 			zephir_check_call_status();
 				ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 220, container, &position, &argument);
 				zephir_check_call_status();
-				zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320);
+				zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298);
 			ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
 			zephir_check_call_status();
 		}
diff --git a/ext/phalcon/dispatcher/abstractdispatcher.zep.c b/ext/phalcon/dispatcher/abstractdispatcher.zep.c
index 6a0721ff55f..b99e16b6217 100644
--- a/ext/phalcon/dispatcher/abstractdispatcher.zep.c
+++ b/ext/phalcon/dispatcher/abstractdispatcher.zep.c
@@ -316,7 +316,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "A dependency injection container is required to access related dispatching services");
 		ZVAL_LONG(&_2$$3, 0);
@@ -594,7 +594,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						zephir_check_call_status();
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 409);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 408);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -638,7 +638,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						zephir_check_call_status();
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 428);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 427);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -681,7 +681,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						if (_78$$43) {
 							continue;
 						}
-						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 470);
+						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 469);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -728,7 +728,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 						if (_88$$48) {
 							continue;
 						}
-						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 489);
+						zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 488);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -802,7 +802,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 				if (_105$$59) {
 					continue;
 				}
-				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 561);
+				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 560);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -843,7 +843,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 					if (_115$$64) {
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 577);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 576);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -883,7 +883,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 					if (_123$$69) {
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 594);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 593);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -917,7 +917,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 					if (_130$$73) {
 						continue;
 					}
-					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 611);
+					zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 610);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -947,7 +947,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch)
 				if (ZEPHIR_IS_FALSE_IDENTICAL(&_134$$77)) {
 					RETURN_MM_BOOL(0);
 				}
-				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 628);
+				zephir_throw_exception_debug(&e, "phalcon/Dispatcher/AbstractDispatcher.zep", 627);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -1004,7 +1004,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, forward)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("isControllerInitialize"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_dispatcher_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/Dispatcher/AbstractDispatcher.zep", 662);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_dispatcher_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/Dispatcher/AbstractDispatcher.zep", 661);
 		return;
 	}
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("namespaceName"), PH_NOISY_CC | PH_READONLY);
@@ -1120,24 +1120,24 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getActiveMethod)
  */
 PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getBoundModels)
 {
-	zval modelBinder, _0;
+	zval _0, _1;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&modelBinder);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelBinder"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&modelBinder, &_0);
-	if (Z_TYPE_P(&modelBinder) == IS_NULL) {
+	if (Z_TYPE_P(&_0) == IS_NULL) {
 		array_init(return_value);
 		RETURN_MM();
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&modelBinder, "getboundmodels", NULL, 0);
+	zephir_read_property(&_1, this_ptr, ZEND_STRL("modelBinder"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_1, "getboundmodels", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -1226,7 +1226,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getParam)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *param, param_sub, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, __$null, params, filter, paramValue, container, _0, _3, _4, _1$$5, _2$$5;
+	zval *param, param_sub, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, __$null, params, filter, paramValue, _0, _3, _4, _5, _1$$5, _2$$5;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
@@ -1236,10 +1236,10 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getParam)
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&filter);
 	ZVAL_UNDEF(&paramValue);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_1$$5);
 	ZVAL_UNDEF(&_2$$5);
 #if PHP_VERSION_ID >= 80000
@@ -1276,19 +1276,19 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getParam)
 		RETURN_CCTOR(&paramValue);
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&_0) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$5);
 		ZVAL_STRING(&_1$$5, "A dependency injection container is required to access the 'filter' service");
 		ZVAL_LONG(&_2$$5, 0);
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwdispatchexception", NULL, 0, &_1$$5, &_2$$5);
 		zephir_check_call_status();
 	}
-	ZEPHIR_INIT_VAR(&_4);
-	ZVAL_STRING(&_4, "filter");
-	ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4);
+	zephir_read_property(&_3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_STRING(&_5, "filter");
+	ZEPHIR_CALL_METHOD(&_4, &_3, "getshared", NULL, 0, &_5);
 	zephir_check_call_status();
-	ZEPHIR_CPY_WRT(&filter, &_3);
+	ZEPHIR_CPY_WRT(&filter, &_4);
 	ZEPHIR_RETURN_CALL_METHOD(&filter, "sanitize", NULL, 0, &paramValue, filters);
 	zephir_check_call_status();
 	RETURN_MM();
@@ -1456,7 +1456,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getHandlerClass)
 	ZEPHIR_CPY_WRT(&handlerName, &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("namespaceName"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&namespaceName, &_0);
-	if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/Dispatcher/AbstractDispatcher.zep", 911))) {
+	if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/Dispatcher/AbstractDispatcher.zep", 904))) {
 		ZEPHIR_CALL_METHOD(&camelizedClass, this_ptr, "tocamelcase", NULL, 0, &handlerName);
 		zephir_check_call_status();
 	} else {
diff --git a/ext/phalcon/domain/payload/payload.zep.c b/ext/phalcon/domain/payload/payload.zep.c
index ee7ade4ed11..bd226e1bff3 100644
--- a/ext/phalcon/domain/payload/payload.zep.c
+++ b/ext/phalcon/domain/payload/payload.zep.c
@@ -79,8 +79,24 @@ ZEPHIR_INIT_CLASS(Phalcon_Domain_Payload_Payload)
 	return SUCCESS;
 }
 
+/**
+ * Gets the potential exception thrown in the domain layer
+ *
+ * @return Throwable|null
+ */
+PHP_METHOD(Phalcon_Domain_Payload_Payload, getException)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "exception");
+}
+
 /**
  * Extra information
+ *
+ * @return mixed
  */
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getExtras)
 {
@@ -93,6 +109,8 @@ PHP_METHOD(Phalcon_Domain_Payload_Payload, getExtras)
 
 /**
  * Input
+ *
+ * @return mixed
  */
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getInput)
 {
@@ -105,6 +123,8 @@ PHP_METHOD(Phalcon_Domain_Payload_Payload, getInput)
 
 /**
  * Messages
+ *
+ * @return mixed
  */
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getMessages)
 {
@@ -117,6 +137,8 @@ PHP_METHOD(Phalcon_Domain_Payload_Payload, getMessages)
 
 /**
  * Status
+ *
+ * @return mixed
  */
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getStatus)
 {
@@ -129,6 +151,8 @@ PHP_METHOD(Phalcon_Domain_Payload_Payload, getStatus)
 
 /**
  * Output
+ *
+ * @return mixed
  */
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getOutput)
 {
@@ -139,20 +163,6 @@ PHP_METHOD(Phalcon_Domain_Payload_Payload, getOutput)
 	RETURN_MEMBER(getThis(), "output");
 }
 
-/**
- * Gets the potential exception thrown in the domain layer
- *
- * @return Throwable|null
- */
-PHP_METHOD(Phalcon_Domain_Payload_Payload, getException)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "exception");
-}
-
 /**
  * Sets an exception thrown in the domain
  *
diff --git a/ext/phalcon/domain/payload/payload.zep.h b/ext/phalcon/domain/payload/payload.zep.h
index 3ad79b5ed77..400c6ceed6c 100644
--- a/ext/phalcon/domain/payload/payload.zep.h
+++ b/ext/phalcon/domain/payload/payload.zep.h
@@ -3,12 +3,12 @@ extern zend_class_entry *phalcon_domain_payload_payload_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Domain_Payload_Payload);
 
+PHP_METHOD(Phalcon_Domain_Payload_Payload, getException);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getExtras);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getInput);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getMessages);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getStatus);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, getOutput);
-PHP_METHOD(Phalcon_Domain_Payload_Payload, getException);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, setException);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, setExtras);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, setInput);
@@ -16,6 +16,9 @@ PHP_METHOD(Phalcon_Domain_Payload_Payload, setMessages);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, setOutput);
 PHP_METHOD(Phalcon_Domain_Payload_Payload, setStatus);
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_getexception, 0, 0, Throwable, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_domain_payload_payload_getextras, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -31,9 +34,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_domain_payload_payload_getoutput, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_getexception, 0, 0, Throwable, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_setexception, 0, 1, Phalcon\\Domain\\Payload\\PayloadInterface, 0)
 	ZEND_ARG_OBJ_INFO(0, exception, Throwable, 0)
 ZEND_END_ARG_INFO()
@@ -59,6 +59,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_domain_payload_payload_se
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_domain_payload_payload_method_entry) {
+	PHP_ME(Phalcon_Domain_Payload_Payload, getException, arginfo_phalcon_domain_payload_payload_getexception, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Domain_Payload_Payload, getExtras, arginfo_phalcon_domain_payload_payload_getextras, ZEND_ACC_PUBLIC)
 #else
@@ -84,7 +85,6 @@ ZEPHIR_INIT_FUNCS(phalcon_domain_payload_payload_method_entry) {
 #else
 	PHP_ME(Phalcon_Domain_Payload_Payload, getOutput, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Domain_Payload_Payload, getException, arginfo_phalcon_domain_payload_payload_getexception, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Domain_Payload_Payload, setException, arginfo_phalcon_domain_payload_payload_setexception, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Domain_Payload_Payload, setExtras, arginfo_phalcon_domain_payload_payload_setextras, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Domain_Payload_Payload, setInput, arginfo_phalcon_domain_payload_payload_setinput, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c
index 3e3f2b1aea7..15f1d11ad73 100644
--- a/ext/phalcon/encryption/security.zep.c
+++ b/ext/phalcon/encryption/security.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
+#include "kernel/object.h"
 #include "kernel/string.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
@@ -125,17 +125,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "workFactor");
-}
-
 /**
  * Security constructor.
  *
@@ -735,6 +724,18 @@ PHP_METHOD(Phalcon_Encryption_Security, getTokenKey)
 	RETURN_MM_MEMBER(getThis(), "tokenKey");
 }
 
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "workFactor");
+}
+
 /**
  * Creates a password hash using bcrypt with a pseudo random salt
  *
diff --git a/ext/phalcon/encryption/security.zep.h b/ext/phalcon/encryption/security.zep.h
index d5405ec3dad..456c42c9ec5 100644
--- a/ext/phalcon/encryption/security.zep.h
+++ b/ext/phalcon/encryption/security.zep.h
@@ -3,7 +3,6 @@ extern zend_class_entry *phalcon_encryption_security_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Encryption_Security);
 
-PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor);
 PHP_METHOD(Phalcon_Encryption_Security, __construct);
 PHP_METHOD(Phalcon_Encryption_Security, checkHash);
 PHP_METHOD(Phalcon_Encryption_Security, checkToken);
@@ -18,6 +17,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getSessionToken);
 PHP_METHOD(Phalcon_Encryption_Security, getSaltBytes);
 PHP_METHOD(Phalcon_Encryption_Security, getToken);
 PHP_METHOD(Phalcon_Encryption_Security, getTokenKey);
+PHP_METHOD(Phalcon_Encryption_Security, getWorkFactor);
 PHP_METHOD(Phalcon_Encryption_Security, hash);
 PHP_METHOD(Phalcon_Encryption_Security, isLegacyHash);
 PHP_METHOD(Phalcon_Encryption_Security, setDefaultHash);
@@ -30,9 +30,6 @@ PHP_METHOD(Phalcon_Encryption_Security, processCost);
 PHP_METHOD(Phalcon_Encryption_Security, processTokenKey);
 PHP_METHOD(Phalcon_Encryption_Security, processUserToken);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getworkfactor, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_encryption_security___construct, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO(0, session, Phalcon\\Session\\ManagerInterface, 1)
 	ZEND_ARG_OBJ_INFO(0, request, Phalcon\\Http\\RequestInterface, 1)
@@ -89,6 +86,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_gettokenkey, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_getworkfactor, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_hash, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -144,7 +144,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_encryption_security_proc
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) {
-	PHP_ME(Phalcon_Encryption_Security, getWorkFactor, arginfo_phalcon_encryption_security_getworkfactor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, __construct, arginfo_phalcon_encryption_security___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Encryption_Security, checkHash, arginfo_phalcon_encryption_security_checkhash, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, checkToken, arginfo_phalcon_encryption_security_checktoken, ZEND_ACC_PUBLIC)
@@ -159,6 +158,7 @@ ZEPHIR_INIT_FUNCS(phalcon_encryption_security_method_entry) {
 	PHP_ME(Phalcon_Encryption_Security, getSaltBytes, arginfo_phalcon_encryption_security_getsaltbytes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, getToken, arginfo_phalcon_encryption_security_gettoken, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, getTokenKey, arginfo_phalcon_encryption_security_gettokenkey, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Encryption_Security, getWorkFactor, arginfo_phalcon_encryption_security_getworkfactor, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, hash, arginfo_phalcon_encryption_security_hash, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, isLegacyHash, arginfo_phalcon_encryption_security_islegacyhash, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Encryption_Security, setDefaultHash, arginfo_phalcon_encryption_security_setdefaulthash, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/events/event.zep.c b/ext/phalcon/events/event.zep.c
index 2c6ef515b96..bc8273cb697 100644
--- a/ext/phalcon/events/event.zep.c
+++ b/ext/phalcon/events/event.zep.c
@@ -12,12 +12,12 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
 #include "kernel/concat.h"
+#include "kernel/object.h"
 #include "ext/spl/spl_exceptions.h"
 
 
@@ -80,30 +80,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Events_Event)
 	return SUCCESS;
 }
 
-/**
- * Event data
- */
-PHP_METHOD(Phalcon_Events_Event, getData)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "data");
-}
-
-/**
- * Event type
- */
-PHP_METHOD(Phalcon_Events_Event, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
 /**
  * Phalcon\Events\Event constructor
  *
@@ -193,6 +169,33 @@ PHP_METHOD(Phalcon_Events_Event, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+PHP_METHOD(Phalcon_Events_Event, getData)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "data");
+}
+
+PHP_METHOD(Phalcon_Events_Event, getSource)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "source");
+}
+
+PHP_METHOD(Phalcon_Events_Event, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
 /**
  * Check whether the event is cancelable.
  *
@@ -223,15 +226,6 @@ PHP_METHOD(Phalcon_Events_Event, isStopped)
 	RETURN_MEMBER(getThis(), "stopped");
 }
 
-PHP_METHOD(Phalcon_Events_Event, getSource)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "source");
-}
-
 /**
  * Sets event data.
  */
@@ -320,7 +314,7 @@ PHP_METHOD(Phalcon_Events_Event, stop)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("cancelable"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!zephir_is_true(&_0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_events_exception_ce, "Trying to cancel a non-cancelable event", "phalcon/Events/Event.zep", 140);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_events_exception_ce, "Trying to cancel a non-cancelable event", "phalcon/Events/Event.zep", 150);
 		return;
 	}
 	if (1) {
diff --git a/ext/phalcon/events/event.zep.h b/ext/phalcon/events/event.zep.h
index 032be6f3693..7d243dc257b 100644
--- a/ext/phalcon/events/event.zep.h
+++ b/ext/phalcon/events/event.zep.h
@@ -3,22 +3,16 @@ extern zend_class_entry *phalcon_events_event_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Events_Event);
 
+PHP_METHOD(Phalcon_Events_Event, __construct);
 PHP_METHOD(Phalcon_Events_Event, getData);
+PHP_METHOD(Phalcon_Events_Event, getSource);
 PHP_METHOD(Phalcon_Events_Event, getType);
-PHP_METHOD(Phalcon_Events_Event, __construct);
 PHP_METHOD(Phalcon_Events_Event, isCancelable);
 PHP_METHOD(Phalcon_Events_Event, isStopped);
-PHP_METHOD(Phalcon_Events_Event, getSource);
 PHP_METHOD(Phalcon_Events_Event, setData);
 PHP_METHOD(Phalcon_Events_Event, setType);
 PHP_METHOD(Phalcon_Events_Event, stop);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event_getdata, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0)
 	ZEND_ARG_INFO(0, source)
@@ -26,10 +20,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, cancelable, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_iscancelable, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_isstopped, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_events_event_getdata, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 #if PHP_VERSION_ID >= 80000
@@ -39,6 +30,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_getsource,
 #endif
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_iscancelable, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_event_isstopped, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_events_event_setdata, 0, 0, Phalcon\\Events\\EventInterface, 0)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
@@ -51,16 +51,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_events_event_stop, 0, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_events_event_method_entry) {
+	PHP_ME(Phalcon_Events_Event, __construct, arginfo_phalcon_events_event___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Events_Event, getData, arginfo_phalcon_events_event_getdata, ZEND_ACC_PUBLIC)
 #else
 	PHP_ME(Phalcon_Events_Event, getData, NULL, ZEND_ACC_PUBLIC)
 #endif
+	PHP_ME(Phalcon_Events_Event, getSource, arginfo_phalcon_events_event_getsource, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, getType, arginfo_phalcon_events_event_gettype, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Events_Event, __construct, arginfo_phalcon_events_event___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Events_Event, isCancelable, arginfo_phalcon_events_event_iscancelable, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, isStopped, arginfo_phalcon_events_event_isstopped, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Events_Event, getSource, arginfo_phalcon_events_event_getsource, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, setData, arginfo_phalcon_events_event_setdata, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, setType, arginfo_phalcon_events_event_settype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Events_Event, stop, arginfo_phalcon_events_event_stop, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c
index e274c0f019a..bea43b7a969 100644
--- a/ext/phalcon/filter/validation.zep.c
+++ b/ext/phalcon/filter/validation.zep.c
@@ -13,9 +13,9 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
+#include "kernel/operators.h"
 #include "kernel/array.h"
 #include "kernel/exception.h"
 #include "kernel/string.h"
@@ -80,45 +80,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Filter_Validation, getData)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "data");
-}
-
-/**
- * List of validators
- */
-PHP_METHOD(Phalcon_Filter_Validation, setValidators)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *validators_param = NULL;
-	zval validators;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&validators);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ARRAY(validators)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &validators_param);
-	zephir_get_arrval(&validators, validators_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("validators"), &validators);
-	RETURN_THIS();
-}
-
 /**
  * Phalcon\Filter\Validation constructor
  */
@@ -335,6 +296,18 @@ PHP_METHOD(Phalcon_Filter_Validation, bind)
 	RETURN_THIS();
 }
 
+/**
+ * @return mixed
+ */
+PHP_METHOD(Phalcon_Filter_Validation, getData)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "data");
+}
+
 /**
  * Returns the bound entity
  *
@@ -554,7 +527,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValueByData)
 	}
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		if (zephir_array_isset(data, &field)) {
-			zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 288);
+			zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 296);
 			RETURN_CTOR(&_1$$5);
 		}
 	}
@@ -629,7 +602,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue)
 			_1$$5 = Z_TYPE_P(&data) != IS_OBJECT;
 		}
 		if (UNEXPECTED(_1$$5)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 325);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 333);
 			return;
 		}
 		ZEPHIR_CALL_METHOD(&value, this_ptr, "getvaluebydata", NULL, 0, &data, &field);
@@ -645,11 +618,11 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue)
 		if (zephir_is_true(&fieldFilters)) {
 			ZEPHIR_CALL_METHOD(&container, this_ptr, "getdi", NULL, 0);
 			zephir_check_call_status();
-			if (Z_TYPE_P(&container) != IS_OBJECT) {
+			if (Z_TYPE_P(&container) == IS_NULL) {
 				ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_2, 0);
 				zephir_check_call_status();
-				if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 346);
+				if (Z_TYPE_P(&container) == IS_NULL) {
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 354);
 					return;
 				}
 			}
@@ -659,7 +632,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue)
 			zephir_check_call_status();
 			ZEPHIR_CPY_WRT(&filterService, &_3$$9);
 			if (UNEXPECTED(Z_TYPE_P(&filterService) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 353);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 361);
 				return;
 			}
 			ZEPHIR_CALL_METHOD(&_3$$9, &filterService, "sanitize", NULL, 0, &value, &fieldFilters);
@@ -760,7 +733,7 @@ PHP_METHOD(Phalcon_Filter_Validation, rules)
 	ZEPHIR_OBS_COPY_OR_DUP(&validators, validators_param);
 
 
-	zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 411);
+	zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 419);
 	if (Z_TYPE_P(&validators) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _0)
 		{
@@ -817,7 +790,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setEntity)
 
 
 	if (UNEXPECTED(Z_TYPE_P(entity) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 422);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 430);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("entity"), entity);
@@ -854,7 +827,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setFilters)
 
 
 	if (Z_TYPE_P(field) == IS_ARRAY) {
-		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 442);
+		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 450);
 		if (Z_TYPE_P(field) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3)
 			{
@@ -882,7 +855,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setFilters)
 	} else if (Z_TYPE_P(field) == IS_STRING) {
 		zephir_update_property_array(this_ptr, SL("filters"), field, filters);
 	} else {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 447);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 455);
 		return;
 	}
 	RETURN_THIS();
@@ -916,6 +889,31 @@ PHP_METHOD(Phalcon_Filter_Validation, setLabels)
 	ZEPHIR_MM_RESTORE();
 }
 
+PHP_METHOD(Phalcon_Filter_Validation, setValidators)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *validators_param = NULL;
+	zval validators;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&validators);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_ARRAY(validators)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &validators_param);
+	zephir_get_arrval(&validators, validators_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("validators"), &validators);
+	RETURN_THIS();
+}
+
 /**
  * Validate a set of data according to a set of rules
  *
@@ -1002,7 +1000,7 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&combinedFieldsValidators, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&validatorData) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 476);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 491);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_1);
@@ -1030,12 +1028,12 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 			_2$$7 = Z_TYPE_P(data) != IS_OBJECT;
 		}
 		if (UNEXPECTED(_2$$7)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 508);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 523);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data);
 	}
-	zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 539);
+	zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 554);
 	if (Z_TYPE_P(&validatorData) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _5, _6, _3)
 		{
@@ -1047,14 +1045,14 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 			}
 			ZEPHIR_INIT_NVAR(&validators);
 			ZVAL_COPY(&validators, _3);
-			zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 537);
+			zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
 			if (Z_TYPE_P(&validators) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _7$$9)
 				{
 					ZEPHIR_INIT_NVAR(&validator);
 					ZVAL_COPY(&validator, _7$$9);
 					if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&_9$$10, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1086,7 +1084,7 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 					ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
 					zephir_check_call_status();
 						if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&_14$$15, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1124,14 +1122,14 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&validators, &validatorData, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 537);
+				zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
 				if (Z_TYPE_P(&validators) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _18$$20)
 					{
 						ZEPHIR_INIT_NVAR(&validator);
 						ZVAL_COPY(&validator, _18$$20);
 						if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&_20$$21, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1163,7 +1161,7 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 						ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
 						zephir_check_call_status();
 							if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 517);
+								ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
 								return;
 							}
 							ZEPHIR_CALL_METHOD(&_24$$26, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1193,22 +1191,22 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 	}
 	ZEPHIR_INIT_NVAR(&validators);
 	ZEPHIR_INIT_NVAR(&field);
-	zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 572);
+	zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 587);
 	if (Z_TYPE_P(&combinedFieldsValidators) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _28)
 		{
 			ZEPHIR_INIT_NVAR(&scope);
 			ZVAL_COPY(&scope, _28);
 			if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 541);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
 				return;
 			}
 			ZEPHIR_OBS_NVAR(&field);
-			zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 544);
+			zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
 			ZEPHIR_OBS_NVAR(&validator);
-			zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 545);
+			zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
 			if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 548);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
 				return;
 			}
 			ZEPHIR_CALL_METHOD(&_30$$31, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1240,15 +1238,15 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
 			ZEPHIR_CALL_METHOD(&scope, &combinedFieldsValidators, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 541);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&field);
-				zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 544);
+				zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
 				ZEPHIR_OBS_NVAR(&validator);
-				zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 545);
+				zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
 				if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 548);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&_34$$37, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1325,7 +1323,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 	ZEPHIR_INIT_VAR(&results);
 	array_init(&results);
 	if (Z_TYPE_P(field) == IS_ARRAY) {
-		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 600);
+		zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 615);
 		if (Z_TYPE_P(field) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3)
 			{
@@ -1333,7 +1331,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 				ZVAL_COPY(&singleField, _0$$3);
 				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 289, &singleField, validator);
 				zephir_check_call_status();
-				zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592);
+				zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
 				if (zephir_fast_in_array(&__$false, &results)) {
 					RETURN_MM_BOOL(0);
 				}
@@ -1352,7 +1350,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 				zephir_check_call_status();
 					ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 289, &singleField, validator);
 					zephir_check_call_status();
-					zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592);
+					zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
 					if (zephir_fast_in_array(&__$false, &results)) {
 						RETURN_MM_BOOL(0);
 					}
@@ -1377,7 +1375,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
 			ZEPHIR_CALL_METHOD(&value, this_ptr, "getvalue", NULL, 0, field);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
-				zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 617);
+				zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 632);
 				if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&allowEmpty), _7$$11)
 					{
diff --git a/ext/phalcon/filter/validation.zep.h b/ext/phalcon/filter/validation.zep.h
index f1e2592837e..0a9cecfc840 100644
--- a/ext/phalcon/filter/validation.zep.h
+++ b/ext/phalcon/filter/validation.zep.h
@@ -3,12 +3,11 @@ extern zend_class_entry *phalcon_filter_validation_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation);
 
-PHP_METHOD(Phalcon_Filter_Validation, getData);
-PHP_METHOD(Phalcon_Filter_Validation, setValidators);
 PHP_METHOD(Phalcon_Filter_Validation, __construct);
 PHP_METHOD(Phalcon_Filter_Validation, add);
 PHP_METHOD(Phalcon_Filter_Validation, appendMessage);
 PHP_METHOD(Phalcon_Filter_Validation, bind);
+PHP_METHOD(Phalcon_Filter_Validation, getData);
 PHP_METHOD(Phalcon_Filter_Validation, getEntity);
 PHP_METHOD(Phalcon_Filter_Validation, getFilters);
 PHP_METHOD(Phalcon_Filter_Validation, getLabel);
@@ -22,17 +21,11 @@ PHP_METHOD(Phalcon_Filter_Validation, rules);
 PHP_METHOD(Phalcon_Filter_Validation, setEntity);
 PHP_METHOD(Phalcon_Filter_Validation, setFilters);
 PHP_METHOD(Phalcon_Filter_Validation, setLabels);
+PHP_METHOD(Phalcon_Filter_Validation, setValidators);
 PHP_METHOD(Phalcon_Filter_Validation, validate);
 PHP_METHOD(Phalcon_Filter_Validation, preChecking);
 zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getdata, 0, 0, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_setvalidators, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, validators, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, validators, IS_ARRAY, 0, "[]")
@@ -55,6 +48,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_bind, 0
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getdata, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getentity, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -111,6 +107,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_setlab
 	ZEND_ARG_ARRAY_INFO(0, labels, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_setvalidators, 0, 1, Phalcon\\Filter\\Validation, 0)
+	ZEND_ARG_ARRAY_INFO(0, validators, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, Phalcon\\Messages\\Messages, 0)
 	ZEND_ARG_INFO(0, data)
 	ZEND_ARG_INFO(0, entity)
@@ -125,16 +125,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_zephir_init_properties_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_filter_validation_method_entry) {
+	PHP_ME(Phalcon_Filter_Validation, __construct, arginfo_phalcon_filter_validation___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Filter_Validation, add, arginfo_phalcon_filter_validation_add, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation, appendMessage, arginfo_phalcon_filter_validation_appendmessage, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation, bind, arginfo_phalcon_filter_validation_bind, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Filter_Validation, getData, arginfo_phalcon_filter_validation_getdata, ZEND_ACC_PUBLIC)
 #else
 	PHP_ME(Phalcon_Filter_Validation, getData, NULL, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME(Phalcon_Filter_Validation, setValidators, arginfo_phalcon_filter_validation_setvalidators, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation, __construct, arginfo_phalcon_filter_validation___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Filter_Validation, add, arginfo_phalcon_filter_validation_add, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation, appendMessage, arginfo_phalcon_filter_validation_appendmessage, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation, bind, arginfo_phalcon_filter_validation_bind, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Filter_Validation, getEntity, arginfo_phalcon_filter_validation_getentity, ZEND_ACC_PUBLIC)
 #else
@@ -152,6 +151,7 @@ ZEPHIR_INIT_FUNCS(phalcon_filter_validation_method_entry) {
 	PHP_ME(Phalcon_Filter_Validation, setEntity, arginfo_phalcon_filter_validation_setentity, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, setFilters, arginfo_phalcon_filter_validation_setfilters, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, setLabels, arginfo_phalcon_filter_validation_setlabels, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation, setValidators, arginfo_phalcon_filter_validation_setvalidators, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, validate, arginfo_phalcon_filter_validation_validate, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation, preChecking, arginfo_phalcon_filter_validation_prechecking, ZEND_ACC_PROTECTED)
 	PHP_FE_END
diff --git a/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c b/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c
index 36db5f86a19..0657f380440 100644
--- a/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c
+++ b/ext/phalcon/filter/validation/abstractvalidatorcomposite.zep.c
@@ -46,6 +46,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation_AbstractValidatorComposite)
 }
 
 /**
+ * @return array
  */
 PHP_METHOD(Phalcon_Filter_Validation_AbstractValidatorComposite, getValidators)
 {
@@ -101,13 +102,13 @@ PHP_METHOD(Phalcon_Filter_Validation_AbstractValidatorComposite, validate)
 		ZEPHIR_CONCAT_VS(&_3$$3, &_2$$3, " does not have any validator added");
 		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 29, &_3$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 33);
+		zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 41);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_4, this_ptr, "getvalidators", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 42);
+	zephir_is_iterable(&_4, 0, "phalcon/Filter/Validation/AbstractValidatorComposite.zep", 50);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
diff --git a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c
index 44775173d0f..964f60368c7 100644
--- a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c
+++ b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.c
@@ -12,10 +12,10 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
+#include "kernel/operators.h"
+#include "kernel/object.h"
 #include "kernel/array.h"
 #include "kernel/concat.h"
 #include "kernel/string.h"
@@ -95,126 +95,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation_Validator_File_AbstractFile)
 	return SUCCESS;
 }
 
-/**
- * Empty is empty
- */
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "messageFileEmpty");
-}
-
-/**
- * Empty is empty
- */
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *messageFileEmpty_param = NULL;
-	zval messageFileEmpty;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&messageFileEmpty);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(messageFileEmpty)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &messageFileEmpty_param);
-	zephir_get_strval(&messageFileEmpty, messageFileEmpty_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messageFileEmpty"), &messageFileEmpty);
-	RETURN_THIS();
-}
-
-/**
- * File exceeds the file size set in PHP configuration
- */
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "messageIniSize");
-}
-
-/**
- * File exceeds the file size set in PHP configuration
- */
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *messageIniSize_param = NULL;
-	zval messageIniSize;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&messageIniSize);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(messageIniSize)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &messageIniSize_param);
-	zephir_get_strval(&messageIniSize, messageIniSize_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messageIniSize"), &messageIniSize);
-	RETURN_THIS();
-}
-
-/**
- * File is not valid
- */
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "messageValid");
-}
-
-/**
- * File is not valid
- */
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *messageValid_param = NULL;
-	zval messageValid;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&messageValid);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(messageValid)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &messageValid_param);
-	zephir_get_strval(&messageValid, messageValid_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("messageValid"), &messageValid);
-	RETURN_THIS();
-}
-
 /**
  * Check upload
  *
@@ -605,6 +485,48 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getFileSizeInB
 	RETURN_MM();
 }
 
+/**
+ * Empty is empty
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "messageFileEmpty");
+}
+
+/**
+ * File exceeds the file size set in PHP configuration
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "messageIniSize");
+}
+
+/**
+ * File is not valid
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "messageValid");
+}
+
 /**
  * Check on empty
  *
@@ -653,7 +575,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty)
 	if (!(_0)) {
 		_1 = zephir_array_isset_string(&value, SL("error"));
 		if (_1) {
-			zephir_array_fetch_string(&_2, &value, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/AbstractFile.zep", 250);
+			zephir_array_fetch_string(&_2, &value, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/AbstractFile.zep", 280);
 			_1 = ZEPHIR_IS_LONG_IDENTICAL(&_2, 4);
 		}
 		_0 = _1;
@@ -661,6 +583,102 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty)
 	RETURN_MM_BOOL(_0);
 }
 
+/**
+ * Empty is empty
+ *
+ * @param string $message
+ *
+ * @return void
+ */
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *message_param = NULL;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messageFileEmpty"), &message);
+	ZEPHIR_MM_RESTORE();
+}
+
+/**
+ * File exceeds the file size set in PHP configuration
+ *
+ * @param string $message
+ *
+ * @return void
+ */
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *message_param = NULL;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messageIniSize"), &message);
+	ZEPHIR_MM_RESTORE();
+}
+
+/**
+ * File is not valid
+ *
+ * @param string $message
+ *
+ * @return void
+ */
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *message_param = NULL;
+	zval message;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&message);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &message_param);
+	zephir_get_strval(&message, message_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("messageValid"), &message);
+	ZEPHIR_MM_RESTORE();
+}
+
 /**
  * Checks if a file has been uploaded; Internal check that can be
  * overriden in a subclass if you do not want to check uploaded files
diff --git a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.h b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.h
index b3055f9a279..2c3f0270c43 100644
--- a/ext/phalcon/filter/validation/validator/file/abstractfile.zep.h
+++ b/ext/phalcon/filter/validation/validator/file/abstractfile.zep.h
@@ -3,41 +3,20 @@ extern zend_class_entry *phalcon_filter_validation_validator_file_abstractfile_c
 
 ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation_Validator_File_AbstractFile);
 
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty);
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty);
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize);
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize);
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid);
-PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsEmpty);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsValid);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadMaxSize);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getFileSizeInBytes);
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty);
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize);
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty);
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty);
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize);
+PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid);
 PHP_METHOD(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkIsUploadedFile);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, messageFileEmpty, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, messageIniSize, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, messageValid, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_checkupload, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Filter\\Validation, 0)
 	ZEND_ARG_INFO(0, field)
@@ -62,28 +41,52 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_valida
 	ZEND_ARG_TYPE_INFO(0, size, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_isallowempty, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Filter\\Validation, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_validator_file_abstractfile_checkisuploadedfile, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_filter_validation_validator_file_abstractfile_method_entry) {
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUpload, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkupload, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkuploadisempty, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadIsValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkuploadisvalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkUploadMaxSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkuploadmaxsize, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getFileSizeInBytes, arginfo_phalcon_filter_validation_validator_file_abstractfile_getfilesizeinbytes, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagefileempty, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessageinisize, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, getMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_getmessagevalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, isAllowEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_isallowempty, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageFileEmpty, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagefileempty, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageIniSize, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessageinisize, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, setMessageValid, arginfo_phalcon_filter_validation_validator_file_abstractfile_setmessagevalid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Filter_Validation_Validator_File_AbstractFile, checkIsUploadedFile, arginfo_phalcon_filter_validation_validator_file_abstractfile_checkisuploadedfile, ZEND_ACC_PROTECTED)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/flash/abstractflash.zep.c b/ext/phalcon/flash/abstractflash.zep.c
index c5d7c2894dd..76cb89225f5 100644
--- a/ext/phalcon/flash/abstractflash.zep.c
+++ b/ext/phalcon/flash/abstractflash.zep.c
@@ -94,50 +94,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Flash_AbstractFlash)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutoescape)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "autoescape");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssClasses)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "cssClasses");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssIconClasses)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "cssIconClasses");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Flash_AbstractFlash, getCustomTemplate)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "customTemplate");
-}
-
 /**
  * AbstractFlash constructor.
  *
@@ -260,6 +216,66 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, error)
 	RETURN_MM();
 }
 
+/**
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutoescape)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "autoescape");
+}
+
+/**
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutomaticHtml)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "automaticHtml");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssClasses)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "cssClasses");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssIconClasses)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "cssIconClasses");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Flash_AbstractFlash, getCustomTemplate)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "customTemplate");
+}
+
 /**
  * Returns the Escaper Service
  *
@@ -309,7 +325,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, getEscaperService)
 		zephir_update_property_zval(this_ptr, ZEND_STRL("escaperService"), &_7$$4);
 		RETURN_MM_MEMBER(getThis(), "escaperService");
 	}
-	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "A dependency injection container is required to access the 'escaper' service", "phalcon/Flash/AbstractFlash.zep", 154);
+	ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "A dependency injection container is required to access the 'escaper' service", "phalcon/Flash/AbstractFlash.zep", 194);
 	return;
 }
 
@@ -674,7 +690,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 		_0 = Z_TYPE_P(message) != IS_STRING;
 	}
 	if (_0) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "The message must be an array or a string", "phalcon/Flash/AbstractFlash.zep", 294);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_flash_exception_ce, "The message must be an array or a string", "phalcon/Flash/AbstractFlash.zep", 334);
 		return;
 	}
 	if (Z_TYPE_P(message) != IS_ARRAY) {
@@ -683,7 +699,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage)
 		zephir_array_fast_append(&_1$$4, message);
 		ZEPHIR_CPY_WRT(message, &_1$$4);
 	}
-	zephir_is_iterable(message, 0, "phalcon/Flash/AbstractFlash.zep", 320);
+	zephir_is_iterable(message, 0, "phalcon/Flash/AbstractFlash.zep", 360);
 	if (Z_TYPE_P(message) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(message), _2)
 		{
@@ -995,7 +1011,7 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, checkClasses)
 	ZVAL_STRING(&content, "");
 	if (zephir_array_isset(&collection, &type)) {
 		ZEPHIR_OBS_NVAR(&content);
-		zephir_array_fetch(&content, &collection, &type, PH_NOISY, "phalcon/Flash/AbstractFlash.zep", 444);
+		zephir_array_fetch(&content, &collection, &type, PH_NOISY, "phalcon/Flash/AbstractFlash.zep", 484);
 	}
 	if (1 != ZEPHIR_IS_EMPTY(&content)) {
 		if (Z_TYPE_P(&content) != IS_ARRAY) {
diff --git a/ext/phalcon/flash/abstractflash.zep.h b/ext/phalcon/flash/abstractflash.zep.h
index 7fb8c6c43e9..3a78c74e88c 100644
--- a/ext/phalcon/flash/abstractflash.zep.h
+++ b/ext/phalcon/flash/abstractflash.zep.h
@@ -3,13 +3,14 @@ extern zend_class_entry *phalcon_flash_abstractflash_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Flash_AbstractFlash);
 
+PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct);
+PHP_METHOD(Phalcon_Flash_AbstractFlash, clear);
+PHP_METHOD(Phalcon_Flash_AbstractFlash, error);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutoescape);
+PHP_METHOD(Phalcon_Flash_AbstractFlash, getAutomaticHtml);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssClasses);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, getCssIconClasses);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, getCustomTemplate);
-PHP_METHOD(Phalcon_Flash_AbstractFlash, __construct);
-PHP_METHOD(Phalcon_Flash_AbstractFlash, clear);
-PHP_METHOD(Phalcon_Flash_AbstractFlash, error);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, getEscaperService);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, notice);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, setAutoescape);
@@ -28,28 +29,31 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, prepareHtmlMessage);
 PHP_METHOD(Phalcon_Flash_AbstractFlash, checkClasses);
 zend_object *zephir_init_properties_Phalcon_Flash_AbstractFlash(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getautoescape, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_flash_abstractflash___construct, 0, 0, 0)
+	ZEND_ARG_OBJ_INFO(0, escaper, Phalcon\\Html\\Escaper\\EscaperInterface, 1)
+	ZEND_ARG_OBJ_INFO(0, session, Phalcon\\Session\\ManagerInterface, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssclasses, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_clear, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssiconclasses, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_error, 0, 1, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcustomtemplate, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getautoescape, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_flash_abstractflash___construct, 0, 0, 0)
-	ZEND_ARG_OBJ_INFO(0, escaper, Phalcon\\Html\\Escaper\\EscaperInterface, 1)
-	ZEND_ARG_OBJ_INFO(0, session, Phalcon\\Session\\ManagerInterface, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getautomatichtml, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_clear, 0, 0, IS_VOID, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssclasses, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_error, 0, 1, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcssiconclasses, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_flash_abstractflash_getcustomtemplate, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_flash_abstractflash_getescaperservice, 0, 0, Phalcon\\Html\\Escaper\\EscaperInterface, 0)
@@ -123,13 +127,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_flash_abstractflash_zephir_init_propertie
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_flash_abstractflash_method_entry) {
+	PHP_ME(Phalcon_Flash_AbstractFlash, __construct, arginfo_phalcon_flash_abstractflash___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Flash_AbstractFlash, clear, arginfo_phalcon_flash_abstractflash_clear, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Flash_AbstractFlash, error, arginfo_phalcon_flash_abstractflash_error, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getAutoescape, arginfo_phalcon_flash_abstractflash_getautoescape, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Flash_AbstractFlash, getAutomaticHtml, arginfo_phalcon_flash_abstractflash_getautomatichtml, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getCssClasses, arginfo_phalcon_flash_abstractflash_getcssclasses, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getCssIconClasses, arginfo_phalcon_flash_abstractflash_getcssiconclasses, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getCustomTemplate, arginfo_phalcon_flash_abstractflash_getcustomtemplate, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Flash_AbstractFlash, __construct, arginfo_phalcon_flash_abstractflash___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Flash_AbstractFlash, clear, arginfo_phalcon_flash_abstractflash_clear, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Flash_AbstractFlash, error, arginfo_phalcon_flash_abstractflash_error, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, getEscaperService, arginfo_phalcon_flash_abstractflash_getescaperservice, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, notice, arginfo_phalcon_flash_abstractflash_notice, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Flash_AbstractFlash, setAutoescape, arginfo_phalcon_flash_abstractflash_setautoescape, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/forms/form.zep.h b/ext/phalcon/forms/form.zep.h
index b7fc1e55206..a4161087847 100644
--- a/ext/phalcon/forms/form.zep.h
+++ b/ext/phalcon/forms/form.zep.h
@@ -79,7 +79,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_NULL, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c
index fd6bf36894b..363cc7aaa08 100644
--- a/ext/phalcon/html/breadcrumbs.zep.c
+++ b/ext/phalcon/html/breadcrumbs.zep.c
@@ -63,46 +63,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Breadcrumbs)
 	return SUCCESS;
 }
 
-/**
- * Crumb separator
- */
-PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "separator");
-}
-
-/**
- * Crumb separator
- */
-PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *separator_param = NULL;
-	zval separator;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&separator);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(separator)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &separator_param);
-	zephir_get_strval(&separator, separator_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("separator"), &separator);
-	RETURN_THIS();
-}
-
 /**
  * Adds a new crumb.
  *
@@ -172,6 +132,20 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, clear)
 	ZEPHIR_MM_RESTORE();
 }
 
+/**
+ * Crumb separator
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "separator");
+}
+
 /**
  * Removes crumb by url.
  *
@@ -271,9 +245,9 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 	ZEPHIR_UNREF(&urls);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&lastLabel);
-	zephir_array_fetch(&lastLabel, &elements, &lastUrl, PH_NOISY, "phalcon/Html/Breadcrumbs.zep", 112);
+	zephir_array_fetch(&lastLabel, &elements, &lastUrl, PH_NOISY, "phalcon/Html/Breadcrumbs.zep", 122);
 	zephir_array_unset(&elements, &lastUrl, PH_SEPARATE);
-	zephir_is_iterable(&elements, 0, "phalcon/Html/Breadcrumbs.zep", 133);
+	zephir_is_iterable(&elements, 0, "phalcon/Html/Breadcrumbs.zep", 143);
 	if (Z_TYPE_P(&elements) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&elements), _3, _4, _1)
 		{
@@ -299,7 +273,7 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 			zephir_array_fast_append(&_8$$3, &element);
 			zephir_array_fast_append(&_8$$3, &url);
 			zephir_fast_str_replace(&_5$$3, &_6$$3, &_8$$3, &template);
-			zephir_array_append(&output, &_5$$3, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 127);
+			zephir_array_append(&output, &_5$$3, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 137);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &elements, "rewind", NULL, 0);
@@ -328,7 +302,7 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 				zephir_array_fast_append(&_12$$4, &element);
 				zephir_array_fast_append(&_12$$4, &url);
 				zephir_fast_str_replace(&_9$$4, &_10$$4, &_12$$4, &template);
-				zephir_array_append(&output, &_9$$4, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 127);
+				zephir_array_append(&output, &_9$$4, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 137);
 			ZEPHIR_CALL_METHOD(NULL, &elements, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -338,7 +312,7 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 	if (0 != zephir_fast_count_int(&elements)) {
 		ZEPHIR_INIT_VAR(&_13$$5);
 		ZEPHIR_CONCAT_SVS(&_13$$5, "<dt>", &lastLabel, "</dt>");
-		zephir_array_append(&output, &_13$$5, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 134);
+		zephir_array_append(&output, &_13$$5, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 144);
 	} else {
 		ZEPHIR_INIT_VAR(&_14$$6);
 		ZEPHIR_INIT_VAR(&_15$$6);
@@ -354,7 +328,7 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 		zephir_array_fast_append(&_17$$6, &lastLabel);
 		zephir_array_fast_append(&_17$$6, &lastUrl);
 		zephir_fast_str_replace(&_14$$6, &_15$$6, &_17$$6, &template);
-		zephir_array_append(&output, &_14$$6, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 146);
+		zephir_array_append(&output, &_14$$6, PH_SEPARATE, "phalcon/Html/Breadcrumbs.zep", 156);
 	}
 	ZEPHIR_INIT_VAR(&_18);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("separator"), PH_NOISY_CC | PH_READONLY);
@@ -365,6 +339,36 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render)
 	RETURN_MM();
 }
 
+/**
+ * @param string $separator
+ *
+ * @return Breadcrumbs
+ */
+PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *separator_param = NULL;
+	zval separator;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&separator);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(separator)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &separator_param);
+	zephir_get_strval(&separator, separator_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("separator"), &separator);
+	RETURN_THIS();
+}
+
 /**
  * Returns the internal breadcrumbs array
  */
diff --git a/ext/phalcon/html/breadcrumbs.zep.h b/ext/phalcon/html/breadcrumbs.zep.h
index 2b696e7f7a7..09720e76edb 100644
--- a/ext/phalcon/html/breadcrumbs.zep.h
+++ b/ext/phalcon/html/breadcrumbs.zep.h
@@ -3,22 +3,15 @@ extern zend_class_entry *phalcon_html_breadcrumbs_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Html_Breadcrumbs);
 
-PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator);
-PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator);
 PHP_METHOD(Phalcon_Html_Breadcrumbs, add);
 PHP_METHOD(Phalcon_Html_Breadcrumbs, clear);
+PHP_METHOD(Phalcon_Html_Breadcrumbs, getSeparator);
 PHP_METHOD(Phalcon_Html_Breadcrumbs, remove);
 PHP_METHOD(Phalcon_Html_Breadcrumbs, render);
+PHP_METHOD(Phalcon_Html_Breadcrumbs, setSeparator);
 PHP_METHOD(Phalcon_Html_Breadcrumbs, toArray);
 zend_object *zephir_init_properties_Phalcon_Html_Breadcrumbs(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_getseparator, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_breadcrumbs_setseparator, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, separator, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_html_breadcrumbs_add, 0, 1, Phalcon\\Html\\Breadcrumbs, 0)
 	ZEND_ARG_TYPE_INFO(0, label, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, link, IS_STRING, 0)
@@ -27,6 +20,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_clear, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_getseparator, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_remove, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_TYPE_INFO(0, link, IS_STRING, 0)
@@ -35,6 +31,10 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_render, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_html_breadcrumbs_setseparator, 0, 1, Phalcon\\Html\\Breadcrumbs, 0)
+	ZEND_ARG_TYPE_INFO(0, separator, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_breadcrumbs_toarray, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -42,12 +42,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_html_breadcrumbs_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_html_breadcrumbs_method_entry) {
-	PHP_ME(Phalcon_Html_Breadcrumbs, getSeparator, arginfo_phalcon_html_breadcrumbs_getseparator, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Html_Breadcrumbs, setSeparator, arginfo_phalcon_html_breadcrumbs_setseparator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, add, arginfo_phalcon_html_breadcrumbs_add, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, clear, arginfo_phalcon_html_breadcrumbs_clear, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Breadcrumbs, getSeparator, arginfo_phalcon_html_breadcrumbs_getseparator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, remove, arginfo_phalcon_html_breadcrumbs_remove, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, render, arginfo_phalcon_html_breadcrumbs_render, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Breadcrumbs, setSeparator, arginfo_phalcon_html_breadcrumbs_setseparator, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Breadcrumbs, toArray, arginfo_phalcon_html_breadcrumbs_toarray, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/html/escaper.zep.c b/ext/phalcon/html/escaper.zep.c
index 28ff4205e49..646ff400485 100644
--- a/ext/phalcon/html/escaper.zep.c
+++ b/ext/phalcon/html/escaper.zep.c
@@ -12,10 +12,13 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
+#include "kernel/exception.h"
 #include "kernel/fcall.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
+#include "kernel/operators.h"
+#include "kernel/string.h"
+#include "kernel/concat.h"
+#include "kernel/object.h"
 #include "kernel/filter.h"
 #include "kernel/array.h"
 
@@ -68,65 +71,156 @@ ZEPHIR_INIT_CLASS(Phalcon_Html_Escaper)
 }
 
 /**
- */
-PHP_METHOD(Phalcon_Html_Escaper, getEncoding)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "encoding");
-}
-
-/**
- * ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401
- */
-PHP_METHOD(Phalcon_Html_Escaper, getFlags)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "flags");
-}
-
-/**
- * Escapes a HTML attribute string
+ * Escapes a HTML attribute string or array
  *
- * @param string $input
+ * If the input is an array, the keys are the attribute names and the
+ * values are attribute values. If a value is boolean (true/false) then
+ * the attribute will have no value:
+ * `['disabled' => true]` -> `'disabled``
+ *
+ * The resulting string will have attribute pairs separated by a space.
+ *
+ * @param array|string $input
  *
  * @return string
  */
 PHP_METHOD(Phalcon_Html_Escaper, attributes)
 {
+	zend_string *_4;
+	zend_ulong _3;
+	zend_bool _0, _5$$5, _11$$9;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *input_param = NULL, _0, _1, _2;
-	zval input;
+	zval *input, input_sub, key, result, value, *_1, _2, _6$$5, _8$$5, _7$$7, _9$$8, _10$$8, _12$$9, _14$$9, _13$$11, _15$$12, _16$$12;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&input);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&input_sub);
+	ZVAL_UNDEF(&key);
+	ZVAL_UNDEF(&result);
+	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_8$$5);
+	ZVAL_UNDEF(&_7$$7);
+	ZVAL_UNDEF(&_9$$8);
+	ZVAL_UNDEF(&_10$$8);
+	ZVAL_UNDEF(&_12$$9);
+	ZVAL_UNDEF(&_14$$9);
+	ZVAL_UNDEF(&_13$$11);
+	ZVAL_UNDEF(&_15$$12);
+	ZVAL_UNDEF(&_16$$12);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(input)
+		Z_PARAM_ZVAL(input)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &input_param);
-	zephir_get_strval(&input, input_param);
+	zephir_fetch_params(1, 1, 0, &input);
 
 
-	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, 284, &input, &_2, &_0, &_1);
-	zephir_check_call_status();
+	_0 = Z_TYPE_P(input) != IS_STRING;
+	if (_0) {
+		_0 = Z_TYPE_P(input) != IS_ARRAY;
+	}
+	if (_0) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_html_exception_ce, "Input must be an array or a string", "phalcon/Html/Escaper.zep", 70);
+		return;
+	}
+	if (Z_TYPE_P(input) == IS_STRING) {
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "phphtmlspecialchars", NULL, 0, input);
+		zephir_check_call_status();
+		RETURN_MM();
+	}
+	ZEPHIR_INIT_VAR(&result);
+	ZVAL_STRING(&result, "");
+	zephir_is_iterable(input, 0, "phalcon/Html/Escaper.zep", 100);
+	if (Z_TYPE_P(input) == IS_ARRAY) {
+		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(input), _3, _4, _1)
+		{
+			ZEPHIR_INIT_NVAR(&key);
+			if (_4 != NULL) { 
+				ZVAL_STR_COPY(&key, _4);
+			} else {
+				ZVAL_LONG(&key, _3);
+			}
+			ZEPHIR_INIT_NVAR(&value);
+			ZVAL_COPY(&value, _1);
+			_5$$5 = Z_TYPE_P(&value) == IS_NULL;
+			if (!(_5$$5)) {
+				_5$$5 = ZEPHIR_IS_FALSE_IDENTICAL(&value);
+			}
+			if (_5$$5) {
+				continue;
+			}
+			ZEPHIR_INIT_NVAR(&_6$$5);
+			zephir_fast_trim(&_6$$5, &key, NULL , ZEPHIR_TRIM_BOTH);
+			ZEPHIR_CPY_WRT(&key, &_6$$5);
+			if (Z_TYPE_P(&value) == IS_ARRAY) {
+				ZEPHIR_INIT_NVAR(&_7$$7);
+				zephir_fast_join_str(&_7$$7, SL(" "), &value);
+				ZEPHIR_CPY_WRT(&value, &_7$$7);
+			}
+			ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "phphtmlspecialchars", NULL, 0, &key);
+			zephir_check_call_status();
+			zephir_concat_self(&result, &_8$$5);
+			if (!ZEPHIR_IS_TRUE_IDENTICAL(&value)) {
+				ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "phphtmlspecialchars", NULL, 0, &value);
+				zephir_check_call_status();
+				ZEPHIR_INIT_NVAR(&_10$$8);
+				ZEPHIR_CONCAT_SVS(&_10$$8, "=\"", &_9$$8, "\"");
+				zephir_concat_self(&result, &_10$$8);
+			}
+			zephir_concat_self_str(&result, SL(" "));
+		} ZEND_HASH_FOREACH_END();
+	} else {
+		ZEPHIR_CALL_METHOD(NULL, input, "rewind", NULL, 0);
+		zephir_check_call_status();
+		while (1) {
+			ZEPHIR_CALL_METHOD(&_2, input, "valid", NULL, 0);
+			zephir_check_call_status();
+			if (!zend_is_true(&_2)) {
+				break;
+			}
+			ZEPHIR_CALL_METHOD(&key, input, "key", NULL, 0);
+			zephir_check_call_status();
+			ZEPHIR_CALL_METHOD(&value, input, "current", NULL, 0);
+			zephir_check_call_status();
+				_11$$9 = Z_TYPE_P(&value) == IS_NULL;
+				if (!(_11$$9)) {
+					_11$$9 = ZEPHIR_IS_FALSE_IDENTICAL(&value);
+				}
+				if (_11$$9) {
+					continue;
+				}
+				ZEPHIR_INIT_NVAR(&_12$$9);
+				zephir_fast_trim(&_12$$9, &key, NULL , ZEPHIR_TRIM_BOTH);
+				ZEPHIR_CPY_WRT(&key, &_12$$9);
+				if (Z_TYPE_P(&value) == IS_ARRAY) {
+					ZEPHIR_INIT_NVAR(&_13$$11);
+					zephir_fast_join_str(&_13$$11, SL(" "), &value);
+					ZEPHIR_CPY_WRT(&value, &_13$$11);
+				}
+				ZEPHIR_CALL_METHOD(&_14$$9, this_ptr, "phphtmlspecialchars", NULL, 0, &key);
+				zephir_check_call_status();
+				zephir_concat_self(&result, &_14$$9);
+				if (!ZEPHIR_IS_TRUE_IDENTICAL(&value)) {
+					ZEPHIR_CALL_METHOD(&_15$$12, this_ptr, "phphtmlspecialchars", NULL, 0, &value);
+					zephir_check_call_status();
+					ZEPHIR_INIT_NVAR(&_16$$12);
+					ZEPHIR_CONCAT_SVS(&_16$$12, "=\"", &_15$$12, "\"");
+					zephir_concat_self(&result, &_16$$12);
+				}
+				zephir_concat_self_str(&result, SL(" "));
+			ZEPHIR_CALL_METHOD(NULL, input, "next", NULL, 0);
+			zephir_check_call_status();
+		}
+	}
+	ZEPHIR_INIT_NVAR(&value);
+	ZEPHIR_INIT_NVAR(&key);
+	zephir_fast_trim(return_value, &result, NULL , ZEPHIR_TRIM_RIGHT);
 	RETURN_MM();
 }
 
@@ -230,7 +324,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding)
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "ASCII");
 	zephir_array_fast_append(&_0, &_1);
-	zephir_is_iterable(&_0, 0, "phalcon/Html/Escaper.zep", 127);
+	zephir_is_iterable(&_0, 0, "phalcon/Html/Escaper.zep", 162);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _2)
 		{
@@ -459,6 +553,30 @@ PHP_METHOD(Phalcon_Html_Escaper, escapeUrl)
 	RETURN_MM();
 }
 
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Html_Escaper, getEncoding)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "encoding");
+}
+
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Html_Escaper, getFlags)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "flags");
+}
+
 /**
  * Escapes a HTML string. Internally uses htmlspecialchars
  *
@@ -761,6 +879,46 @@ PHP_METHOD(Phalcon_Html_Escaper, url)
 	RETURN_MM();
 }
 
+/**
+ * Proxy method for testing
+ *
+ * @param string $input
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *input_param = NULL, _0, _1, _2;
+	zval input;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&input);
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_2);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(input)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &input_param);
+	zephir_get_strval(&input, input_param);
+
+
+	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, 284, &input, &_2, &_0, &_1);
+	zephir_check_call_status();
+	RETURN_MM();
+}
+
 /**
  * @param string $input
  *
diff --git a/ext/phalcon/html/escaper.zep.h b/ext/phalcon/html/escaper.zep.h
index 63da903d07e..b7cd84a5982 100644
--- a/ext/phalcon/html/escaper.zep.h
+++ b/ext/phalcon/html/escaper.zep.h
@@ -3,8 +3,6 @@ extern zend_class_entry *phalcon_html_escaper_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Html_Escaper);
 
-PHP_METHOD(Phalcon_Html_Escaper, getEncoding);
-PHP_METHOD(Phalcon_Html_Escaper, getFlags);
 PHP_METHOD(Phalcon_Html_Escaper, attributes);
 PHP_METHOD(Phalcon_Html_Escaper, css);
 PHP_METHOD(Phalcon_Html_Escaper, detectEncoding);
@@ -13,6 +11,8 @@ PHP_METHOD(Phalcon_Html_Escaper, escapeJs);
 PHP_METHOD(Phalcon_Html_Escaper, escapeHtml);
 PHP_METHOD(Phalcon_Html_Escaper, escapeHtmlAttr);
 PHP_METHOD(Phalcon_Html_Escaper, escapeUrl);
+PHP_METHOD(Phalcon_Html_Escaper, getEncoding);
+PHP_METHOD(Phalcon_Html_Escaper, getFlags);
 PHP_METHOD(Phalcon_Html_Escaper, html);
 PHP_METHOD(Phalcon_Html_Escaper, js);
 PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding);
@@ -21,17 +21,12 @@ PHP_METHOD(Phalcon_Html_Escaper, setEncoding);
 PHP_METHOD(Phalcon_Html_Escaper, setFlags);
 PHP_METHOD(Phalcon_Html_Escaper, setHtmlQuoteType);
 PHP_METHOD(Phalcon_Html_Escaper, url);
+PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars);
 PHP_METHOD(Phalcon_Html_Escaper, doEscapeCss);
 PHP_METHOD(Phalcon_Html_Escaper, doEscapeJs);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getencoding, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getflags, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_attributes, 0, 1, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_INFO(0, input)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_css, 0, 1, IS_STRING, 0)
@@ -62,6 +57,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_escapeurl,
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getencoding, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_getflags, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_html, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 1)
 ZEND_END_ARG_INFO()
@@ -94,6 +95,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_url, 0, 1,
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_phphtmlspecialchars, 0, 1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_doescapecss, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -103,8 +108,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_html_escaper_doescapejs,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_html_escaper_method_entry) {
-	PHP_ME(Phalcon_Html_Escaper, getEncoding, arginfo_phalcon_html_escaper_getencoding, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Html_Escaper, getFlags, arginfo_phalcon_html_escaper_getflags, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, attributes, arginfo_phalcon_html_escaper_attributes, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, css, arginfo_phalcon_html_escaper_css, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, detectEncoding, arginfo_phalcon_html_escaper_detectencoding, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC)
@@ -113,6 +116,8 @@ ZEPHIR_INIT_FUNCS(phalcon_html_escaper_method_entry) {
 	PHP_ME(Phalcon_Html_Escaper, escapeHtml, arginfo_phalcon_html_escaper_escapehtml, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, escapeHtmlAttr, arginfo_phalcon_html_escaper_escapehtmlattr, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, escapeUrl, arginfo_phalcon_html_escaper_escapeurl, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Escaper, getEncoding, arginfo_phalcon_html_escaper_getencoding, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Escaper, getFlags, arginfo_phalcon_html_escaper_getflags, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, html, arginfo_phalcon_html_escaper_html, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, js, arginfo_phalcon_html_escaper_js, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, normalizeEncoding, arginfo_phalcon_html_escaper_normalizeencoding, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC)
@@ -121,6 +126,7 @@ ZEPHIR_INIT_FUNCS(phalcon_html_escaper_method_entry) {
 	PHP_ME(Phalcon_Html_Escaper, setFlags, arginfo_phalcon_html_escaper_setflags, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, setHtmlQuoteType, arginfo_phalcon_html_escaper_sethtmlquotetype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Html_Escaper, url, arginfo_phalcon_html_escaper_url, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Html_Escaper, phpHtmlSpecialChars, arginfo_phalcon_html_escaper_phphtmlspecialchars, ZEND_ACC_PROTECTED)
 	PHP_ME(Phalcon_Html_Escaper, doEscapeCss, arginfo_phalcon_html_escaper_doescapecss, ZEND_ACC_PRIVATE)
 	PHP_ME(Phalcon_Html_Escaper, doEscapeJs, arginfo_phalcon_html_escaper_doescapejs, ZEND_ACC_PRIVATE)
 	PHP_FE_END
diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c
index 1b89cbeaf41..3da7acc23fa 100644
--- a/ext/phalcon/http/cookie.zep.c
+++ b/ext/phalcon/http/cookie.zep.c
@@ -555,7 +555,7 @@ PHP_METHOD(Phalcon_Http_Cookie, getValue)
 		if (zephir_is_true(&_2$$4)) {
 			zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_CPY_WRT(&container, &_3$$6);
-			if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+			if (Z_TYPE_P(&container) == IS_NULL) {
 				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'filter' and 'crypt' services", "phalcon/Http/Cookie.zep", 265);
 				return;
 			}
@@ -588,7 +588,7 @@ PHP_METHOD(Phalcon_Http_Cookie, getValue)
 				if (Z_TYPE_P(&container) == IS_NULL) {
 					zephir_read_property(&_7$$14, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&container, &_7$$14);
-					if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+					if (Z_TYPE_P(&container) == IS_NULL) {
 						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Cookie.zep", 314);
 						return;
 					}
@@ -828,7 +828,7 @@ PHP_METHOD(Phalcon_Http_Cookie, send)
 		_7 = !(ZEPHIR_IS_EMPTY(&value));
 	}
 	if (_7) {
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Cookie.zep", 462);
 			return;
 		}
diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c
index 5256b6064cf..03e3e1c41b7 100644
--- a/ext/phalcon/http/request.zep.c
+++ b/ext/phalcon/http/request.zep.c
@@ -12,12 +12,12 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
-#include "kernel/operators.h"
-#include "kernel/memory.h"
 #include "kernel/fcall.h"
+#include "kernel/memory.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/exception.h"
+#include "kernel/operators.h"
+#include "kernel/object.h"
 #include "kernel/array.h"
 #include "kernel/string.h"
 #include "kernel/concat.h"
@@ -93,47 +93,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Request)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "httpMethodParameterOverride");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride)
-{
-	zval *httpMethodParameterOverride_param = NULL, __$true, __$false;
-	zend_bool httpMethodParameterOverride;
-	zval *this_ptr = getThis();
-
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_BOOL(httpMethodParameterOverride)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	zephir_fetch_params_without_memory_grow(1, 0, &httpMethodParameterOverride_param);
-	httpMethodParameterOverride = zephir_get_boolval(httpMethodParameterOverride_param);
-
-
-	if (httpMethodParameterOverride) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$true);
-	} else {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$false);
-	}
-	RETURN_THISW();
-}
-
 /**
  * Gets a variable from the $_REQUEST superglobal applying filters if
  * needed. If no parameters are given the $_REQUEST superglobal is returned
@@ -379,6 +338,20 @@ PHP_METHOD(Phalcon_Http_Request, getBestLanguage)
 	RETURN_MM();
 }
 
+/**
+ * Return the HTTP method parameter override flag
+ *
+ * @return bool
+ */
+PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "httpMethodParameterOverride");
+}
+
 /**
  * Gets the preferred ISO locale variant.
  *
@@ -411,7 +384,7 @@ PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_explode_str(&_0, SL("-"), &language, LONG_MAX);
 	ZEPHIR_CPY_WRT(&language, &_0);
-	zephir_array_fetch_long(&_1, &language, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 180);
+	zephir_array_fetch_long(&_1, &language, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 190);
 	ZEPHIR_CPY_WRT(&language, &_1);
 	ZEPHIR_INIT_VAR(&_2);
 	ZEPHIR_INIT_VAR(&_3);
@@ -480,10 +453,10 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress)
 	if (Z_TYPE_P(&address) != IS_STRING) {
 		RETURN_MM_BOOL(0);
 	}
-	if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 216)) {
+	if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 226)) {
 		ZEPHIR_INIT_VAR(&_0$$7);
 		zephir_fast_explode_str(&_0$$7, SL(","), &address, LONG_MAX);
-		zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 221);
+		zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 231);
 		RETURN_CTOR(&_1$$7);
 	}
 	RETURN_CCTOR(&address);
@@ -586,15 +559,15 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth)
 			RETURN_CTOR(&auth);
 		}
 		if (Z_TYPE_P(&matches) == IS_ARRAY) {
-			zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 275);
+			zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 285);
 			if (Z_TYPE_P(&matches) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$5)
 				{
 					ZEPHIR_INIT_NVAR(&match);
 					ZVAL_COPY(&match, _3$$5);
-					zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 273);
+					zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 283);
 					ZEPHIR_OBS_NVAR(&_6$$6);
-					zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 273);
+					zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 283);
 					zephir_array_update_zval(&auth, &_6$$6, &_5$$6, PH_COPY | PH_SEPARATE);
 				} ZEND_HASH_FOREACH_END();
 			} else {
@@ -608,9 +581,9 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth)
 					}
 					ZEPHIR_CALL_METHOD(&match, &matches, "current", NULL, 0);
 					zephir_check_call_status();
-						zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 273);
+						zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 283);
 						ZEPHIR_OBS_NVAR(&_8$$7);
-						zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 273);
+						zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 283);
 						zephir_array_update_zval(&auth, &_8$$7, &_7$$7, PH_COPY | PH_SEPARATE);
 					ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0);
 					zephir_check_call_status();
@@ -687,7 +660,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilteredQuery)
 
 	ZEPHIR_OBS_VAR(&filters);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY);
-	zephir_array_fetch_string(&_1, &_0, SL("GET"), PH_READONLY, "phalcon/Http/Request.zep", 292);
+	zephir_array_fetch_string(&_1, &_0, SL("GET"), PH_READONLY, "phalcon/Http/Request.zep", 302);
 	if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) {
 		ZEPHIR_INIT_NVAR(&filters);
 		array_init(&filters);
@@ -772,7 +745,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilteredPost)
 
 	ZEPHIR_OBS_VAR(&filters);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY);
-	zephir_array_fetch_string(&_1, &_0, SL("POST"), PH_READONLY, "phalcon/Http/Request.zep", 316);
+	zephir_array_fetch_string(&_1, &_0, SL("POST"), PH_READONLY, "phalcon/Http/Request.zep", 326);
 	if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) {
 		ZEPHIR_INIT_NVAR(&filters);
 		array_init(&filters);
@@ -857,7 +830,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilteredPut)
 
 	ZEPHIR_OBS_VAR(&filters);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY);
-	zephir_array_fetch_string(&_1, &_0, SL("PUT"), PH_READONLY, "phalcon/Http/Request.zep", 340);
+	zephir_array_fetch_string(&_1, &_0, SL("PUT"), PH_READONLY, "phalcon/Http/Request.zep", 350);
 	if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) {
 		ZEPHIR_INIT_NVAR(&filters);
 		array_init(&filters);
@@ -1021,7 +994,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders)
 	zephir_array_update_string(&contentHeaders, SL("CONTENT_MD5"), &__$true, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 338);
 	zephir_check_call_status();
-	zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 441);
+	zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 451);
 	if (Z_TYPE_P(&server) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&server), _2, _3, _0)
 		{
@@ -1246,7 +1219,7 @@ PHP_METHOD(Phalcon_Http_Request, getHttpHost)
 		zephir_fast_trim(&_4$$5, &host, NULL , ZEPHIR_TRIM_BOTH);
 		ZEPHIR_INIT_VAR(&cleanHost);
 		zephir_fast_strtolower(&cleanHost, &_4$$5);
-		if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 515)) {
+		if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 525)) {
 			ZEPHIR_INIT_VAR(&_5$$6);
 			ZVAL_STRING(&_5$$6, "/:[[:digit:]]+$/");
 			ZEPHIR_INIT_VAR(&_6$$6);
@@ -1270,7 +1243,7 @@ PHP_METHOD(Phalcon_Http_Request, getHttpHost)
 			ZEPHIR_CONCAT_SV(&_13$$7, "Invalid host ", &host);
 			ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 339, &_13$$7);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 525);
+			zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 535);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -1478,7 +1451,7 @@ PHP_METHOD(Phalcon_Http_Request, getPort)
 		zephir_check_call_status();
 		RETURN_MM_LONG(zephir_get_intval(&_1$$3));
 	}
-	if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 634)) {
+	if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 644)) {
 		ZEPHIR_INIT_VAR(&_3$$4);
 		ZVAL_STRING(&_3$$4, ":");
 		ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 238, &host, &_3$$4);
@@ -2083,7 +2056,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 	array_init(&files);
 	ZEPHIR_CPY_WRT(&superFiles, &_FILES);
 	if (zephir_fast_count_int(&superFiles) > 0) {
-		zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 900);
+		zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 910);
 		if (Z_TYPE_P(&superFiles) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&superFiles), _2$$3, _3$$3, _0$$3)
 			{
@@ -2096,16 +2069,16 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 				ZEPHIR_INIT_NVAR(&input);
 				ZVAL_COPY(&input, _0$$3);
 				ZEPHIR_OBS_NVAR(&_4$$4);
-				zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 857);
+				zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 867);
 				if (Z_TYPE_P(&_4$$4) == IS_ARRAY) {
-					zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 859);
-					zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 860);
-					zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861);
-					zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862);
-					zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863);
+					zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 869);
+					zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 870);
+					zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 871);
+					zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 872);
+					zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 873);
 					ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 344, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix);
 					zephir_check_call_status();
-					zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890);
+					zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 900);
 					if (Z_TYPE_P(&smoothInput) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _11$$5)
 						{
@@ -2113,43 +2086,43 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 							ZVAL_COPY(&file, _11$$5);
 							_13$$6 = onlySuccessful == 0;
 							if (!(_13$$6)) {
-								zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+								zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 								_13$$6 = ZEPHIR_IS_LONG(&_14$$6, 0);
 							}
 							if (_13$$6) {
 								ZEPHIR_INIT_NVAR(&dataFile);
 								zephir_create_array(&dataFile, 5, 0);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+								zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 								zephir_array_update_string(&dataFile, SL("name"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+								zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 								zephir_array_update_string(&dataFile, SL("type"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+								zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 								zephir_array_update_string(&dataFile, SL("tmp_name"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+								zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 								zephir_array_update_string(&dataFile, SL("size"), &_15$$7, PH_COPY | PH_SEPARATE);
 								ZEPHIR_OBS_NVAR(&_15$$7);
-								zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+								zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 								zephir_array_update_string(&dataFile, SL("error"), &_15$$7, PH_COPY | PH_SEPARATE);
 								if (namedKeys == 1) {
 									ZEPHIR_INIT_NVAR(&_16$$8);
 									object_init_ex(&_16$$8, phalcon_http_request_file_ce);
-									zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+									zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 									ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 345, &dataFile, &_17$$8);
 									zephir_check_call_status();
 									ZEPHIR_OBS_NVAR(&_19$$8);
-									zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+									zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 									zephir_array_update_zval(&files, &_19$$8, &_16$$8, PH_COPY | PH_SEPARATE);
 								} else {
 									ZEPHIR_INIT_NVAR(&_20$$9);
 									object_init_ex(&_20$$9, phalcon_http_request_file_ce);
-									zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+									zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 									ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 345, &dataFile, &_21$$9);
 									zephir_check_call_status();
-									zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+									zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 								}
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -2166,44 +2139,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 							zephir_check_call_status();
 								_22$$10 = onlySuccessful == 0;
 								if (!(_22$$10)) {
-									zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+									zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 									_22$$10 = ZEPHIR_IS_LONG(&_23$$10, 0);
 								}
 								if (_22$$10) {
 									ZEPHIR_INIT_NVAR(&_24$$11);
 									zephir_create_array(&_24$$11, 5, 0);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+									zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 									zephir_array_update_string(&_24$$11, SL("name"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+									zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 									zephir_array_update_string(&_24$$11, SL("type"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+									zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 									zephir_array_update_string(&_24$$11, SL("tmp_name"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+									zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 									zephir_array_update_string(&_24$$11, SL("size"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_25$$11);
-									zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+									zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 									zephir_array_update_string(&_24$$11, SL("error"), &_25$$11, PH_COPY | PH_SEPARATE);
 									ZEPHIR_CPY_WRT(&dataFile, &_24$$11);
 									if (namedKeys == 1) {
 										ZEPHIR_INIT_NVAR(&_26$$12);
 										object_init_ex(&_26$$12, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+										zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 										ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 345, &dataFile, &_27$$12);
 										zephir_check_call_status();
 										ZEPHIR_OBS_NVAR(&_28$$12);
-										zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+										zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 										zephir_array_update_zval(&files, &_28$$12, &_26$$12, PH_COPY | PH_SEPARATE);
 									} else {
 										ZEPHIR_INIT_NVAR(&_29$$13);
 										object_init_ex(&_29$$13, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+										zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 										ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 345, &dataFile, &_30$$13);
 										zephir_check_call_status();
-										zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+										zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 									}
 								}
 							ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0);
@@ -2214,7 +2187,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 				} else {
 					_31$$14 = onlySuccessful == 0;
 					if (!(_31$$14)) {
-						zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
+						zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 901);
 						_31$$14 = ZEPHIR_IS_LONG(&_32$$14, 0);
 					}
 					if (_31$$14) {
@@ -2229,7 +2202,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 							object_init_ex(&_34$$17, phalcon_http_request_file_ce);
 							ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 345, &input, &prefix);
 							zephir_check_call_status();
-							zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 895);
+							zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 905);
 						}
 					}
 				}
@@ -2248,16 +2221,16 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 				ZEPHIR_CALL_METHOD(&input, &superFiles, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&_35$$18);
-					zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 857);
+					zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 867);
 					if (Z_TYPE_P(&_35$$18) == IS_ARRAY) {
-						zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 859);
-						zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 860);
-						zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861);
-						zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862);
-						zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863);
+						zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 869);
+						zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 870);
+						zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 871);
+						zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 872);
+						zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 873);
 						ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 344, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix);
 						zephir_check_call_status();
-						zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890);
+						zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 900);
 						if (Z_TYPE_P(&smoothInput) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _41$$19)
 							{
@@ -2265,44 +2238,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 								ZVAL_COPY(&file, _41$$19);
 								_43$$20 = onlySuccessful == 0;
 								if (!(_43$$20)) {
-									zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+									zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 									_43$$20 = ZEPHIR_IS_LONG(&_44$$20, 0);
 								}
 								if (_43$$20) {
 									ZEPHIR_INIT_NVAR(&_45$$21);
 									zephir_create_array(&_45$$21, 5, 0);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+									zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 									zephir_array_update_string(&_45$$21, SL("name"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+									zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 									zephir_array_update_string(&_45$$21, SL("type"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+									zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 									zephir_array_update_string(&_45$$21, SL("tmp_name"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+									zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 									zephir_array_update_string(&_45$$21, SL("size"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_OBS_NVAR(&_46$$21);
-									zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+									zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 									zephir_array_update_string(&_45$$21, SL("error"), &_46$$21, PH_COPY | PH_SEPARATE);
 									ZEPHIR_CPY_WRT(&dataFile, &_45$$21);
 									if (namedKeys == 1) {
 										ZEPHIR_INIT_NVAR(&_47$$22);
 										object_init_ex(&_47$$22, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+										zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 										ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 345, &dataFile, &_48$$22);
 										zephir_check_call_status();
 										ZEPHIR_OBS_NVAR(&_49$$22);
-										zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+										zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 										zephir_array_update_zval(&files, &_49$$22, &_47$$22, PH_COPY | PH_SEPARATE);
 									} else {
 										ZEPHIR_INIT_NVAR(&_50$$23);
 										object_init_ex(&_50$$23, phalcon_http_request_file_ce);
-										zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+										zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 										ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 345, &dataFile, &_51$$23);
 										zephir_check_call_status();
-										zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+										zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 									}
 								}
 							} ZEND_HASH_FOREACH_END();
@@ -2319,44 +2292,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 								zephir_check_call_status();
 									_52$$24 = onlySuccessful == 0;
 									if (!(_52$$24)) {
-										zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 868);
+										zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 878);
 										_52$$24 = ZEPHIR_IS_LONG(&_53$$24, 0);
 									}
 									if (_52$$24) {
 										ZEPHIR_INIT_NVAR(&_54$$25);
 										zephir_create_array(&_54$$25, 5, 0);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 870);
+										zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 880);
 										zephir_array_update_string(&_54$$25, SL("name"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 871);
+										zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 881);
 										zephir_array_update_string(&_54$$25, SL("type"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 872);
+										zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 882);
 										zephir_array_update_string(&_54$$25, SL("tmp_name"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 873);
+										zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 883);
 										zephir_array_update_string(&_54$$25, SL("size"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_OBS_NVAR(&_55$$25);
-										zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 875);
+										zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 885);
 										zephir_array_update_string(&_54$$25, SL("error"), &_55$$25, PH_COPY | PH_SEPARATE);
 										ZEPHIR_CPY_WRT(&dataFile, &_54$$25);
 										if (namedKeys == 1) {
 											ZEPHIR_INIT_NVAR(&_56$$26);
 											object_init_ex(&_56$$26, phalcon_http_request_file_ce);
-											zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881);
+											zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
 											ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 345, &dataFile, &_57$$26);
 											zephir_check_call_status();
 											ZEPHIR_OBS_NVAR(&_58$$26);
-											zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878);
+											zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 888);
 											zephir_array_update_zval(&files, &_58$$26, &_56$$26, PH_COPY | PH_SEPARATE);
 										} else {
 											ZEPHIR_INIT_NVAR(&_59$$27);
 											object_init_ex(&_59$$27, phalcon_http_request_file_ce);
-											zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886);
+											zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 896);
 											ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 345, &dataFile, &_60$$27);
 											zephir_check_call_status();
-											zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 886);
+											zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 896);
 										}
 									}
 								ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0);
@@ -2367,7 +2340,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 					} else {
 						_61$$28 = onlySuccessful == 0;
 						if (!(_61$$28)) {
-							zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891);
+							zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 901);
 							_61$$28 = ZEPHIR_IS_LONG(&_62$$28, 0);
 						}
 						if (_61$$28) {
@@ -2382,7 +2355,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles)
 								object_init_ex(&_64$$31, phalcon_http_request_file_ce);
 								ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 345, &input, &prefix);
 								zephir_check_call_status();
-								zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 895);
+								zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 905);
 							}
 						}
 					}
@@ -2453,7 +2426,7 @@ PHP_METHOD(Phalcon_Http_Request, getURI)
 		ZEPHIR_INIT_VAR(&_2$$4);
 		ZVAL_STRING(&_2$$4, "?");
 		zephir_fast_explode(&_1$$4, &_2$$4, &requestURI, LONG_MAX);
-		zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 929);
+		zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 939);
 		ZEPHIR_CPY_WRT(&requestURI, &_3$$4);
 	}
 	RETURN_CCTOR(&requestURI);
@@ -2934,14 +2907,14 @@ PHP_METHOD(Phalcon_Http_Request, isMethod)
 			ZEPHIR_CONCAT_SV(&_3$$4, "Invalid HTTP method: ", methods);
 			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 29, &_3$$4);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1075);
+			zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1085);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(methods, &httpMethod));
 	}
 	if (Z_TYPE_P(methods) == IS_ARRAY) {
-		zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1088);
+		zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1098);
 		if (Z_TYPE_P(methods) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(methods), _4$$5)
 			{
@@ -2987,7 +2960,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod)
 		RETURN_MM_BOOL(0);
 	}
 	if (UNEXPECTED(strict)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1092);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1102);
 		return;
 	}
 	RETURN_MM_BOOL(0);
@@ -3160,7 +3133,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap)
 	if (ZEPHIR_IS_EMPTY(&contentType)) {
 		RETURN_MM_BOOL(0);
 	}
-	RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1177));
+	RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1187));
 }
 
 /**
@@ -3265,7 +3238,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles)
 	if (Z_TYPE_P(&files) != IS_ARRAY) {
 		RETURN_MM_LONG(0);
 	}
-	zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1242);
+	zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1252);
 	if (Z_TYPE_P(&files) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&files), _0)
 		{
@@ -3335,6 +3308,41 @@ PHP_METHOD(Phalcon_Http_Request, numFiles)
 	RETURN_MM_LONG(numberFiles);
 }
 
+/**
+ * Set the HTTP method parameter override flag
+ *
+ * @param bool $override
+ *
+ * @return Request
+ */
+PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride)
+{
+	zval *override_param = NULL, __$true, __$false;
+	zend_bool override;
+	zval *this_ptr = getThis();
+
+	ZVAL_BOOL(&__$true, 1);
+	ZVAL_BOOL(&__$false, 0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_BOOL(override)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	zephir_fetch_params_without_memory_grow(1, 0, &override_param);
+	override = zephir_get_boolval(override_param);
+
+
+	if (override) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$true);
+	} else {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("httpMethodParameterOverride"), &__$false);
+	}
+	RETURN_THISW();
+}
+
 /**
  * Sets automatic sanitizers/filters for a particular field and for
  * particular methods
@@ -3412,13 +3420,13 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 		ZEPHIR_CONCAT_SVS(&_1$$3, "Filters have not been defined for '", &name, "'");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1259);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1283);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 349);
 	zephir_check_call_status();
-	zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1272);
+	zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1296);
 	if (Z_TYPE_P(&filters) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2)
 		{
@@ -3433,7 +3441,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 				ZEPHIR_CONCAT_SVS(&_7$$5, "Sanitizer '", &sanitizer, "' does not exist in the filter locator");
 				ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 29, &_7$$5);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1268);
+				zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1292);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -3458,7 +3466,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 					ZEPHIR_CONCAT_SVS(&_11$$7, "Sanitizer '", &sanitizer, "' does not exist in the filter locator");
 					ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", NULL, 29, &_11$$7);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1268);
+					zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1292);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -3482,7 +3490,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters)
 	} else {
 		ZEPHIR_CPY_WRT(&localScope, &scope);
 	}
-	zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1286);
+	zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1310);
 	if (Z_TYPE_P(&localScope) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&localScope), _13)
 		{
@@ -3600,7 +3608,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality)
 	quality = 0.0;
 	ZEPHIR_INIT_VAR(&selectedName);
 	ZVAL_STRING(&selectedName, "");
-	zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1329);
+	zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1353);
 	if (Z_TYPE_P(&qualityParts) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&qualityParts), _0)
 		{
@@ -3608,18 +3616,18 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality)
 			ZVAL_COPY(&accept, _0);
 			if (i == 0) {
 				ZEPHIR_OBS_NVAR(&_2$$4);
-				zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1315);
+				zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1339);
 				quality = zephir_get_doubleval(&_2$$4);
 				ZEPHIR_OBS_NVAR(&selectedName);
-				zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1316);
+				zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1340);
 			} else {
 				ZEPHIR_OBS_NVAR(&_3$$5);
-				zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1318);
+				zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1342);
 				acceptQuality = zephir_get_doubleval(&_3$$5);
 				if (acceptQuality > quality) {
 					quality = acceptQuality;
 					ZEPHIR_OBS_NVAR(&selectedName);
-					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1322);
+					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1346);
 				}
 			}
 			i++;
@@ -3637,18 +3645,18 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality)
 			zephir_check_call_status();
 				if (i == 0) {
 					ZEPHIR_OBS_NVAR(&_4$$8);
-					zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1315);
+					zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1339);
 					quality = zephir_get_doubleval(&_4$$8);
 					ZEPHIR_OBS_NVAR(&selectedName);
-					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1316);
+					zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1340);
 				} else {
 					ZEPHIR_OBS_NVAR(&_5$$9);
-					zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1318);
+					zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1342);
 					acceptQuality = zephir_get_doubleval(&_5$$9);
 					if (acceptQuality > quality) {
 						quality = acceptQuality;
 						ZEPHIR_OBS_NVAR(&selectedName);
-						zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1322);
+						zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1346);
 					}
 				}
 				i++;
@@ -3809,7 +3817,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper)
 	if (Z_TYPE_P(data) != IS_ARRAY) {
 		RETURN_MM_LONG(1);
 	}
-	zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1398);
+	zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1422);
 	if (Z_TYPE_P(data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), _0)
 		{
@@ -3990,7 +3998,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 	ZVAL_LONG(&_3, 1);
 	ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 67, &_1, &serverValue, &_2, &_3);
 	zephir_check_call_status();
-	zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1442);
+	zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1466);
 	if (Z_TYPE_P(&parts) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parts), _4)
 		{
@@ -4006,7 +4014,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 			ZVAL_LONG(&_9$$3, 1);
 			ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 67, &_7$$3, &_6$$3, &_8$$3, &_9$$3);
 			zephir_check_call_status();
-			zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1439);
+			zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1463);
 			if (Z_TYPE_P(&headerSplit) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _10$$3)
 				{
@@ -4019,17 +4027,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 					if (!ZEPHIR_IS_FALSE_IDENTICAL(&_13$$4)) {
 						ZEPHIR_INIT_NVAR(&split);
 						zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-						zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+						zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 						if (ZEPHIR_IS_STRING_IDENTICAL(&_14$$5, "q")) {
 							ZEPHIR_OBS_NVAR(&_15$$6);
-							zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+							zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 							ZEPHIR_INIT_NVAR(&_16$$6);
 							ZVAL_DOUBLE(&_16$$6, zephir_get_doubleval(&_15$$6));
 							zephir_array_update_string(&headerParts, SL("quality"), &_16$$6, PH_COPY | PH_SEPARATE);
 						} else {
-							zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+							zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 							ZEPHIR_OBS_NVAR(&_18$$7);
-							zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+							zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 							zephir_array_update_zval(&headerParts, &_18$$7, &_17$$7, PH_COPY | PH_SEPARATE);
 						}
 					} else {
@@ -4057,17 +4065,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 						if (!ZEPHIR_IS_FALSE_IDENTICAL(&_21$$9)) {
 							ZEPHIR_INIT_NVAR(&split);
 							zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-							zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+							zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 							if (ZEPHIR_IS_STRING_IDENTICAL(&_22$$10, "q")) {
 								ZEPHIR_OBS_NVAR(&_23$$11);
-								zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+								zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 								ZEPHIR_INIT_NVAR(&_24$$11);
 								ZVAL_DOUBLE(&_24$$11, zephir_get_doubleval(&_23$$11));
 								zephir_array_update_string(&headerParts, SL("quality"), &_24$$11, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 								ZEPHIR_OBS_NVAR(&_26$$12);
-								zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 								zephir_array_update_zval(&headerParts, &_26$$12, &_25$$12, PH_COPY | PH_SEPARATE);
 							}
 						} else {
@@ -4081,7 +4089,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 				}
 			}
 			ZEPHIR_INIT_NVAR(&headerPart);
-			zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1439);
+			zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1463);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0);
@@ -4104,7 +4112,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 				ZVAL_LONG(&_31$$14, 1);
 				ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 67, &_29$$14, &_28$$14, &_30$$14, &_31$$14);
 				zephir_check_call_status();
-				zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1439);
+				zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1463);
 				if (Z_TYPE_P(&headerSplit) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _32$$14)
 					{
@@ -4117,17 +4125,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 						if (!ZEPHIR_IS_FALSE_IDENTICAL(&_35$$15)) {
 							ZEPHIR_INIT_NVAR(&split);
 							zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-							zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+							zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 							if (ZEPHIR_IS_STRING_IDENTICAL(&_36$$16, "q")) {
 								ZEPHIR_OBS_NVAR(&_37$$17);
-								zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+								zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 								ZEPHIR_INIT_NVAR(&_38$$17);
 								ZVAL_DOUBLE(&_38$$17, zephir_get_doubleval(&_37$$17));
 								zephir_array_update_string(&headerParts, SL("quality"), &_38$$17, PH_COPY | PH_SEPARATE);
 							} else {
-								zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 								ZEPHIR_OBS_NVAR(&_40$$18);
-								zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+								zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 								zephir_array_update_zval(&headerParts, &_40$$18, &_39$$18, PH_COPY | PH_SEPARATE);
 							}
 						} else {
@@ -4155,17 +4163,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 							if (!ZEPHIR_IS_FALSE_IDENTICAL(&_43$$20)) {
 								ZEPHIR_INIT_NVAR(&split);
 								zephir_fast_explode_str(&split, SL("="), &headerPart, 2 );
-								zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1428);
+								zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1452);
 								if (ZEPHIR_IS_STRING_IDENTICAL(&_44$$21, "q")) {
 									ZEPHIR_OBS_NVAR(&_45$$22);
-									zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1429);
+									zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1453);
 									ZEPHIR_INIT_NVAR(&_46$$22);
 									ZVAL_DOUBLE(&_46$$22, zephir_get_doubleval(&_45$$22));
 									zephir_array_update_string(&headerParts, SL("quality"), &_46$$22, PH_COPY | PH_SEPARATE);
 								} else {
-									zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1431);
+									zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1455);
 									ZEPHIR_OBS_NVAR(&_48$$23);
-									zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1431);
+									zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1455);
 									zephir_array_update_zval(&headerParts, &_48$$23, &_47$$23, PH_COPY | PH_SEPARATE);
 								}
 							} else {
@@ -4179,7 +4187,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
 					}
 				}
 				ZEPHIR_INIT_NVAR(&headerPart);
-				zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1439);
+				zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1463);
 			ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -4193,57 +4201,57 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader)
  */
 PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders)
 {
-	zval headers, _6$$5, _37$$19;
-	zend_bool hasEventsManager = 0, _5, _10, _36, _23$$11;
-	zval resolved, eventsManager, container, exploded, digest, authHeader, server, _0, _9, _11, _1$$3, _2$$3, _3$$4, _4$$4, _7$$5, _8$$6, _12$$7, _13$$7, _14$$7, _15$$8, _16$$8, _17$$8, _18$$9, _19$$10, _20$$11, _21$$11, _22$$11, _24$$11, _25$$11, _26$$12, _27$$12, _28$$12, _29$$13, _30$$13, _31$$17, _32$$17, _33$$17, _34$$17, _35$$17, _38$$19, _39$$20;
+	zend_bool _4, _9, _35, _22$$11;
+	zval headers, _5$$5, _36$$19;
+	zval resolved, eventsManager, hasEventsManager, container, exploded, digest, authHeader, server, _0, _8, _10, _1$$3, _2$$4, _3$$4, _6$$5, _7$$6, _11$$7, _12$$7, _13$$7, _14$$8, _15$$8, _16$$8, _17$$9, _18$$10, _19$$11, _20$$11, _21$$11, _23$$11, _24$$11, _25$$12, _26$$12, _27$$12, _28$$13, _29$$13, _30$$17, _31$$17, _32$$17, _33$$17, _34$$17, _37$$19, _38$$20;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&resolved);
 	ZVAL_UNDEF(&eventsManager);
+	ZVAL_UNDEF(&hasEventsManager);
 	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&exploded);
 	ZVAL_UNDEF(&digest);
 	ZVAL_UNDEF(&authHeader);
 	ZVAL_UNDEF(&server);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_9);
-	ZVAL_UNDEF(&_11);
+	ZVAL_UNDEF(&_8);
+	ZVAL_UNDEF(&_10);
 	ZVAL_UNDEF(&_1$$3);
-	ZVAL_UNDEF(&_2$$3);
+	ZVAL_UNDEF(&_2$$4);
 	ZVAL_UNDEF(&_3$$4);
-	ZVAL_UNDEF(&_4$$4);
-	ZVAL_UNDEF(&_7$$5);
-	ZVAL_UNDEF(&_8$$6);
+	ZVAL_UNDEF(&_6$$5);
+	ZVAL_UNDEF(&_7$$6);
+	ZVAL_UNDEF(&_11$$7);
 	ZVAL_UNDEF(&_12$$7);
 	ZVAL_UNDEF(&_13$$7);
-	ZVAL_UNDEF(&_14$$7);
+	ZVAL_UNDEF(&_14$$8);
 	ZVAL_UNDEF(&_15$$8);
 	ZVAL_UNDEF(&_16$$8);
-	ZVAL_UNDEF(&_17$$8);
-	ZVAL_UNDEF(&_18$$9);
-	ZVAL_UNDEF(&_19$$10);
+	ZVAL_UNDEF(&_17$$9);
+	ZVAL_UNDEF(&_18$$10);
+	ZVAL_UNDEF(&_19$$11);
 	ZVAL_UNDEF(&_20$$11);
 	ZVAL_UNDEF(&_21$$11);
-	ZVAL_UNDEF(&_22$$11);
+	ZVAL_UNDEF(&_23$$11);
 	ZVAL_UNDEF(&_24$$11);
-	ZVAL_UNDEF(&_25$$11);
+	ZVAL_UNDEF(&_25$$12);
 	ZVAL_UNDEF(&_26$$12);
 	ZVAL_UNDEF(&_27$$12);
-	ZVAL_UNDEF(&_28$$12);
+	ZVAL_UNDEF(&_28$$13);
 	ZVAL_UNDEF(&_29$$13);
-	ZVAL_UNDEF(&_30$$13);
+	ZVAL_UNDEF(&_30$$17);
 	ZVAL_UNDEF(&_31$$17);
 	ZVAL_UNDEF(&_32$$17);
 	ZVAL_UNDEF(&_33$$17);
 	ZVAL_UNDEF(&_34$$17);
-	ZVAL_UNDEF(&_35$$17);
-	ZVAL_UNDEF(&_38$$19);
-	ZVAL_UNDEF(&_39$$20);
-	ZVAL_UNDEF(&headers);
-	ZVAL_UNDEF(&_6$$5);
 	ZVAL_UNDEF(&_37$$19);
+	ZVAL_UNDEF(&_38$$20);
+	ZVAL_UNDEF(&headers);
+	ZVAL_UNDEF(&_5$$5);
+	ZVAL_UNDEF(&_36$$19);
 
 
 	ZEPHIR_MM_GROW();
@@ -4257,119 +4265,118 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders)
 	ZEPHIR_CPY_WRT(&container, &_0);
 	ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 338);
 	zephir_check_call_status();
-	if (Z_TYPE_P(&container) == IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_2$$3);
-		ZVAL_STRING(&_2$$3, "eventsManager");
-		ZEPHIR_CALL_METHOD(&_1$$3, &container, "has", NULL, 0, &_2$$3);
+	if (Z_TYPE_P(&container) != IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_STRING(&_1$$3, "eventsManager");
+		ZEPHIR_CALL_METHOD(&hasEventsManager, &container, "has", NULL, 0, &_1$$3);
 		zephir_check_call_status();
-		hasEventsManager = zephir_get_boolval(&_1$$3);
-		if (hasEventsManager) {
-			ZEPHIR_INIT_VAR(&_4$$4);
-			ZVAL_STRING(&_4$$4, "eventsManager");
-			ZEPHIR_CALL_METHOD(&_3$$4, &container, "getshared", NULL, 0, &_4$$4);
+		if (zephir_is_true(&hasEventsManager)) {
+			ZEPHIR_INIT_VAR(&_3$$4);
+			ZVAL_STRING(&_3$$4, "eventsManager");
+			ZEPHIR_CALL_METHOD(&_2$$4, &container, "getshared", NULL, 0, &_3$$4);
 			zephir_check_call_status();
-			ZEPHIR_CPY_WRT(&eventsManager, &_3$$4);
+			ZEPHIR_CPY_WRT(&eventsManager, &_2$$4);
 		}
 	}
-	_5 = hasEventsManager;
-	if (_5) {
-		_5 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
+	_4 = zephir_is_true(&hasEventsManager);
+	if (_4) {
+		_4 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
 	}
-	if (_5) {
+	if (_4) {
+		ZEPHIR_INIT_VAR(&_5$$5);
+		zephir_create_array(&_5$$5, 1, 0);
+		zephir_array_update_string(&_5$$5, SL("server"), &server, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_6$$5);
-		zephir_create_array(&_6$$5, 1, 0);
-		zephir_array_update_string(&_6$$5, SL("server"), &server, PH_COPY | PH_SEPARATE);
-		ZEPHIR_INIT_VAR(&_7$$5);
-		ZVAL_STRING(&_7$$5, "request:beforeAuthorizationResolve");
-		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_7$$5, this_ptr, &_6$$5);
+		ZVAL_STRING(&_6$$5, "request:beforeAuthorizationResolve");
+		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_6$$5, this_ptr, &_5$$5);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&resolved) == IS_ARRAY) {
-			ZEPHIR_INIT_VAR(&_8$$6);
-			zephir_fast_array_merge(&_8$$6, &headers, &resolved);
-			ZEPHIR_CPY_WRT(&headers, &_8$$6);
+			ZEPHIR_INIT_VAR(&_7$$6);
+			zephir_fast_array_merge(&_7$$6, &headers, &resolved);
+			ZEPHIR_CPY_WRT(&headers, &_7$$6);
 		}
 	}
-	ZEPHIR_INIT_VAR(&_9);
-	ZVAL_STRING(&_9, "PHP_AUTH_USER");
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 336, &_9);
+	ZEPHIR_INIT_VAR(&_8);
+	ZVAL_STRING(&_8, "PHP_AUTH_USER");
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 336, &_8);
 	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, 336, &_9);
+	_9 = zephir_is_true(&_0);
+	if (_9) {
+		ZEPHIR_INIT_NVAR(&_8);
+		ZVAL_STRING(&_8, "PHP_AUTH_PW");
+		ZEPHIR_CALL_METHOD(&_10, this_ptr, "hasserver", NULL, 336, &_8);
 		zephir_check_call_status();
-		_10 = zephir_is_true(&_11);
+		_9 = zephir_is_true(&_10);
 	}
-	if (_10) {
-		ZEPHIR_INIT_VAR(&_13$$7);
-		ZVAL_STRING(&_13$$7, "PHP_AUTH_USER");
-		ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getserver", NULL, 0, &_13$$7);
+	if (_9) {
+		ZEPHIR_INIT_VAR(&_12$$7);
+		ZVAL_STRING(&_12$$7, "PHP_AUTH_USER");
+		ZEPHIR_CALL_METHOD(&_11$$7, this_ptr, "getserver", NULL, 0, &_12$$7);
 		zephir_check_call_status();
-		zephir_array_update_string(&headers, SL("Php-Auth-User"), &_12$$7, PH_COPY | PH_SEPARATE);
-		ZEPHIR_INIT_NVAR(&_13$$7);
-		ZVAL_STRING(&_13$$7, "PHP_AUTH_PW");
-		ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "getserver", NULL, 0, &_13$$7);
+		zephir_array_update_string(&headers, SL("Php-Auth-User"), &_11$$7, PH_COPY | PH_SEPARATE);
+		ZEPHIR_INIT_NVAR(&_12$$7);
+		ZVAL_STRING(&_12$$7, "PHP_AUTH_PW");
+		ZEPHIR_CALL_METHOD(&_13$$7, this_ptr, "getserver", NULL, 0, &_12$$7);
 		zephir_check_call_status();
-		zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_14$$7, PH_COPY | PH_SEPARATE);
+		zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_13$$7, PH_COPY | PH_SEPARATE);
 	} else {
-		ZEPHIR_INIT_VAR(&_16$$8);
-		ZVAL_STRING(&_16$$8, "HTTP_AUTHORIZATION");
-		ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 336, &_16$$8);
+		ZEPHIR_INIT_VAR(&_15$$8);
+		ZVAL_STRING(&_15$$8, "HTTP_AUTHORIZATION");
+		ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "hasserver", NULL, 336, &_15$$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, 336, &_16$$8);
+		ZEPHIR_INIT_NVAR(&_15$$8);
+		ZVAL_STRING(&_15$$8, "REDIRECT_HTTP_AUTHORIZATION");
+		ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "hasserver", NULL, 336, &_15$$8);
 		zephir_check_call_status();
-		if (zephir_is_true(&_15$$8)) {
-			ZEPHIR_INIT_VAR(&_18$$9);
-			ZVAL_STRING(&_18$$9, "HTTP_AUTHORIZATION");
-			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_18$$9);
+		if (zephir_is_true(&_14$$8)) {
+			ZEPHIR_INIT_VAR(&_17$$9);
+			ZVAL_STRING(&_17$$9, "HTTP_AUTHORIZATION");
+			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_17$$9);
 			zephir_check_call_status();
-		} else if (zephir_is_true(&_17$$8)) {
-			ZEPHIR_INIT_VAR(&_19$$10);
-			ZVAL_STRING(&_19$$10, "REDIRECT_HTTP_AUTHORIZATION");
-			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_19$$10);
+		} else if (zephir_is_true(&_16$$8)) {
+			ZEPHIR_INIT_VAR(&_18$$10);
+			ZVAL_STRING(&_18$$10, "REDIRECT_HTTP_AUTHORIZATION");
+			ZEPHIR_CALL_METHOD(&authHeader, this_ptr, "getserver", NULL, 0, &_18$$10);
 			zephir_check_call_status();
 		}
 		if (zephir_is_true(&authHeader)) {
-			ZEPHIR_INIT_VAR(&_20$$11);
-			ZVAL_STRING(&_20$$11, "basic ");
-			ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 341, &authHeader, &_20$$11);
+			ZEPHIR_INIT_VAR(&_19$$11);
+			ZVAL_STRING(&_19$$11, "basic ");
+			ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 341, &authHeader, &_19$$11);
 			zephir_check_call_status();
-			ZEPHIR_INIT_NVAR(&_20$$11);
-			ZVAL_STRING(&_20$$11, "digest ");
-			ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 341, &authHeader, &_20$$11);
+			ZEPHIR_INIT_NVAR(&_19$$11);
+			ZVAL_STRING(&_19$$11, "digest ");
+			ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 341, &authHeader, &_19$$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, 336, &_20$$11);
+			_22$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0);
+			if (_22$$11) {
+				ZEPHIR_INIT_NVAR(&_19$$11);
+				ZVAL_STRING(&_19$$11, "PHP_AUTH_DIGEST");
+				ZEPHIR_CALL_METHOD(&_23$$11, this_ptr, "hasserver", NULL, 336, &_19$$11);
 				zephir_check_call_status();
-				_23$$11 = !zephir_is_true(&_24$$11);
+				_22$$11 = !zephir_is_true(&_23$$11);
 			}
-			ZEPHIR_INIT_NVAR(&_20$$11);
-			ZVAL_STRING(&_20$$11, "bearer ");
-			ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 341, &authHeader, &_20$$11);
+			ZEPHIR_INIT_NVAR(&_19$$11);
+			ZVAL_STRING(&_19$$11, "bearer ");
+			ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 341, &authHeader, &_19$$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, 226, &_27$$12);
+			if (ZEPHIR_IS_LONG_IDENTICAL(&_20$$11, 0)) {
+				ZVAL_LONG(&_25$$12, 6);
+				ZEPHIR_INIT_VAR(&_26$$12);
+				zephir_substr(&_26$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
+				ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 226, &_26$$12);
 				zephir_check_call_status();
 				ZEPHIR_INIT_VAR(&exploded);
-				zephir_fast_explode_str(&exploded, SL(":"), &_28$$12, 2 );
+				zephir_fast_explode_str(&exploded, SL(":"), &_27$$12, 2 );
 				if (zephir_fast_count_int(&exploded) == 2) {
-					zephir_array_fetch_long(&_29$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1501);
-					zephir_array_update_string(&headers, SL("Php-Auth-User"), &_29$$13, PH_COPY | PH_SEPARATE);
-					zephir_array_fetch_long(&_30$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1502);
-					zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_30$$13, PH_COPY | PH_SEPARATE);
+					zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1525);
+					zephir_array_update_string(&headers, SL("Php-Auth-User"), &_28$$13, PH_COPY | PH_SEPARATE);
+					zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1526);
+					zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_29$$13, PH_COPY | PH_SEPARATE);
 				}
-			} else if (_23$$11) {
+			} else if (_22$$11) {
 				zephir_array_update_string(&headers, SL("Php-Auth-Digest"), &authHeader, PH_COPY | PH_SEPARATE);
-			} else if (ZEPHIR_IS_LONG_IDENTICAL(&_25$$11, 0)) {
+			} else if (ZEPHIR_IS_LONG_IDENTICAL(&_24$$11, 0)) {
 				zephir_array_update_string(&headers, SL("Authorization"), &authHeader, PH_COPY | PH_SEPARATE);
 			}
 		}
@@ -4377,36 +4384,36 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders)
 	if (!(zephir_array_isset_string(&headers, SL("Authorization")))) {
 		ZEPHIR_OBS_VAR(&digest);
 		if (zephir_array_isset_string(&headers, SL("Php-Auth-User"))) {
-			zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1514);
-			zephir_array_fetch_string(&_32$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1514);
-			ZEPHIR_INIT_VAR(&_33$$17);
-			ZEPHIR_CONCAT_VSV(&_33$$17, &_31$$17, ":", &_32$$17);
-			ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 227, &_33$$17);
+			zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1538);
+			zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1538);
+			ZEPHIR_INIT_VAR(&_32$$17);
+			ZEPHIR_CONCAT_VSV(&_32$$17, &_30$$17, ":", &_31$$17);
+			ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 227, &_32$$17);
 			zephir_check_call_status();
-			ZEPHIR_INIT_VAR(&_35$$17);
-			ZEPHIR_CONCAT_SV(&_35$$17, "Basic ", &_34$$17);
-			zephir_array_update_string(&headers, SL("Authorization"), &_35$$17, PH_COPY | PH_SEPARATE);
+			ZEPHIR_INIT_VAR(&_34$$17);
+			ZEPHIR_CONCAT_SV(&_34$$17, "Basic ", &_33$$17);
+			zephir_array_update_string(&headers, SL("Authorization"), &_34$$17, PH_COPY | PH_SEPARATE);
 		} else if (zephir_array_isset_string_fetch(&digest, &headers, SL("Php-Auth-Digest"), 0)) {
 			zephir_array_update_string(&headers, SL("Authorization"), &digest, PH_COPY | PH_SEPARATE);
 		}
 	}
-	_36 = hasEventsManager;
-	if (_36) {
-		_36 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
+	_35 = zephir_is_true(&hasEventsManager);
+	if (_35) {
+		_35 = Z_TYPE_P(&eventsManager) == IS_OBJECT;
 	}
-	if (_36) {
+	if (_35) {
+		ZEPHIR_INIT_VAR(&_36$$19);
+		zephir_create_array(&_36$$19, 2, 0);
+		zephir_array_update_string(&_36$$19, SL("headers"), &headers, PH_COPY | PH_SEPARATE);
+		zephir_array_update_string(&_36$$19, SL("server"), &server, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_37$$19);
-		zephir_create_array(&_37$$19, 2, 0);
-		zephir_array_update_string(&_37$$19, SL("headers"), &headers, PH_COPY | PH_SEPARATE);
-		zephir_array_update_string(&_37$$19, SL("server"), &server, PH_COPY | PH_SEPARATE);
-		ZEPHIR_INIT_VAR(&_38$$19);
-		ZVAL_STRING(&_38$$19, "request:afterAuthorizationResolve");
-		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_38$$19, this_ptr, &_37$$19);
+		ZVAL_STRING(&_37$$19, "request:afterAuthorizationResolve");
+		ZEPHIR_CALL_METHOD(&resolved, &eventsManager, "fire", NULL, 0, &_37$$19, this_ptr, &_36$$19);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&resolved) == IS_ARRAY) {
-			ZEPHIR_INIT_VAR(&_39$$20);
-			zephir_fast_array_merge(&_39$$20, &headers, &resolved);
-			ZEPHIR_CPY_WRT(&headers, &_39$$20);
+			ZEPHIR_INIT_VAR(&_38$$20);
+			zephir_fast_array_merge(&_38$$20, &headers, &resolved);
+			ZEPHIR_CPY_WRT(&headers, &_38$$20);
 		}
 	}
 	RETURN_CTOR(&headers);
@@ -4481,7 +4488,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 
 	ZEPHIR_INIT_VAR(&files);
 	array_init(&files);
-	zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1578);
+	zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1602);
 	if (Z_TYPE_P(&names) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&names), _2, _3, _0)
 		{
@@ -4500,35 +4507,35 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 				zephir_create_array(&_4$$4, 6, 0);
 				zephir_array_update_string(&_4$$4, SL("name"), &name, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1554);
+				zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1578);
 				zephir_array_update_string(&_4$$4, SL("type"), &_5$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1555);
+				zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1579);
 				zephir_array_update_string(&_4$$4, SL("tmp_name"), &_5$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1556);
+				zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1580);
 				zephir_array_update_string(&_4$$4, SL("size"), &_5$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_OBS_NVAR(&_5$$4);
-				zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1557);
+				zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1581);
 				zephir_array_update_string(&_4$$4, SL("error"), &_5$$4, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_4$$4, SL("key"), &p, PH_COPY | PH_SEPARATE);
-				zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1559);
+				zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1583);
 			}
 			if (Z_TYPE_P(&name) == IS_ARRAY) {
-				zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1564);
-				zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1565);
-				zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566);
-				zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1567);
-				zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1568);
+				zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1588);
+				zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1589);
+				zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1590);
+				zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1591);
+				zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1592);
 				ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 344, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p);
 				zephir_check_call_status();
-				zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1575);
+				zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1599);
 				if (Z_TYPE_P(&parentFiles) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _12$$5)
 					{
 						ZEPHIR_INIT_NVAR(&file);
 						ZVAL_COPY(&file, _12$$5);
-						zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+						zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 					} ZEND_HASH_FOREACH_END();
 				} else {
 					ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0);
@@ -4541,7 +4548,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 						}
 						ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0);
 						zephir_check_call_status();
-							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 						ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0);
 						zephir_check_call_status();
 					}
@@ -4569,35 +4576,35 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 					zephir_create_array(&_14$$9, 6, 0);
 					zephir_array_update_string(&_14$$9, SL("name"), &name, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1554);
+					zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1578);
 					zephir_array_update_string(&_14$$9, SL("type"), &_15$$9, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1555);
+					zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1579);
 					zephir_array_update_string(&_14$$9, SL("tmp_name"), &_15$$9, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1556);
+					zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1580);
 					zephir_array_update_string(&_14$$9, SL("size"), &_15$$9, PH_COPY | PH_SEPARATE);
 					ZEPHIR_OBS_NVAR(&_15$$9);
-					zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1557);
+					zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1581);
 					zephir_array_update_string(&_14$$9, SL("error"), &_15$$9, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_14$$9, SL("key"), &p, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1559);
+					zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1583);
 				}
 				if (Z_TYPE_P(&name) == IS_ARRAY) {
-					zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1564);
-					zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1565);
-					zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1566);
-					zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1567);
-					zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1568);
+					zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1588);
+					zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1589);
+					zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1590);
+					zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1591);
+					zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1592);
 					ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 344, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p);
 					zephir_check_call_status();
-					zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1575);
+					zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1599);
 					if (Z_TYPE_P(&parentFiles) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _21$$10)
 						{
 							ZEPHIR_INIT_NVAR(&file);
 							ZVAL_COPY(&file, _21$$10);
-							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+							zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 						} ZEND_HASH_FOREACH_END();
 					} else {
 						ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0);
@@ -4610,7 +4617,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles)
 							}
 							ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0);
 							zephir_check_call_status();
-								zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1573);
+								zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1597);
 							ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0);
 							zephir_check_call_status();
 						}
@@ -4651,8 +4658,8 @@ PHP_METHOD(Phalcon_Http_Request, getFilterService)
 	if (Z_TYPE_P(&filterService) != IS_OBJECT) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_1$$3);
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1596);
+		if (Z_TYPE_P(&container) == IS_NULL) {
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1620);
 			return;
 		}
 		ZEPHIR_INIT_VAR(&_3$$3);
@@ -4678,10 +4685,9 @@ PHP_METHOD(Phalcon_Http_Request, getServerArray)
 	if (zephir_is_true(&_SERVER)) {
 		RETVAL_ZVAL(&_SERVER, 1, 0);
 		return;
-	} else {
-		array_init(return_value);
-		return;
 	}
+	array_init(return_value);
+	return;
 }
 
 zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type)
diff --git a/ext/phalcon/http/request.zep.h b/ext/phalcon/http/request.zep.h
index f47d6234478..83dde4ae8ad 100644
--- a/ext/phalcon/http/request.zep.h
+++ b/ext/phalcon/http/request.zep.h
@@ -3,14 +3,13 @@ extern zend_class_entry *phalcon_http_request_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Http_Request);
 
-PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride);
-PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride);
 PHP_METHOD(Phalcon_Http_Request, get);
 PHP_METHOD(Phalcon_Http_Request, getAcceptableContent);
 PHP_METHOD(Phalcon_Http_Request, getBasicAuth);
 PHP_METHOD(Phalcon_Http_Request, getBestAccept);
 PHP_METHOD(Phalcon_Http_Request, getBestCharset);
 PHP_METHOD(Phalcon_Http_Request, getBestLanguage);
+PHP_METHOD(Phalcon_Http_Request, getHttpMethodParameterOverride);
 PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant);
 PHP_METHOD(Phalcon_Http_Request, getClientAddress);
 PHP_METHOD(Phalcon_Http_Request, getClientCharsets);
@@ -62,6 +61,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap);
 PHP_METHOD(Phalcon_Http_Request, isTrace);
 PHP_METHOD(Phalcon_Http_Request, isValidHttpMethod);
 PHP_METHOD(Phalcon_Http_Request, numFiles);
+PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride);
 PHP_METHOD(Phalcon_Http_Request, setParameterFilters);
 PHP_METHOD(Phalcon_Http_Request, setStrictHostCheck);
 PHP_METHOD(Phalcon_Http_Request, getBestQuality);
@@ -74,13 +74,6 @@ PHP_METHOD(Phalcon_Http_Request, getFilterService);
 PHP_METHOD(Phalcon_Http_Request, getServerArray);
 zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_gethttpmethodparameteroverride, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_sethttpmethodparameteroverride, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, httpMethodParameterOverride, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_get, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
 	ZEND_ARG_INFO(0, filters)
@@ -104,6 +97,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getbestlanguage, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_gethttpmethodparameteroverride, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getpreferredisolocalevariant, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -301,6 +297,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_numfiles, 0
 	ZEND_ARG_TYPE_INFO(0, onlySuccessful, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_sethttpmethodparameteroverride, 0, 1, Phalcon\\Http\\Request, 0)
+	ZEND_ARG_TYPE_INFO(0, override, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_setparameterfilters, 0, 1, Phalcon\\Http\\RequestInterface, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -365,14 +365,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_zephir_init_properties_phalc
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) {
-	PHP_ME(Phalcon_Http_Request, getHttpMethodParameterOverride, arginfo_phalcon_http_request_gethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Http_Request, setHttpMethodParameterOverride, arginfo_phalcon_http_request_sethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, get, arginfo_phalcon_http_request_get, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getAcceptableContent, arginfo_phalcon_http_request_getacceptablecontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBasicAuth, arginfo_phalcon_http_request_getbasicauth, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestAccept, arginfo_phalcon_http_request_getbestaccept, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestCharset, arginfo_phalcon_http_request_getbestcharset, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestLanguage, arginfo_phalcon_http_request_getbestlanguage, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Http_Request, getHttpMethodParameterOverride, arginfo_phalcon_http_request_gethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getPreferredIsoLocaleVariant, arginfo_phalcon_http_request_getpreferredisolocalevariant, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getClientAddress, arginfo_phalcon_http_request_getclientaddress, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getClientCharsets, arginfo_phalcon_http_request_getclientcharsets, ZEND_ACC_PUBLIC)
@@ -424,6 +423,7 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) {
 	PHP_ME(Phalcon_Http_Request, isTrace, arginfo_phalcon_http_request_istrace, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, isValidHttpMethod, arginfo_phalcon_http_request_isvalidhttpmethod, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, numFiles, arginfo_phalcon_http_request_numfiles, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Http_Request, setHttpMethodParameterOverride, arginfo_phalcon_http_request_sethttpmethodparameteroverride, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, setParameterFilters, arginfo_phalcon_http_request_setparameterfilters, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, setStrictHostCheck, arginfo_phalcon_http_request_setstricthostcheck, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request, getBestQuality, arginfo_phalcon_http_request_getbestquality, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED)
diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c
index 4b0dbb943b0..ac83f13d906 100644
--- a/ext/phalcon/http/request/file.zep.c
+++ b/ext/phalcon/http/request/file.zep.c
@@ -12,9 +12,9 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/array.h"
 #include "kernel/memory.h"
+#include "kernel/object.h"
 #include "kernel/fcall.h"
 #include "kernel/operators.h"
 #include "ext/spl/spl_exceptions.h"
@@ -92,39 +92,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Request_File)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Http_Request_File, getError)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "error");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Http_Request_File, getExtension)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "extension");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Http_Request_File, getKey)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "key");
-}
-
 /**
  * Phalcon\Http\Request\File constructor
  */
@@ -208,6 +175,42 @@ PHP_METHOD(Phalcon_Http_Request_File, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+/**
+ * @return string|null
+ */
+PHP_METHOD(Phalcon_Http_Request_File, getError)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "error");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Http_Request_File, getExtension)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "extension");
+}
+
+/**
+ * @return string|null
+ */
+PHP_METHOD(Phalcon_Http_Request_File, getKey)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "key");
+}
+
 /**
  * Returns the real name of the uploaded file
  */
diff --git a/ext/phalcon/http/request/file.zep.h b/ext/phalcon/http/request/file.zep.h
index 5358509ae16..e2e03e4ff9d 100644
--- a/ext/phalcon/http/request/file.zep.h
+++ b/ext/phalcon/http/request/file.zep.h
@@ -3,10 +3,10 @@ extern zend_class_entry *phalcon_http_request_file_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Http_Request_File);
 
+PHP_METHOD(Phalcon_Http_Request_File, __construct);
 PHP_METHOD(Phalcon_Http_Request_File, getError);
 PHP_METHOD(Phalcon_Http_Request_File, getExtension);
 PHP_METHOD(Phalcon_Http_Request_File, getKey);
-PHP_METHOD(Phalcon_Http_Request_File, __construct);
 PHP_METHOD(Phalcon_Http_Request_File, getName);
 PHP_METHOD(Phalcon_Http_Request_File, getRealType);
 PHP_METHOD(Phalcon_Http_Request_File, getSize);
@@ -16,6 +16,11 @@ PHP_METHOD(Phalcon_Http_Request_File, isUploadedFile);
 PHP_METHOD(Phalcon_Http_Request_File, moveTo);
 PHP_METHOD(Phalcon_Http_Request_File, getArrVal);
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_file___construct, 0, 0, 1)
+	ZEND_ARG_ARRAY_INFO(0, file, 0)
+	ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_file_geterror, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
@@ -25,11 +30,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_file_getkey, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_file___construct, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, file, 0)
-	ZEND_ARG_INFO(0, key)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_file_getname, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -59,10 +59,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_file_getarrval, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_http_request_file_method_entry) {
+	PHP_ME(Phalcon_Http_Request_File, __construct, arginfo_phalcon_http_request_file___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Http_Request_File, getError, arginfo_phalcon_http_request_file_geterror, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getExtension, arginfo_phalcon_http_request_file_getextension, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getKey, arginfo_phalcon_http_request_file_getkey, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Http_Request_File, __construct, arginfo_phalcon_http_request_file___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Http_Request_File, getName, arginfo_phalcon_http_request_file_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getRealType, arginfo_phalcon_http_request_file_getrealtype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Http_Request_File, getSize, arginfo_phalcon_http_request_file_getsize, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/http/request/fileinterface.zep.c b/ext/phalcon/http/request/fileinterface.zep.c
index f6ff9bc0e49..824c9bcdd32 100644
--- a/ext/phalcon/http/request/fileinterface.zep.c
+++ b/ext/phalcon/http/request/fileinterface.zep.c
@@ -21,10 +21,7 @@
  * file that was distributed with this source code.
  */
 /**
- * Phalcon\Http\Request\FileInterface
- *
  * Interface for Phalcon\Http\Request\File
- *
  */
 ZEPHIR_INIT_CLASS(Phalcon_Http_Request_FileInterface)
 {
diff --git a/ext/phalcon/http/response.zep.c b/ext/phalcon/http/response.zep.c
index f766cf85ae6..f5121952d27 100644
--- a/ext/phalcon/http/response.zep.c
+++ b/ext/phalcon/http/response.zep.c
@@ -248,10 +248,10 @@ PHP_METHOD(Phalcon_Http_Response, getDI)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (Z_TYPE_P(&container) != IS_OBJECT) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection container is required to access the 'url' service", "phalcon/Http/Response.zep", 147);
 			return;
 		}
diff --git a/ext/phalcon/http/response/cookies.zep.c b/ext/phalcon/http/response/cookies.zep.c
index 1dfc38928c5..aa91b423e96 100644
--- a/ext/phalcon/http/response/cookies.zep.c
+++ b/ext/phalcon/http/response/cookies.zep.c
@@ -649,7 +649,7 @@ PHP_METHOD(Phalcon_Http_Response_Cookies, set)
 	if (ZEPHIR_IS_FALSE_IDENTICAL(&_10)) {
 		zephir_read_property(&_11$$6, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_11$$6);
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_cookie_exception_ce, "A dependency injection container is required to access the 'response' service", "phalcon/Http/Response/Cookies.zep", 311);
 			return;
 		}
diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c
index 367946f646d..b349b4577c4 100644
--- a/ext/phalcon/logger/adapter/stream.zep.c
+++ b/ext/phalcon/logger/adapter/stream.zep.c
@@ -12,12 +12,12 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/array.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
+#include "kernel/object.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/concat.h"
 #include "kernel/file.h"
@@ -75,18 +75,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream)
 	return SUCCESS;
 }
 
-/**
- * Stream name
- */
-PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "name");
-}
-
 /**
  * Stream constructor.
  *
@@ -162,6 +150,20 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, close)
 	RETURN_BOOL(1);
 }
 
+/**
+ * Stream name
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "name");
+}
+
 /**
  * Processes the message i.e. writes it to the file
  *
@@ -211,7 +213,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process)
 		ZEPHIR_CONCAT_SVSVS(&_5$$3, "The file '", &_3$$3, "' cannot be opened with mode '", &_4$$3, "'");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 408, &_5$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_2$$3, "phalcon/Logger/Adapter/Stream.zep", 109);
+		zephir_throw_exception_debug(&_2$$3, "phalcon/Logger/Adapter/Stream.zep", 119);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
diff --git a/ext/phalcon/logger/adapter/stream.zep.h b/ext/phalcon/logger/adapter/stream.zep.h
index a6e4f650d78..302796f3459 100644
--- a/ext/phalcon/logger/adapter/stream.zep.h
+++ b/ext/phalcon/logger/adapter/stream.zep.h
@@ -3,15 +3,12 @@ extern zend_class_entry *phalcon_logger_adapter_stream_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream);
 
-PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName);
 PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct);
 PHP_METHOD(Phalcon_Logger_Adapter_Stream, close);
+PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName);
 PHP_METHOD(Phalcon_Logger_Adapter_Stream, process);
 PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_getname, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_stream___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -24,6 +21,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_close, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_getname, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_stream_process, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_OBJ_INFO(0, item, Phalcon\\Logger\\Item, 0)
@@ -35,9 +35,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_stream_phpfopen, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_logger_adapter_stream_method_entry) {
-	PHP_ME(Phalcon_Logger_Adapter_Stream, getName, arginfo_phalcon_logger_adapter_stream_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, __construct, arginfo_phalcon_logger_adapter_stream___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, close, arginfo_phalcon_logger_adapter_stream_close, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Adapter_Stream, getName, arginfo_phalcon_logger_adapter_stream_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, process, arginfo_phalcon_logger_adapter_stream_process, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Adapter_Stream, phpFopen, arginfo_phalcon_logger_adapter_stream_phpfopen, ZEND_ACC_PROTECTED)
 	PHP_FE_END
diff --git a/ext/phalcon/logger/formatter/abstractformatter.zep.c b/ext/phalcon/logger/formatter/abstractformatter.zep.c
index a8ab3ec80d2..aa84d5986df 100644
--- a/ext/phalcon/logger/formatter/abstractformatter.zep.c
+++ b/ext/phalcon/logger/formatter/abstractformatter.zep.c
@@ -13,9 +13,9 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
+#include "kernel/operators.h"
 
 
 /**
@@ -28,8 +28,6 @@
  */
 /**
  * Class AbstractFormatter
- *
- * @property string $dateFormat
  */
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_AbstractFormatter)
 {
@@ -46,7 +44,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_AbstractFormatter)
 }
 
 /**
- * Default date format
+ * Return the default date format
+ *
+ * @return string
  */
 PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getDateFormat)
 {
@@ -58,67 +58,71 @@ PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getDateFormat)
 }
 
 /**
- * Default date format
+ * Returns the date formatted for the logger.
+ *
+ * @param Item $item
+ *
+ * @return string
  */
-PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat)
+PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *dateFormat_param = NULL;
-	zval dateFormat;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *item, item_sub, _0, _1;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&dateFormat);
+	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_STR(dateFormat)
+		Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &dateFormat_param);
-	zephir_get_strval(&dateFormat, dateFormat_param);
+	zephir_fetch_params(1, 1, 0, &item);
 
 
-	zephir_update_property_zval(this_ptr, ZEND_STRL("dateFormat"), &dateFormat);
-	RETURN_THIS();
+	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();
 }
 
 /**
- * Returns the date formatted for the logger.
+ * Set the default date format
  *
- * @param Item $item
+ * @param string $format
  *
- * @return string
+ * @return void
  */
-PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate)
+PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *item, item_sub, _0, _1;
+	zval *format_param = NULL;
+	zval format;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&item_sub);
-	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&format);
 #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)
+		Z_PARAM_STR(format)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
 	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &item);
+	zephir_fetch_params(1, 1, 0, &format_param);
+	zephir_get_strval(&format, format_param);
 
 
-	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();
+	zephir_update_property_zval(this_ptr, ZEND_STRL("dateFormat"), &format);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/phalcon/logger/formatter/abstractformatter.zep.h b/ext/phalcon/logger/formatter/abstractformatter.zep.h
index 7e86d4f07e6..f5dd2825279 100644
--- a/ext/phalcon/logger/formatter/abstractformatter.zep.h
+++ b/ext/phalcon/logger/formatter/abstractformatter.zep.h
@@ -4,23 +4,24 @@ extern zend_class_entry *phalcon_logger_formatter_abstractformatter_ce;
 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);
+PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat);
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_getdateformat, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, 0, 0, 1)
-	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()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 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_ME(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat, arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/logger/formatter/json.zep.c b/ext/phalcon/logger/formatter/json.zep.c
index 2a1995d049f..2aa358fdcb8 100644
--- a/ext/phalcon/logger/formatter/json.zep.c
+++ b/ext/phalcon/logger/formatter/json.zep.c
@@ -29,8 +29,6 @@
  * file that was distributed with this source code.
  */
 /**
- * Phalcon\Logger\Formatter\Json
- *
  * Formats messages using JSON encoding
  */
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Json)
diff --git a/ext/phalcon/logger/formatter/line.zep.c b/ext/phalcon/logger/formatter/line.zep.c
index 8f1e1822193..4e43602237e 100644
--- a/ext/phalcon/logger/formatter/line.zep.c
+++ b/ext/phalcon/logger/formatter/line.zep.c
@@ -13,8 +13,8 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
+#include "kernel/operators.h"
 #include "kernel/array.h"
 #include "kernel/fcall.h"
 
@@ -29,8 +29,6 @@
  */
 /**
  * Class Line
- *
- * @property string $format
  */
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line)
 {
@@ -45,46 +43,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line)
 	return SUCCESS;
 }
 
-/**
- * Format applied to each message
- */
-PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "format");
-}
-
-/**
- * Format applied to each message
- */
-PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *format_param = NULL;
-	zval format;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&format);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(format)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &format_param);
-	zephir_get_strval(&format, format_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("format"), &format);
-	RETURN_THIS();
-}
-
 /**
  * Line constructor.
  *
@@ -185,3 +143,49 @@ PHP_METHOD(Phalcon_Logger_Formatter_Line, format)
 	RETURN_MM();
 }
 
+/**
+ * Return the format applied to each message
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "format");
+}
+
+/**
+ * Set the format applied to each message
+ *
+ * @param string $format
+ *
+ * @return Line
+ */
+PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *format_param = NULL;
+	zval format;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&format);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(format)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &format_param);
+	zephir_get_strval(&format, format_param);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("format"), &format);
+	RETURN_THIS();
+}
+
diff --git a/ext/phalcon/logger/formatter/line.zep.h b/ext/phalcon/logger/formatter/line.zep.h
index 73ae97a9437..02dc3a7878f 100644
--- a/ext/phalcon/logger/formatter/line.zep.h
+++ b/ext/phalcon/logger/formatter/line.zep.h
@@ -3,17 +3,10 @@ extern zend_class_entry *phalcon_logger_formatter_line_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line);
 
-PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat);
-PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat);
 PHP_METHOD(Phalcon_Logger_Formatter_Line, __construct);
 PHP_METHOD(Phalcon_Logger_Formatter_Line, format);
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_line_getformat, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_line_setformat, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+PHP_METHOD(Phalcon_Logger_Formatter_Line, getFormat);
+PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_line___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
@@ -24,10 +17,17 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_line_fo
 	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_formatter_line_getformat, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_formatter_line_setformat, 0, 1, Phalcon\\Logger\\Formatter\\Line, 0)
+	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_line_method_entry) {
-	PHP_ME(Phalcon_Logger_Formatter_Line, getFormat, arginfo_phalcon_logger_formatter_line_getformat, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Logger_Formatter_Line, setFormat, arginfo_phalcon_logger_formatter_line_setformat, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Formatter_Line, __construct, arginfo_phalcon_logger_formatter_line___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Logger_Formatter_Line, format, arginfo_phalcon_logger_formatter_line_format, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Line, getFormat, arginfo_phalcon_logger_formatter_line_getformat, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Formatter_Line, setFormat, arginfo_phalcon_logger_formatter_line_setformat, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/logger/item.zep.c b/ext/phalcon/logger/item.zep.c
index 34e6e17d9e3..9cc303b0ab2 100644
--- a/ext/phalcon/logger/item.zep.c
+++ b/ext/phalcon/logger/item.zep.c
@@ -45,6 +45,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Item)
 	 * @var array
 	 */
 	zend_declare_property_null(phalcon_logger_item_ce, SL("context"), ZEND_ACC_PROTECTED);
+	/**
+	 * @var DateTimeImmutable
+	 */
+	zend_declare_property_null(phalcon_logger_item_ce, SL("dateTime"), ZEND_ACC_PROTECTED);
 	/**
 	 * @var string
 	 */
@@ -57,70 +61,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Item)
 	 * @var string
 	 */
 	zend_declare_property_null(phalcon_logger_item_ce, SL("levelName"), ZEND_ACC_PROTECTED);
-	/**
-	 * @var DateTimeImmutable
-	 */
-	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;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Logger_Item, getContext)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "context");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Logger_Item, getMessage)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "message");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Logger_Item, getLevel)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "level");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Logger_Item, getLevelName)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "levelName");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Logger_Item, getDateTime)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "dateTime");
-}
-
 /**
  * Item constructor.
  *
@@ -180,6 +125,66 @@ PHP_METHOD(Phalcon_Logger_Item, __construct)
 	ZEPHIR_MM_RESTORE();
 }
 
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Logger_Item, getContext)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "context");
+}
+
+/**
+ * @return DateTimeImmutable
+ */
+PHP_METHOD(Phalcon_Logger_Item, getDateTime)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "dateTime");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Logger_Item, getMessage)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "message");
+}
+
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Logger_Item, getLevel)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "level");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Logger_Item, getLevelName)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "levelName");
+}
+
 zend_object *zephir_init_properties_Phalcon_Logger_Item(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
diff --git a/ext/phalcon/logger/item.zep.h b/ext/phalcon/logger/item.zep.h
index 90e0554bdf0..f72be18a5c7 100644
--- a/ext/phalcon/logger/item.zep.h
+++ b/ext/phalcon/logger/item.zep.h
@@ -3,29 +3,14 @@ extern zend_class_entry *phalcon_logger_item_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Logger_Item);
 
+PHP_METHOD(Phalcon_Logger_Item, __construct);
 PHP_METHOD(Phalcon_Logger_Item, getContext);
+PHP_METHOD(Phalcon_Logger_Item, getDateTime);
 PHP_METHOD(Phalcon_Logger_Item, getMessage);
 PHP_METHOD(Phalcon_Logger_Item, getLevel);
 PHP_METHOD(Phalcon_Logger_Item, getLevelName);
-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_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_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_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)
@@ -38,19 +23,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item___construct, 0, 0, 4)
 #endif
 ZEND_END_ARG_INFO()
 
+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_OBJ_INFO_EX(arginfo_phalcon_logger_item_getdatetime, 0, 0, DateTimeImmutable, 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_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_zephir_init_properties_phalcon_logger_item, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_logger_item_method_entry) {
+	PHP_ME(Phalcon_Logger_Item, __construct, arginfo_phalcon_logger_item___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Logger_Item, getContext, arginfo_phalcon_logger_item_getcontext, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Logger_Item, getDateTime, arginfo_phalcon_logger_item_getdatetime, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Item, getMessage, arginfo_phalcon_logger_item_getmessage, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Item, getLevel, arginfo_phalcon_logger_item_getlevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Logger_Item, getLevelName, arginfo_phalcon_logger_item_getlevelname, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Phalcon_Logger_Item, getDateTime, arginfo_phalcon_logger_item_getdatetime, ZEND_ACC_PUBLIC)
-#else
-	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/messages/message.zep.c b/ext/phalcon/messages/message.zep.c
index 4f2f7d68cd1..12cb9e113c3 100644
--- a/ext/phalcon/messages/message.zep.c
+++ b/ext/phalcon/messages/message.zep.c
@@ -65,61 +65,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Messages_Message)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Messages_Message, getCode)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "code");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Messages_Message, getField)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "field");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Messages_Message, getMessage)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "message");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Messages_Message, getType)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "type");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Messages_Message, getMetaData)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "metaData");
-}
-
 /**
  * Phalcon\Messages\Message constructor
  */
@@ -207,6 +152,66 @@ PHP_METHOD(Phalcon_Messages_Message, __toString)
 	RETURN_MEMBER(getThis(), "message");
 }
 
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Messages_Message, getCode)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "code");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Messages_Message, getField)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "field");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Messages_Message, getMessage)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "message");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Messages_Message, getType)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "type");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Messages_Message, getMetaData)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "metaData");
+}
+
 /**
  * Serializes the object for json_encode
  */
diff --git a/ext/phalcon/messages/message.zep.h b/ext/phalcon/messages/message.zep.h
index 7b8f064eedc..79aa9ef6fe5 100644
--- a/ext/phalcon/messages/message.zep.h
+++ b/ext/phalcon/messages/message.zep.h
@@ -3,13 +3,13 @@ extern zend_class_entry *phalcon_messages_message_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Messages_Message);
 
+PHP_METHOD(Phalcon_Messages_Message, __construct);
+PHP_METHOD(Phalcon_Messages_Message, __toString);
 PHP_METHOD(Phalcon_Messages_Message, getCode);
 PHP_METHOD(Phalcon_Messages_Message, getField);
 PHP_METHOD(Phalcon_Messages_Message, getMessage);
 PHP_METHOD(Phalcon_Messages_Message, getType);
 PHP_METHOD(Phalcon_Messages_Message, getMetaData);
-PHP_METHOD(Phalcon_Messages_Message, __construct);
-PHP_METHOD(Phalcon_Messages_Message, __toString);
 PHP_METHOD(Phalcon_Messages_Message, jsonSerialize);
 PHP_METHOD(Phalcon_Messages_Message, setCode);
 PHP_METHOD(Phalcon_Messages_Message, setField);
@@ -18,21 +18,6 @@ PHP_METHOD(Phalcon_Messages_Message, setMetaData);
 PHP_METHOD(Phalcon_Messages_Message, setType);
 zend_object *zephir_init_properties_Phalcon_Messages_Message(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getcode, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getfield, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmessage, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_gettype, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmetadata, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_message___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 	ZEND_ARG_INFO(0, field)
@@ -48,6 +33,21 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message___tostring, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getcode, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getfield, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmessage, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_gettype, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_getmetadata, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_message_jsonserialize, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -75,13 +75,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_message_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_messages_message_method_entry) {
+	PHP_ME(Phalcon_Messages_Message, __construct, arginfo_phalcon_messages_message___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Messages_Message, __toString, arginfo_phalcon_messages_message___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getCode, arginfo_phalcon_messages_message_getcode, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getField, arginfo_phalcon_messages_message_getfield, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getMessage, arginfo_phalcon_messages_message_getmessage, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getType, arginfo_phalcon_messages_message_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, getMetaData, arginfo_phalcon_messages_message_getmetadata, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Messages_Message, __construct, arginfo_phalcon_messages_message___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Messages_Message, __toString, arginfo_phalcon_messages_message___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, jsonSerialize, arginfo_phalcon_messages_message_jsonserialize, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, setCode, arginfo_phalcon_messages_message_setcode, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Messages_Message, setField, arginfo_phalcon_messages_message_setfield, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/messages/messages.zep.h b/ext/phalcon/messages/messages.zep.h
index 4c24cc42012..63991220055 100644
--- a/ext/phalcon/messages/messages.zep.h
+++ b/ext/phalcon/messages/messages.zep.h
@@ -61,7 +61,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/dispatcher.zep.c b/ext/phalcon/mvc/dispatcher.zep.c
index fb359a2c9a4..4e3563747b9 100644
--- a/ext/phalcon/mvc/dispatcher.zep.c
+++ b/ext/phalcon/mvc/dispatcher.zep.c
@@ -448,7 +448,7 @@ PHP_METHOD(Phalcon_Mvc_Dispatcher, throwDispatchException)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+	if (Z_TYPE_P(&container) == IS_NULL) {
 		ZEPHIR_INIT_VAR(&_1$$3);
 		object_init_ex(&_1$$3, phalcon_mvc_dispatcher_exception_ce);
 		ZEPHIR_INIT_VAR(&_2$$3);
diff --git a/ext/phalcon/mvc/micro.zep.c b/ext/phalcon/mvc/micro.zep.c
index 3969b20fbaf..0424ea66c7a 100644
--- a/ext/phalcon/mvc/micro.zep.c
+++ b/ext/phalcon/mvc/micro.zep.c
@@ -509,34 +509,37 @@ PHP_METHOD(Phalcon_Mvc_Micro, getReturnedValue)
  */
 PHP_METHOD(Phalcon_Mvc_Micro, getRouter)
 {
-	zval router, _0, _1$$3, _2$$3;
+	zval _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&router);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$3);
+	ZVAL_UNDEF(&_3$$3);
+	ZVAL_UNDEF(&_4$$3);
+	ZVAL_UNDEF(&_5$$3);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("router"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&router, &_0);
-	if (Z_TYPE_P(&router) != IS_OBJECT) {
-		ZEPHIR_INIT_VAR(&_1$$3);
-		ZVAL_STRING(&_1$$3, "router");
-		ZEPHIR_CALL_METHOD(&router, this_ptr, "getsharedservice", NULL, 0, &_1$$3);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_2$$3);
+		ZVAL_STRING(&_2$$3, "router");
+		ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "getsharedservice", NULL, 0, &_2$$3);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &router, "clear", NULL, 0);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("router"), &_1$$3);
+		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("router"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_CALL_METHOD(NULL, &_3$$3, "clear", NULL, 0);
 		zephir_check_call_status();
-		ZVAL_BOOL(&_2$$3, 1);
-		ZEPHIR_CALL_METHOD(NULL, &router, "removeextraslashes", NULL, 0, &_2$$3);
+		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("router"), PH_NOISY_CC | PH_READONLY);
+		ZVAL_BOOL(&_5$$3, 1);
+		ZEPHIR_CALL_METHOD(NULL, &_4$$3, "removeextraslashes", NULL, 0, &_5$$3);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("router"), &router);
 	}
-	RETURN_CCTOR(&router);
+	RETURN_MM_MEMBER(getThis(), "router");
 }
 
 /**
@@ -548,13 +551,14 @@ PHP_METHOD(Phalcon_Mvc_Micro, getService)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *serviceName_param = NULL, container, _0;
+	zval *serviceName_param = NULL, _0, _2, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -577,15 +581,15 @@ PHP_METHOD(Phalcon_Mvc_Micro, getService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 416, &serviceName);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "get", NULL, 0, &serviceName);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -599,13 +603,14 @@ PHP_METHOD(Phalcon_Mvc_Micro, getSharedService)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *serviceName_param = NULL, container, _0;
+	zval *serviceName_param = NULL, _0, _2, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -628,15 +633,15 @@ PHP_METHOD(Phalcon_Mvc_Micro, getSharedService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 417, &serviceName);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "getshared", NULL, 0, &serviceName);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -649,12 +654,12 @@ PHP_METHOD(Phalcon_Mvc_Micro, getSharedService)
  */
 PHP_METHOD(Phalcon_Mvc_Micro, handle)
 {
-	zval _81$$59, _86$$64, _93$$69;
+	zval _80$$59, _84$$64, _93$$69;
 	zend_class_entry *_28$$21;
-	zend_bool _26$$7, _37$$7, _18$$11, _22$$16, _33$$25, _44$$31, _48$$36, _57$$42, _61$$47, _78$$57, _83$$62, _98$$79;
+	zend_bool _26$$7, _37$$7, _18$$11, _22$$16, _33$$25, _44$$31, _48$$36, _57$$42, _61$$47, _98$$79, _99$$79;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *uri_param = NULL, __$true, __$false, container, status, router, matchedRoute, handler, beforeHandlers, params, returnedValue, e, errorHandler, afterHandlers, notFoundHandler, finishHandlers, finish, before, after, response, modelBinder, routeName, realHandler, methodName, lazyReturned, afterBindingHandlers, afterBinding, _0, _88, _1$$4, _5$$4, _6$$4, _72$$4, _75$$4, *_76$$4, _77$$4, _2$$5, _3$$5, _4$$5, _7$$7, _8$$7, _11$$7, _15$$7, *_16$$7, _17$$7, _41$$7, *_42$$7, _43$$7, _54$$7, *_55$$7, _56$$7, _9$$8, _10$$8, _12$$9, _13$$9, _14$$9, _21$$11, _19$$14, _20$$14, _25$$16, _23$$19, _24$$19, _27$$21, _29$$23, _30$$24, _31$$24, _32$$22, _34$$26, _35$$26, _36$$26, _38$$29, _39$$29, _40$$29, _47$$31, _45$$34, _46$$34, _51$$36, _49$$39, _50$$39, _52$$41, _53$$41, _60$$42, _58$$45, _59$$45, _64$$47, _62$$50, _63$$50, _65$$52, _69$$52, _66$$53, _67$$53, _68$$53, _70$$55, _71$$55, _73$$56, _74$$56, _82$$57, _79$$60, _80$$60, _87$$62, _84$$65, _85$$65, _89$$67, _92$$67, _90$$68, _91$$68, _94$$77, _95$$77, _96$$80, _97$$80, _99$$82;
+	zval *uri_param = NULL, __$true, __$false, container, status, router, matchedRoute, handler, beforeHandlers, params, returnedValue, e, afterHandlers, notFoundHandler, finishHandlers, finish, before, after, response, modelBinder, routeName, realHandler, methodName, lazyReturned, afterBindingHandlers, afterBinding, _0, _86, _1$$4, _5$$4, _6$$4, _72$$4, _75$$4, *_76$$4, _77$$4, _2$$5, _3$$5, _4$$5, _7$$7, _8$$7, _11$$7, _15$$7, *_16$$7, _17$$7, _41$$7, *_42$$7, _43$$7, _54$$7, *_55$$7, _56$$7, _9$$8, _10$$8, _12$$9, _13$$9, _14$$9, _21$$11, _19$$14, _20$$14, _25$$16, _23$$19, _24$$19, _27$$21, _29$$23, _30$$24, _31$$24, _32$$22, _34$$26, _35$$26, _36$$26, _38$$29, _39$$29, _40$$29, _47$$31, _45$$34, _46$$34, _51$$36, _49$$39, _50$$39, _52$$41, _53$$41, _60$$42, _58$$45, _59$$45, _64$$47, _62$$50, _63$$50, _65$$52, _69$$52, _66$$53, _67$$53, _68$$53, _70$$55, _71$$55, _73$$56, _74$$56, _78$$60, _79$$60, _81$$57, _82$$65, _83$$65, _85$$62, _87$$67, _90$$67, _88$$68, _89$$68, _91$$69, _92$$69, _94$$77, _95$$77, _96$$80, _97$$80, _100$$79;
 	zval uri, bindCacheKey;
 	zval *this_ptr = getThis();
 
@@ -671,7 +676,6 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&returnedValue);
 	ZVAL_UNDEF(&e);
-	ZVAL_UNDEF(&errorHandler);
 	ZVAL_UNDEF(&afterHandlers);
 	ZVAL_UNDEF(&notFoundHandler);
 	ZVAL_UNDEF(&finishHandlers);
@@ -687,7 +691,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_UNDEF(&afterBindingHandlers);
 	ZVAL_UNDEF(&afterBinding);
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_88);
+	ZVAL_UNDEF(&_86);
 	ZVAL_UNDEF(&_1$$4);
 	ZVAL_UNDEF(&_5$$4);
 	ZVAL_UNDEF(&_6$$4);
@@ -751,23 +755,25 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_UNDEF(&_71$$55);
 	ZVAL_UNDEF(&_73$$56);
 	ZVAL_UNDEF(&_74$$56);
-	ZVAL_UNDEF(&_82$$57);
+	ZVAL_UNDEF(&_78$$60);
 	ZVAL_UNDEF(&_79$$60);
-	ZVAL_UNDEF(&_80$$60);
-	ZVAL_UNDEF(&_87$$62);
-	ZVAL_UNDEF(&_84$$65);
-	ZVAL_UNDEF(&_85$$65);
-	ZVAL_UNDEF(&_89$$67);
-	ZVAL_UNDEF(&_92$$67);
-	ZVAL_UNDEF(&_90$$68);
-	ZVAL_UNDEF(&_91$$68);
+	ZVAL_UNDEF(&_81$$57);
+	ZVAL_UNDEF(&_82$$65);
+	ZVAL_UNDEF(&_83$$65);
+	ZVAL_UNDEF(&_85$$62);
+	ZVAL_UNDEF(&_87$$67);
+	ZVAL_UNDEF(&_90$$67);
+	ZVAL_UNDEF(&_88$$68);
+	ZVAL_UNDEF(&_89$$68);
+	ZVAL_UNDEF(&_91$$69);
+	ZVAL_UNDEF(&_92$$69);
 	ZVAL_UNDEF(&_94$$77);
 	ZVAL_UNDEF(&_95$$77);
 	ZVAL_UNDEF(&_96$$80);
 	ZVAL_UNDEF(&_97$$80);
-	ZVAL_UNDEF(&_99$$82);
-	ZVAL_UNDEF(&_81$$59);
-	ZVAL_UNDEF(&_86$$64);
+	ZVAL_UNDEF(&_100$$79);
+	ZVAL_UNDEF(&_80$$59);
+	ZVAL_UNDEF(&_84$$64);
 	ZVAL_UNDEF(&_93$$69);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
@@ -796,8 +802,8 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	ZVAL_NULL(&realHandler);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
-	if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "A dependency injection container is required to access micro services", "phalcon/Mvc/Micro.zep", 419);
+	if (Z_TYPE_P(&container) == IS_NULL) {
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "A dependency injection container is required to access micro services", "phalcon/Mvc/Micro.zep", 398);
 		return;
 	}
 
@@ -825,7 +831,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 		zephir_check_call_status_or_jump(try_end_1);
 		ZEPHIR_CALL_METHOD(&matchedRoute, &router, "getmatchedroute", NULL, 0);
 		zephir_check_call_status_or_jump(try_end_1);
-		if (Z_TYPE_P(&matchedRoute) == IS_OBJECT) {
+		if (Z_TYPE_P(&matchedRoute) != IS_NULL) {
 			ZEPHIR_OBS_VAR(&handler);
 			zephir_read_property(&_7$$7, this_ptr, ZEND_STRL("handlers"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_CALL_METHOD(&_8$$7, &matchedRoute, "getrouteid", NULL, 0);
@@ -837,7 +843,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 				ZVAL_STRING(&_10$$8, "Matched route doesn't have an associated handler");
 				ZEPHIR_CALL_METHOD(NULL, &_9$$8, "__construct", NULL, 29, &_10$$8);
 				zephir_check_call_status_or_jump(try_end_1);
-				zephir_throw_exception_debug(&_9$$8, "phalcon/Mvc/Micro.zep", 453);
+				zephir_throw_exception_debug(&_9$$8, "phalcon/Mvc/Micro.zep", 432);
 				goto try_end_1;
 
 			}
@@ -862,7 +868,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			} else {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 			}
-			zephir_is_iterable(&beforeHandlers, 0, "phalcon/Mvc/Micro.zep", 506);
+			zephir_is_iterable(&beforeHandlers, 0, "phalcon/Mvc/Micro.zep", 484);
 			if (Z_TYPE_P(&beforeHandlers) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&beforeHandlers), _16$$7)
 				{
@@ -883,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 							ZVAL_STRING(&_20$$14, "'before' handler is not callable");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$14, "__construct", NULL, 29, &_20$$14);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_19$$14, "phalcon/Mvc/Micro.zep", 489);
+							zephir_throw_exception_debug(&_19$$14, "phalcon/Mvc/Micro.zep", 467);
 							goto try_end_1;
 
 						}
@@ -922,7 +928,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 								ZVAL_STRING(&_24$$19, "'before' handler is not callable");
 								ZEPHIR_CALL_METHOD(NULL, &_23$$19, "__construct", NULL, 29, &_24$$19);
 								zephir_check_call_status_or_jump(try_end_1);
-								zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Micro.zep", 489);
+								zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Micro.zep", 467);
 								goto try_end_1;
 
 							}
@@ -973,14 +979,14 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			}
 			if (Z_TYPE_P(&handler) == IS_ARRAY) {
 				ZEPHIR_OBS_NVAR(&realHandler);
-				zephir_array_fetch_long(&realHandler, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 537);
+				zephir_array_fetch_long(&realHandler, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 515);
 				_33$$25 = zephir_instance_of_ev(&realHandler, phalcon_mvc_controller_ce);
 				if (_33$$25) {
 					_33$$25 = Z_TYPE_P(&modelBinder) != IS_NULL;
 				}
 				if (_33$$25) {
 					ZEPHIR_OBS_VAR(&methodName);
-					zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 540);
+					zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 518);
 					ZEPHIR_INIT_VAR(&_34$$26);
 					zephir_get_class(&_34$$26, &realHandler, 0);
 					ZEPHIR_INIT_VAR(&_35$$26);
@@ -997,7 +1003,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			}
 			if (_37$$7) {
 				ZEPHIR_OBS_NVAR(&methodName);
-				zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 557);
+				zephir_array_fetch_long(&methodName, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 535);
 				ZEPHIR_CALL_METHOD(&lazyReturned, &realHandler, "callmethod", NULL, 0, &methodName, &params, &modelBinder);
 				zephir_check_call_status_or_jump(try_end_1);
 			} else {
@@ -1024,7 +1030,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			} else {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 			}
-			zephir_is_iterable(&afterBindingHandlers, 0, "phalcon/Mvc/Micro.zep", 620);
+			zephir_is_iterable(&afterBindingHandlers, 0, "phalcon/Mvc/Micro.zep", 598);
 			if (Z_TYPE_P(&afterBindingHandlers) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&afterBindingHandlers), _42$$7)
 				{
@@ -1045,7 +1051,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 							ZVAL_STRING(&_46$$34, "'afterBinding' handler is not callable");
 							ZEPHIR_CALL_METHOD(NULL, &_45$$34, "__construct", NULL, 29, &_46$$34);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_45$$34, "phalcon/Mvc/Micro.zep", 600);
+							zephir_throw_exception_debug(&_45$$34, "phalcon/Mvc/Micro.zep", 578);
 							goto try_end_1;
 
 						}
@@ -1084,7 +1090,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 								ZVAL_STRING(&_50$$39, "'afterBinding' handler is not callable");
 								ZEPHIR_CALL_METHOD(NULL, &_49$$39, "__construct", NULL, 29, &_50$$39);
 								zephir_check_call_status_or_jump(try_end_1);
-								zephir_throw_exception_debug(&_49$$39, "phalcon/Mvc/Micro.zep", 600);
+								zephir_throw_exception_debug(&_49$$39, "phalcon/Mvc/Micro.zep", 578);
 								goto try_end_1;
 
 							}
@@ -1117,7 +1123,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 			} else {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 			}
-			zephir_is_iterable(&afterHandlers, 0, "phalcon/Mvc/Micro.zep", 659);
+			zephir_is_iterable(&afterHandlers, 0, "phalcon/Mvc/Micro.zep", 637);
 			if (Z_TYPE_P(&afterHandlers) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&afterHandlers), _55$$7)
 				{
@@ -1138,7 +1144,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 							ZVAL_STRING(&_59$$45, "One of the 'after' handlers is not callable");
 							ZEPHIR_CALL_METHOD(NULL, &_58$$45, "__construct", NULL, 29, &_59$$45);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_58$$45, "phalcon/Mvc/Micro.zep", 646);
+							zephir_throw_exception_debug(&_58$$45, "phalcon/Mvc/Micro.zep", 624);
 							goto try_end_1;
 
 						}
@@ -1177,7 +1183,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 								ZVAL_STRING(&_63$$50, "One of the 'after' handlers is not callable");
 								ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", NULL, 29, &_63$$50);
 								zephir_check_call_status_or_jump(try_end_1);
-								zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Micro.zep", 646);
+								zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Micro.zep", 624);
 								goto try_end_1;
 
 							}
@@ -1215,7 +1221,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 				ZVAL_STRING(&_71$$55, "Not-Found handler is not callable or is not defined");
 				ZEPHIR_CALL_METHOD(NULL, &_70$$55, "__construct", NULL, 29, &_71$$55);
 				zephir_check_call_status_or_jump(try_end_1);
-				zephir_throw_exception_debug(&_70$$55, "phalcon/Mvc/Micro.zep", 677);
+				zephir_throw_exception_debug(&_70$$55, "phalcon/Mvc/Micro.zep", 655);
 				goto try_end_1;
 
 			}
@@ -1238,40 +1244,36 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 		} else {
 			zephir_update_property_zval(this_ptr, ZEND_STRL("stopped"), &__$false);
 		}
-		zephir_is_iterable(&finishHandlers, 0, "phalcon/Mvc/Micro.zep", 732);
+		zephir_is_iterable(&finishHandlers, 0, "phalcon/Mvc/Micro.zep", 709);
 		if (Z_TYPE_P(&finishHandlers) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&finishHandlers), _76$$4)
 			{
 				ZEPHIR_INIT_NVAR(&finish);
 				ZVAL_COPY(&finish, _76$$4);
-				_78$$57 = Z_TYPE_P(&finish) == IS_OBJECT;
-				if (_78$$57) {
-					_78$$57 = zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce);
-				}
-				if (_78$$57) {
+				if (zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce)) {
 					ZEPHIR_CALL_METHOD(&status, &finish, "call", NULL, 0, this_ptr);
 					zephir_check_call_status_or_jump(try_end_1);
 				} else {
 					if (UNEXPECTED(!(zephir_is_callable(&finish)))) {
+						ZEPHIR_INIT_NVAR(&_78$$60);
+						object_init_ex(&_78$$60, phalcon_mvc_micro_exception_ce);
 						ZEPHIR_INIT_NVAR(&_79$$60);
-						object_init_ex(&_79$$60, phalcon_mvc_micro_exception_ce);
-						ZEPHIR_INIT_NVAR(&_80$$60);
-						ZVAL_STRING(&_80$$60, "One of the 'finish' handlers is not callable");
-						ZEPHIR_CALL_METHOD(NULL, &_79$$60, "__construct", NULL, 29, &_80$$60);
+						ZVAL_STRING(&_79$$60, "One of the 'finish' handlers is not callable");
+						ZEPHIR_CALL_METHOD(NULL, &_78$$60, "__construct", NULL, 29, &_79$$60);
 						zephir_check_call_status_or_jump(try_end_1);
-						zephir_throw_exception_debug(&_79$$60, "phalcon/Mvc/Micro.zep", 713);
+						zephir_throw_exception_debug(&_78$$60, "phalcon/Mvc/Micro.zep", 690);
 						goto try_end_1;
 
 					}
-					ZEPHIR_INIT_NVAR(&_81$$59);
-					zephir_create_array(&_81$$59, 1, 0);
-					zephir_array_fast_append(&_81$$59, this_ptr);
+					ZEPHIR_INIT_NVAR(&_80$$59);
+					zephir_create_array(&_80$$59, 1, 0);
+					zephir_array_fast_append(&_80$$59, this_ptr);
 					ZEPHIR_INIT_NVAR(&status);
-					ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_81$$59);
+					ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_80$$59);
 					zephir_check_call_status_or_jump(try_end_1);
 				}
-				zephir_read_property(&_82$$57, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
-				if (zephir_is_true(&_82$$57)) {
+				zephir_read_property(&_81$$57, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
+				if (zephir_is_true(&_81$$57)) {
 					break;
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -1286,34 +1288,30 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 				}
 				ZEPHIR_CALL_METHOD(&finish, &finishHandlers, "current", NULL, 0);
 				zephir_check_call_status();
-					_83$$62 = Z_TYPE_P(&finish) == IS_OBJECT;
-					if (_83$$62) {
-						_83$$62 = zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce);
-					}
-					if (_83$$62) {
+					if (zephir_instance_of_ev(&finish, phalcon_mvc_micro_middlewareinterface_ce)) {
 						ZEPHIR_CALL_METHOD(&status, &finish, "call", NULL, 0, this_ptr);
 						zephir_check_call_status_or_jump(try_end_1);
 					} else {
 						if (UNEXPECTED(!(zephir_is_callable(&finish)))) {
-							ZEPHIR_INIT_NVAR(&_84$$65);
-							object_init_ex(&_84$$65, phalcon_mvc_micro_exception_ce);
-							ZEPHIR_INIT_NVAR(&_85$$65);
-							ZVAL_STRING(&_85$$65, "One of the 'finish' handlers is not callable");
-							ZEPHIR_CALL_METHOD(NULL, &_84$$65, "__construct", NULL, 29, &_85$$65);
+							ZEPHIR_INIT_NVAR(&_82$$65);
+							object_init_ex(&_82$$65, phalcon_mvc_micro_exception_ce);
+							ZEPHIR_INIT_NVAR(&_83$$65);
+							ZVAL_STRING(&_83$$65, "One of the 'finish' handlers is not callable");
+							ZEPHIR_CALL_METHOD(NULL, &_82$$65, "__construct", NULL, 29, &_83$$65);
 							zephir_check_call_status_or_jump(try_end_1);
-							zephir_throw_exception_debug(&_84$$65, "phalcon/Mvc/Micro.zep", 713);
+							zephir_throw_exception_debug(&_82$$65, "phalcon/Mvc/Micro.zep", 690);
 							goto try_end_1;
 
 						}
-						ZEPHIR_INIT_NVAR(&_86$$64);
-						zephir_create_array(&_86$$64, 1, 0);
-						zephir_array_fast_append(&_86$$64, this_ptr);
+						ZEPHIR_INIT_NVAR(&_84$$64);
+						zephir_create_array(&_84$$64, 1, 0);
+						zephir_array_fast_append(&_84$$64, this_ptr);
 						ZEPHIR_INIT_NVAR(&status);
-						ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_86$$64);
+						ZEPHIR_CALL_USER_FUNC_ARRAY(&status, &finish, &_84$$64);
 						zephir_check_call_status_or_jump(try_end_1);
 					}
-					zephir_read_property(&_87$$62, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
-					if (zephir_is_true(&_87$$62)) {
+					zephir_read_property(&_85$$62, this_ptr, ZEND_STRL("stopped"), PH_NOISY_CC | PH_READONLY);
+					if (zephir_is_true(&_85$$62)) {
 						break;
 					}
 				ZEPHIR_CALL_METHOD(NULL, &finishHandlers, "next", NULL, 0);
@@ -1325,49 +1323,50 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_88);
-		ZVAL_OBJ(&_88, EG(exception));
-		Z_ADDREF_P(&_88);
-		if (zephir_is_instance_of(&_88, SL("Throwable"))) {
+		ZEPHIR_INIT_VAR(&_86);
+		ZVAL_OBJ(&_86, EG(exception));
+		Z_ADDREF_P(&_86);
+		if (zephir_is_instance_of(&_86, SL("Throwable"))) {
 			zend_clear_exception();
-			ZEPHIR_CPY_WRT(&e, &_88);
-			zephir_read_property(&_89$$67, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-			if (Z_TYPE_P(&_89$$67) != IS_NULL) {
-				zephir_read_property(&_90$$68, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
-				ZEPHIR_INIT_VAR(&_91$$68);
-				ZVAL_STRING(&_91$$68, "micro:beforeException");
-				ZEPHIR_CALL_METHOD(&returnedValue, &_90$$68, "fire", NULL, 0, &_91$$68, this_ptr, &e);
+			ZEPHIR_CPY_WRT(&e, &_86);
+			zephir_read_property(&_87$$67, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+			if (Z_TYPE_P(&_87$$67) != IS_NULL) {
+				zephir_read_property(&_88$$68, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
+				ZEPHIR_INIT_VAR(&_89$$68);
+				ZVAL_STRING(&_89$$68, "micro:beforeException");
+				ZEPHIR_CALL_METHOD(&returnedValue, &_88$$68, "fire", NULL, 0, &_89$$68, this_ptr, &e);
 				zephir_check_call_status();
 			}
-			zephir_read_property(&_92$$67, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
-			ZEPHIR_CPY_WRT(&errorHandler, &_92$$67);
-			if (zephir_is_true(&errorHandler)) {
-				if (UNEXPECTED(!(zephir_is_callable(&errorHandler)))) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Error handler is not callable", "phalcon/Mvc/Micro.zep", 751);
+			zephir_read_property(&_90$$67, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
+			if (Z_TYPE_P(&_90$$67) != IS_NULL) {
+				zephir_read_property(&_91$$69, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
+				if (UNEXPECTED(!(zephir_is_callable(&_91$$69)))) {
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Error handler is not callable", "phalcon/Mvc/Micro.zep", 726);
 					return;
 				}
+				zephir_read_property(&_92$$69, this_ptr, ZEND_STRL("errorHandler"), PH_NOISY_CC | PH_READONLY);
 				ZEPHIR_INIT_VAR(&_93$$69);
 				zephir_create_array(&_93$$69, 1, 0);
 				zephir_array_fast_append(&_93$$69, &e);
 				ZEPHIR_INIT_NVAR(&returnedValue);
-				ZEPHIR_CALL_USER_FUNC_ARRAY(&returnedValue, &errorHandler, &_93$$69);
+				ZEPHIR_CALL_USER_FUNC_ARRAY(&returnedValue, &_92$$69, &_93$$69);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&returnedValue) == IS_OBJECT) {
 					if (!(zephir_instance_of_ev(&returnedValue, phalcon_http_responseinterface_ce))) {
-						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 764);
+						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 739);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				} else {
 					if (!ZEPHIR_IS_FALSE_IDENTICAL(&returnedValue)) {
-						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 768);
+						zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 743);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				}
 			} else {
 				if (!ZEPHIR_IS_FALSE_IDENTICAL(&returnedValue)) {
-					zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 773);
+					zephir_throw_exception_debug(&e, "phalcon/Mvc/Micro.zep", 748);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -1378,7 +1377,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 	if (zephir_is_true(&_0)) {
 		zephir_read_property(&_94$$77, this_ptr, ZEND_STRL("responseHandler"), PH_NOISY_CC | PH_READONLY);
 		if (UNEXPECTED(!(zephir_is_callable(&_94$$77)))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Response handler is not callable or is not defined", "phalcon/Mvc/Micro.zep", 786);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Response handler is not callable or is not defined", "phalcon/Mvc/Micro.zep", 761);
 			return;
 		}
 		zephir_read_property(&_95$$77, this_ptr, ZEND_STRL("responseHandler"), PH_NOISY_CC | PH_READONLY);
@@ -1405,13 +1404,15 @@ PHP_METHOD(Phalcon_Mvc_Micro, handle)
 		if (_98$$79) {
 			_98$$79 = zephir_instance_of_ev(&returnedValue, phalcon_http_responseinterface_ce);
 		}
-		if (_98$$79) {
-			ZEPHIR_CALL_METHOD(&_99$$82, &returnedValue, "issent", NULL, 0);
+		_99$$79 = _98$$79;
+		if (_99$$79) {
+			ZEPHIR_CALL_METHOD(&_100$$79, &returnedValue, "issent", NULL, 0);
+			zephir_check_call_status();
+			_99$$79 = !zephir_is_true(&_100$$79);
+		}
+		if (_99$$79) {
+			ZEPHIR_CALL_METHOD(NULL, &returnedValue, "send", NULL, 0);
 			zephir_check_call_status();
-			if (!(zephir_is_true(&_99$$82))) {
-				ZEPHIR_CALL_METHOD(NULL, &returnedValue, "send", NULL, 0);
-				zephir_check_call_status();
-			}
 		}
 	}
 	RETURN_CCTOR(&returnedValue);
@@ -1424,13 +1425,14 @@ PHP_METHOD(Phalcon_Mvc_Micro, hasService)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *serviceName_param = NULL, container, _0;
+	zval *serviceName_param = NULL, _0, _2, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -1453,15 +1455,15 @@ PHP_METHOD(Phalcon_Mvc_Micro, hasService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 418, &serviceName);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "has", NULL, 0, &serviceName);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -1609,13 +1611,13 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount)
 	ZEPHIR_CALL_METHOD(&mainHandler, collection, "gethandler", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(ZEPHIR_IS_EMPTY(&mainHandler))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Collection requires a main handler", "phalcon/Mvc/Micro.zep", 909);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "Collection requires a main handler", "phalcon/Mvc/Micro.zep", 876);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&handlers, collection, "gethandlers", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!(zephir_fast_count_int(&handlers)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "There are no handlers to mount", "phalcon/Mvc/Micro.zep", 915);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "There are no handlers to mount", "phalcon/Mvc/Micro.zep", 882);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&_0, collection, "islazy", NULL, 0);
@@ -1623,37 +1625,37 @@ 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, 419, &mainHandler);
+		ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 416, &mainHandler);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler);
 	}
 	ZEPHIR_CALL_METHOD(&prefix, collection, "getprefix", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Micro.zep", 973);
+	zephir_is_iterable(&handlers, 0, "phalcon/Mvc/Micro.zep", 940);
 	if (Z_TYPE_P(&handlers) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&handlers), _1)
 		{
 			ZEPHIR_INIT_NVAR(&handler);
 			ZVAL_COPY(&handler, _1);
 			if (UNEXPECTED(Z_TYPE_P(&handler) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 936);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 903);
 				return;
 			}
 			ZEPHIR_OBS_NVAR(&methods);
-			zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 939);
+			zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 906);
 			ZEPHIR_OBS_NVAR(&pattern);
-			zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 940);
+			zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 907);
 			ZEPHIR_OBS_NVAR(&subHandler);
-			zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 941);
+			zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 908);
 			ZEPHIR_OBS_NVAR(&name);
-			zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 942);
+			zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 909);
 			ZEPHIR_INIT_NVAR(&realHandler);
 			zephir_create_array(&realHandler, 2, 0);
 			zephir_array_fast_append(&realHandler, &lazyHandler);
 			zephir_array_fast_append(&realHandler, &subHandler);
 			if (!(ZEPHIR_IS_EMPTY(&prefix))) {
-				if (ZEPHIR_IS_STRING(&pattern, "/")) {
+				if (ZEPHIR_IS_STRING_IDENTICAL(&pattern, "/")) {
 					ZEPHIR_CPY_WRT(&prefixedPattern, &prefix);
 				} else {
 					ZEPHIR_INIT_NVAR(&prefixedPattern);
@@ -1666,7 +1668,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount)
 			zephir_check_call_status();
 			_4$$7 = Z_TYPE_P(&methods) == IS_STRING;
 			if (_4$$7) {
-				_4$$7 = !ZEPHIR_IS_STRING(&methods, "");
+				_4$$7 = !ZEPHIR_IS_STRING_IDENTICAL(&methods, "");
 			}
 			_5$$7 = _4$$7;
 			if (!(_5$$7)) {
@@ -1693,24 +1695,24 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount)
 			ZEPHIR_CALL_METHOD(&handler, &handlers, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&handler) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 936);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_micro_exception_ce, "One of the registered handlers is invalid", "phalcon/Mvc/Micro.zep", 903);
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&methods);
-				zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 939);
+				zephir_array_fetch_long(&methods, &handler, 0, PH_NOISY, "phalcon/Mvc/Micro.zep", 906);
 				ZEPHIR_OBS_NVAR(&pattern);
-				zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 940);
+				zephir_array_fetch_long(&pattern, &handler, 1, PH_NOISY, "phalcon/Mvc/Micro.zep", 907);
 				ZEPHIR_OBS_NVAR(&subHandler);
-				zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 941);
+				zephir_array_fetch_long(&subHandler, &handler, 2, PH_NOISY, "phalcon/Mvc/Micro.zep", 908);
 				ZEPHIR_OBS_NVAR(&name);
-				zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 942);
+				zephir_array_fetch_long(&name, &handler, 3, PH_NOISY, "phalcon/Mvc/Micro.zep", 909);
 				ZEPHIR_INIT_NVAR(&_6$$15);
 				zephir_create_array(&_6$$15, 2, 0);
 				zephir_array_fast_append(&_6$$15, &lazyHandler);
 				zephir_array_fast_append(&_6$$15, &subHandler);
 				ZEPHIR_CPY_WRT(&realHandler, &_6$$15);
 				if (!(ZEPHIR_IS_EMPTY(&prefix))) {
-					if (ZEPHIR_IS_STRING(&pattern, "/")) {
+					if (ZEPHIR_IS_STRING_IDENTICAL(&pattern, "/")) {
 						ZEPHIR_CPY_WRT(&prefixedPattern, &prefix);
 					} else {
 						ZEPHIR_INIT_NVAR(&prefixedPattern);
@@ -1723,7 +1725,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount)
 				zephir_check_call_status();
 				_7$$15 = Z_TYPE_P(&methods) == IS_STRING;
 				if (_7$$15) {
-					_7$$15 = !ZEPHIR_IS_STRING(&methods, "");
+					_7$$15 = !ZEPHIR_IS_STRING_IDENTICAL(&methods, "");
 				}
 				_8$$15 = _7$$15;
 				if (!(_8$$15)) {
@@ -2276,14 +2278,16 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService)
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zend_bool shared;
-	zval *serviceName_param = NULL, *definition, definition_sub, *shared_param = NULL, container, _0;
+	zval *serviceName_param = NULL, *definition, definition_sub, *shared_param = NULL, _0, _2, _3, _1$$3;
 	zval serviceName;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serviceName);
 	ZVAL_UNDEF(&definition_sub);
-	ZVAL_UNDEF(&container);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_1$$3);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 3)
@@ -2314,20 +2318,20 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService)
 
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&container, &_0);
-	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, 415);
+	if (Z_TYPE_P(&_0) == IS_NULL) {
+		ZEPHIR_INIT_VAR(&_1$$3);
+		object_init_ex(&_1$$3, phalcon_di_factorydefault_ce);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 415);
 		zephir_check_call_status();
-		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
+		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &_1$$3);
 	}
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	if (shared) {
-		ZVAL_BOOL(&_0, 1);
+		ZVAL_BOOL(&_3, 1);
 	} else {
-		ZVAL_BOOL(&_0, 0);
+		ZVAL_BOOL(&_3, 0);
 	}
-	ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 420, &serviceName, definition, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "set", NULL, 0, &serviceName, definition, &_3);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/phalcon/mvc/micro.zep.h b/ext/phalcon/mvc/micro.zep.h
index 34a1bb68cd8..e236cf95e50 100644
--- a/ext/phalcon/mvc/micro.zep.h
+++ b/ext/phalcon/mvc/micro.zep.h
@@ -144,7 +144,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
@@ -204,7 +204,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_setservice, 0,
 	ZEND_ARG_TYPE_INFO(0, shared, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_stop, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_stop, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_zephir_init_properties_phalcon_mvc_micro, 0, 0, 0)
@@ -256,10 +256,6 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_micro_method_entry) {
 	PHP_ME(Phalcon_Mvc_Micro, setModelBinder, arginfo_phalcon_mvc_micro_setmodelbinder, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Micro, setResponseHandler, arginfo_phalcon_mvc_micro_setresponsehandler, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Micro, setService, arginfo_phalcon_mvc_micro_setservice, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Mvc_Micro, stop, arginfo_phalcon_mvc_micro_stop, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Phalcon_Mvc_Micro, stop, NULL, ZEND_ACC_PUBLIC)
-#endif
 	PHP_FE_END
 };
diff --git a/ext/phalcon/mvc/micro/lazyloader.zep.c b/ext/phalcon/mvc/micro/lazyloader.zep.c
index fbdc59308d5..ee68620acf9 100644
--- a/ext/phalcon/mvc/micro/lazyloader.zep.c
+++ b/ext/phalcon/mvc/micro/lazyloader.zep.c
@@ -39,39 +39,17 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Micro_LazyLoader)
 {
 	ZEPHIR_REGISTER_CLASS(Phalcon\\Mvc\\Micro, LazyLoader, phalcon, mvc_micro_lazyloader, phalcon_mvc_micro_lazyloader_method_entry, 0);
 
-	/**
-	 * @var object|null
-	 */
-	zend_declare_property_null(phalcon_mvc_micro_lazyloader_ce, SL("handler"), ZEND_ACC_PROTECTED);
 	/**
 	 * @var string
 	 */
 	zend_declare_property_null(phalcon_mvc_micro_lazyloader_ce, SL("definition"), ZEND_ACC_PROTECTED);
+	/**
+	 * @var object|null
+	 */
+	zend_declare_property_null(phalcon_mvc_micro_lazyloader_ce, SL("handler"), ZEND_ACC_PROTECTED);
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "handler");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "definition");
-}
-
 /**
  * Phalcon\Mvc\Micro\LazyLoader constructor
  */
@@ -201,3 +179,27 @@ PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod)
 	RETURN_MM();
 }
 
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "definition");
+}
+
+/**
+ * @return object|null
+ */
+PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "handler");
+}
+
diff --git a/ext/phalcon/mvc/micro/lazyloader.zep.h b/ext/phalcon/mvc/micro/lazyloader.zep.h
index 639001b5689..486163495d2 100644
--- a/ext/phalcon/mvc/micro/lazyloader.zep.h
+++ b/ext/phalcon/mvc/micro/lazyloader.zep.h
@@ -3,20 +3,10 @@ extern zend_class_entry *phalcon_mvc_micro_lazyloader_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Micro_LazyLoader);
 
-PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler);
-PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition);
 PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, __construct);
 PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, callMethod);
-
-#if PHP_VERSION_ID >= 80000
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
-#else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, IS_OBJECT, 1)
-#endif
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_getdefinition, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
+PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getDefinition);
+PHP_METHOD(Phalcon_Mvc_Micro_LazyLoader, getHandler);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, definition, IS_STRING, 0)
@@ -28,10 +18,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_callmethod, 0, 0, 2)
 	ZEND_ARG_OBJ_INFO(0, modelBinder, Phalcon\\Mvc\\Model\\BinderInterface, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_getdefinition, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#if PHP_VERSION_ID >= 80000
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
+#else
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_lazyloader_gethandler, 0, 0, IS_OBJECT, 1)
+#endif
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(phalcon_mvc_micro_lazyloader_method_entry) {
-	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getHandler, arginfo_phalcon_mvc_micro_lazyloader_gethandler, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getDefinition, arginfo_phalcon_mvc_micro_lazyloader_getdefinition, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, __construct, arginfo_phalcon_mvc_micro_lazyloader___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, callMethod, arginfo_phalcon_mvc_micro_lazyloader_callmethod, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getDefinition, arginfo_phalcon_mvc_micro_lazyloader_getdefinition, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Micro_LazyLoader, getHandler, arginfo_phalcon_mvc_micro_lazyloader_gethandler, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c
index f2408020770..fbdd664fd40 100644
--- a/ext/phalcon/mvc/model.zep.c
+++ b/ext/phalcon/mvc/model.zep.c
@@ -127,8 +127,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model)
 	 */
 	zend_declare_property_null(phalcon_mvc_model_ce, SL("uniqueParams"), ZEND_ACC_PROTECTED);
 	/**
-	 * @var array|null
-	 * TODO: Make it always array in code
+	 * @var array
 	 */
 	zend_declare_property_null(phalcon_mvc_model_ce, SL("uniqueTypes"), ZEND_ACC_PROTECTED);
 	phalcon_mvc_model_ce->create_object = zephir_init_properties_Phalcon_Mvc_Model;
@@ -209,7 +208,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct)
 		zephir_check_call_status();
 	}
 	if (Z_TYPE_P(container) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 183);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 182);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("container"), container);
@@ -220,7 +219,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(modelsManager, &_1$$5);
 		if (Z_TYPE_P(modelsManager) == IS_NULL) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 196);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 195);
 			return;
 		}
 	}
@@ -277,7 +276,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call)
 	zephir_get_arrval(&arguments, arguments_param);
 
 
-	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 421, &method, &arguments);
+	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 417, &method, &arguments);
 	zephir_check_call_status();
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) {
 		RETURN_CCTOR(&records);
@@ -301,7 +300,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call)
 	ZEPHIR_CONCAT_SVSVS(&_3, "The method '", &method, "' doesn't exist on model '", &modelName, "'");
 	ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 29, &_3);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 265);
+	zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 264);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -343,7 +342,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic)
 	zephir_get_arrval(&arguments, arguments_param);
 
 
-	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 421, &method, &arguments);
+	ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 417, &method, &arguments);
 	zephir_check_call_status();
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) {
 		RETURN_CCTOR(&records);
@@ -356,7 +355,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic)
 	ZEPHIR_CONCAT_SVSVS(&_2, "The method '", &method, "' doesn't exist on model '", &modelName, "'");
 	ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 29, &_2);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 291);
+	zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 290);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -422,7 +421,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __get)
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
 		if (zephir_array_isset(&_1$$3, &lowerProperty)) {
 			zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
-			zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 323);
+			zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 322);
 			RETURN_CTOR(&_3$$4);
 		}
 		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getrelated", NULL, 0, &lowerProperty);
@@ -687,7 +686,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 				if (ZEPHIR_IS_LONG(&_5$$7, 2) || ZEPHIR_IS_LONG(&_5$$7, 4)) {
 					ZEPHIR_INIT_VAR(&related);
 					array_init(&related);
-					zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 494);
+					zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 493);
 					if (Z_TYPE_P(value) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(value), _9$$10)
 						{
@@ -695,7 +694,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 							ZVAL_COPY(&item, _9$$10);
 							if (Z_TYPE_P(&item) == IS_OBJECT) {
 								if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) {
-									zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 489);
+									zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 488);
 								}
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -712,7 +711,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 							zephir_check_call_status();
 								if (Z_TYPE_P(&item) == IS_OBJECT) {
 									if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) {
-										zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 489);
+										zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 488);
 									}
 								}
 							ZEPHIR_CALL_METHOD(NULL, value, "next", NULL, 0);
@@ -740,7 +739,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 422, &property, value);
+	ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 418, &property, value);
 	zephir_check_call_status();
 	if (zephir_is_true(&_14)) {
 		RETVAL_ZVAL(value, 1, 0);
@@ -760,7 +759,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set)
 			ZEPHIR_CONCAT_SVS(&_18$$21, "Cannot access property '", &property, "' (not public).");
 			ZEPHIR_CALL_METHOD(NULL, &_17$$21, "__construct", NULL, 29, &_18$$21);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 523);
+			zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 522);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -818,7 +817,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&container) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 552);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 551);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
@@ -828,7 +827,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_2);
 	if (Z_TYPE_P(&manager) == IS_NULL) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 567);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 566);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager);
@@ -836,7 +835,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize)
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&properties);
 	if (zephir_array_isset_string_fetch(&properties, &data, SL("attributes"), 0)) {
-		zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 590);
+		zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 589);
 		if (Z_TYPE_P(&properties) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$6, _7$$6, _4$$6)
 			{
@@ -1111,7 +1110,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 	if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&dataMapped);
 		array_init(&dataMapped);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 750);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 749);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -1168,7 +1167,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 	}
 	ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 807);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 806);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -1179,7 +1178,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, 423, &columnMap, &attribute);
+				ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 419, &columnMap, &attribute);
 				zephir_check_call_status();
 				ZEPHIR_CPY_WRT(&attribute, &_8$$13);
 			}
@@ -1193,7 +1192,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 						ZEPHIR_CONCAT_SVS(&_11$$16, "Column '", &attribute, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_10$$16, "__construct", &_12, 29, &_11$$16);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 781);
+						zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 780);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1211,7 +1210,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, 422, &attributeField, &value);
+					ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 418, &attributeField, &value);
 					zephir_check_call_status();
 					_13$$18 = !zephir_is_true(&_14$$18);
 				}
@@ -1236,7 +1235,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, 423, &columnMap, &attribute);
+					ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 419, &columnMap, &attribute);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&attribute, &_17$$23);
 				}
@@ -1250,7 +1249,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign)
 							ZEPHIR_CONCAT_SVS(&_19$$26, "Column '", &attribute, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_18$$26, "__construct", &_12, 29, &_19$$26);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 781);
+							zephir_throw_exception_debug(&_18$$26, "phalcon/Mvc/Model.zep", 780);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1268,7 +1267,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, 422, &attributeField, &value);
+						ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 418, &attributeField, &value);
 						zephir_check_call_status();
 						_20$$28 = !zephir_is_true(&_21$$28);
 					}
@@ -1419,7 +1418,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 	ZVAL_LONG(&_0, dirtyState);
 	ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0);
 	zephir_check_call_status();
-	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 897);
+	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 896);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1)
 		{
@@ -1432,7 +1431,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 			ZEPHIR_INIT_NVAR(&value);
 			ZVAL_COPY(&value, _1);
 			if (UNEXPECTED(Z_TYPE_P(&key) != IS_STRING)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 887);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 886);
 				return;
 			}
 			zephir_update_property_zval_zval(&instance, &key, &value);
@@ -1451,7 +1450,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult)
 			ZEPHIR_CALL_METHOD(&value, &data, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&key) != IS_STRING)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 887);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/Mvc/Model.zep", 886);
 					return;
 				}
 				zephir_update_property_zval_zval(&instance, &key, &value);
@@ -1564,7 +1563,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 	ZVAL_LONG(&_0, dirtyState);
 	ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0);
 	zephir_check_call_status();
-	zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1030);
+	zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1029);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1)
 		{
@@ -1603,7 +1602,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 							ZEPHIR_CONCAT_SVS(&_7$$9, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_6$$9, "__construct", &_8, 29, &_7$$9);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 957);
+							zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 956);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1617,7 +1616,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 						ZEPHIR_CONCAT_SVS(&_10$$11, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 29, &_10$$11);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 966);
+						zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model.zep", 965);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1633,7 +1632,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 				_11$$3 = Z_TYPE_P(&value) != IS_NULL;
 			}
 			if (_11$$3) {
-				zephir_array_fetch_long(&_12$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 980);
+				zephir_array_fetch_long(&_12$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 979);
 				do {
 					if (ZEPHIR_IS_LONG(&_12$$13, 0) || ZEPHIR_IS_LONG(&_12$$13, 21) || ZEPHIR_IS_LONG(&_12$$13, 22) || ZEPHIR_IS_LONG(&_12$$13, 26)) {
 						ZVAL_LONG(&_13$$14, 10);
@@ -1656,7 +1655,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 				} while(0);
 
 			} else {
-				zephir_array_fetch_long(&_15$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1003);
+				zephir_array_fetch_long(&_15$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1002);
 				do {
 					if (ZEPHIR_IS_LONG(&_15$$18, 14) || ZEPHIR_IS_LONG(&_15$$18, 8) || ZEPHIR_IS_LONG(&_15$$18, 3) || ZEPHIR_IS_LONG(&_15$$18, 9) || ZEPHIR_IS_LONG(&_15$$18, 7) || ZEPHIR_IS_LONG(&_15$$18, 0) || ZEPHIR_IS_LONG(&_15$$18, 21) || ZEPHIR_IS_LONG(&_15$$18, 22) || ZEPHIR_IS_LONG(&_15$$18, 26)) {
 						ZEPHIR_INIT_NVAR(&castValue);
@@ -1669,7 +1668,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 
 			}
 			ZEPHIR_OBS_NVAR(&attributeName);
-			zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1022);
+			zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1021);
 			zephir_update_property_zval_zval(&instance, &attributeName, &castValue);
 			zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE);
 		} ZEND_HASH_FOREACH_END();
@@ -1713,7 +1712,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 								ZEPHIR_CONCAT_SVS(&_18$$27, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 29, &_18$$27);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 957);
+								zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model.zep", 956);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -1727,7 +1726,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 							ZEPHIR_CONCAT_SVS(&_20$$29, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$29, "__construct", &_8, 29, &_20$$29);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 966);
+							zephir_throw_exception_debug(&_19$$29, "phalcon/Mvc/Model.zep", 965);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1743,7 +1742,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 					_21$$21 = Z_TYPE_P(&value) != IS_NULL;
 				}
 				if (_21$$21) {
-					zephir_array_fetch_long(&_22$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 980);
+					zephir_array_fetch_long(&_22$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 979);
 					do {
 						if (ZEPHIR_IS_LONG(&_22$$31, 0) || ZEPHIR_IS_LONG(&_22$$31, 21) || ZEPHIR_IS_LONG(&_22$$31, 22) || ZEPHIR_IS_LONG(&_22$$31, 26)) {
 							ZVAL_LONG(&_23$$32, 10);
@@ -1766,7 +1765,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 					} while(0);
 
 				} else {
-					zephir_array_fetch_long(&_24$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1003);
+					zephir_array_fetch_long(&_24$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1002);
 					do {
 						if (ZEPHIR_IS_LONG(&_24$$36, 14) || ZEPHIR_IS_LONG(&_24$$36, 8) || ZEPHIR_IS_LONG(&_24$$36, 3) || ZEPHIR_IS_LONG(&_24$$36, 9) || ZEPHIR_IS_LONG(&_24$$36, 7) || ZEPHIR_IS_LONG(&_24$$36, 0) || ZEPHIR_IS_LONG(&_24$$36, 21) || ZEPHIR_IS_LONG(&_24$$36, 22) || ZEPHIR_IS_LONG(&_24$$36, 26)) {
 							ZEPHIR_INIT_NVAR(&castValue);
@@ -1779,7 +1778,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap)
 
 				}
 				ZEPHIR_OBS_NVAR(&attributeName);
-				zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1022);
+				zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1021);
 				zephir_update_property_zval_zval(&instance, &attributeName, &castValue);
 				zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE);
 			ZEPHIR_CALL_METHOD(NULL, &data, "next", NULL, 0);
@@ -1861,7 +1860,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 	}
 	ZEPHIR_INIT_VAR(&hydrateArray);
 	array_init(&hydrateArray);
-	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1114);
+	zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1113);
 	if (Z_TYPE_P(&data) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2, _3, _0)
 		{
@@ -1882,7 +1881,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, 423, columnMap, &key);
+					ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&key, &_5$$8);
 				}
@@ -1895,7 +1894,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 						ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_9, 29, &_8$$10);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1093);
+						zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1092);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -1903,7 +1902,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 				}
 				if (Z_TYPE_P(&attribute) == IS_ARRAY) {
 					ZEPHIR_OBS_NVAR(&attributeName);
-					zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1103);
+					zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1102);
 				} else {
 					ZEPHIR_CPY_WRT(&attributeName, &attribute);
 				}
@@ -1934,7 +1933,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, 423, columnMap, &key);
+						ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 						zephir_check_call_status();
 						ZEPHIR_CPY_WRT(&key, &_11$$17);
 					}
@@ -1947,7 +1946,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 							ZEPHIR_CONCAT_SVS(&_13$$19, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$19, "__construct", &_9, 29, &_13$$19);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1093);
+							zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1092);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1955,7 +1954,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate)
 					}
 					if (Z_TYPE_P(&attribute) == IS_ARRAY) {
 						ZEPHIR_OBS_NVAR(&attributeName);
-						zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1103);
+						zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1102);
 					} else {
 						ZEPHIR_CPY_WRT(&attributeName, &attribute);
 					}
@@ -2010,7 +2009,7 @@ PHP_METHOD(Phalcon_Mvc_Model, collectRelatedToSave)
 	ZEPHIR_CPY_WRT(&related, &_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&dirtyRelated, &_1);
-	zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1155);
+	zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1154);
 	if (Z_TYPE_P(&related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&related), _4, _5, _2)
 		{
@@ -2186,7 +2185,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, 424);
+	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 420);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1);
 	zephir_check_call_status();
@@ -2285,7 +2284,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, 424);
+	ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 420);
 	zephir_check_call_status();
 	ZEPHIR_INIT_ZVAL_NREF(_0);
 	ZVAL_LONG(&_0, 3);
@@ -2294,7 +2293,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, 425);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 421);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) {
 			RETURN_MM_BOOL(0);
@@ -2318,10 +2317,10 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 		ZVAL_NULL(&columnMap);
 	}
 	if (UNEXPECTED(!(zephir_fast_count_int(&primaryKeys)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 1308);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 1307);
 		return;
 	}
-	zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1356);
+	zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1355);
 	if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _3)
 		{
@@ -2335,7 +2334,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 				ZEPHIR_CONCAT_SVS(&_6$$9, "Column '", &primaryKey, "' have not defined a bind data type");
 				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_7, 29, &_6$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1322);
+				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 1321);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -2348,7 +2347,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_9$$11, "Column '", &primaryKey, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_7, 29, &_9$$11);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1332);
+					zephir_throw_exception_debug(&_8$$11, "phalcon/Mvc/Model.zep", 1331);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -2363,17 +2362,17 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 				ZEPHIR_CONCAT_SVS(&_11$$13, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set");
 				ZEPHIR_CALL_METHOD(NULL, &_10$$13, "__construct", &_7, 29, &_11$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1345);
+				zephir_throw_exception_debug(&_10$$13, "phalcon/Mvc/Model.zep", 1344);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
+			zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1350);
 			ZEPHIR_CALL_METHOD(&_12$$8, &writeConnection, "escapeidentifier", &_13, 0, &primaryKey);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_14$$8);
 			ZEPHIR_CONCAT_VS(&_14$$8, &_12$$8, " = ?");
-			zephir_array_append(&conditions, &_14$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
-			zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
+			zephir_array_append(&conditions, &_14$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
+			zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -2394,7 +2393,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_16$$15, "Column '", &primaryKey, "' have not defined a bind data type");
 					ZEPHIR_CALL_METHOD(NULL, &_15$$15, "__construct", &_7, 29, &_16$$15);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1322);
+					zephir_throw_exception_debug(&_15$$15, "phalcon/Mvc/Model.zep", 1321);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -2407,7 +2406,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 						ZEPHIR_CONCAT_SVS(&_18$$17, "Column '", &primaryKey, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_17$$17, "__construct", &_7, 29, &_18$$17);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1332);
+						zephir_throw_exception_debug(&_17$$17, "phalcon/Mvc/Model.zep", 1331);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -2422,17 +2421,17 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 					ZEPHIR_CONCAT_SVS(&_20$$19, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set");
 					ZEPHIR_CALL_METHOD(NULL, &_19$$19, "__construct", &_7, 29, &_20$$19);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1345);
+					zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 1344);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1350);
 				ZEPHIR_CALL_METHOD(&_21$$14, &writeConnection, "escapeidentifier", &_22, 0, &primaryKey);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_23$$14);
 				ZEPHIR_CONCAT_VS(&_23$$14, &_21$$14, " = ?");
-				zephir_array_append(&conditions, &_23$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
-				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1353);
+				zephir_array_append(&conditions, &_23$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1351);
+				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1352);
 			ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -2456,9 +2455,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete)
 			RETURN_MM_BOOL(1);
 		}
 	}
-	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -2473,7 +2472,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, 428);
+		ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 424);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) {
 			RETURN_MM_BOOL(0);
@@ -2513,7 +2512,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 429, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 425, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -2730,12 +2729,12 @@ PHP_METHOD(Phalcon_Mvc_Model, find)
 		ZEPHIR_INIT_VAR(&params);
 		array_init(&params);
 		if (Z_TYPE_P(parameters) != IS_NULL) {
-			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1617);
+			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1616);
 		}
 	} else {
 		ZEPHIR_CPY_WRT(&params, parameters);
 	}
-	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 430, &params);
+	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 426, &params);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0);
 	zephir_check_call_status();
@@ -2882,11 +2881,11 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst)
 		zephir_array_fast_append(&_1$$5, parameters);
 		ZEPHIR_CPY_WRT(&params, &_1$$5);
 	} else {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/Mvc/Model.zep", 1741);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/Mvc/Model.zep", 1740);
 		return;
 	}
 	ZVAL_LONG(&_3, 1);
-	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 430, &params, &_3);
+	ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 426, &params, &_3);
 	zephir_check_call_status();
 	ZVAL_BOOL(&_3, 1);
 	ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3);
@@ -3033,7 +3032,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&snapshot, &_0);
 	if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 1827);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 1826);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0);
@@ -3049,7 +3048,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 	ZEPHIR_INIT_VAR(&changed);
 	array_init(&changed);
 	ZEPHIR_INIT_VAR(&_1);
-	zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1885);
+	zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1884);
 	if (Z_TYPE_P(&allAttributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _4, _5, _2)
 		{
@@ -3062,17 +3061,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 			ZEPHIR_INIT_NVAR(&_1);
 			ZVAL_COPY(&_1, _2);
 			if (!(zephir_array_isset(&snapshot, &name))) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1860);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1859);
 				continue;
 			}
 			ZEPHIR_OBS_NVAR(&value);
 			if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1870);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1869);
 				continue;
 			}
-			zephir_array_fetch(&_6$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1878);
+			zephir_array_fetch(&_6$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1877);
 			if (!ZEPHIR_IS_IDENTICAL(&value, &_6$$6)) {
-				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1879);
+				zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1878);
 				continue;
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -3090,17 +3089,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields)
 			ZEPHIR_CALL_METHOD(&_1, &allAttributes, "current", NULL, 0);
 			zephir_check_call_status();
 				if (!(zephir_array_isset(&snapshot, &name))) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1860);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1859);
 					continue;
 				}
 				ZEPHIR_OBS_NVAR(&value);
 				if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1870);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1869);
 					continue;
 				}
-				zephir_array_fetch(&_7$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1878);
+				zephir_array_fetch(&_7$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1877);
 				if (!ZEPHIR_IS_IDENTICAL(&value, &_7$$10)) {
-					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1879);
+					zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1878);
 					continue;
 				}
 			ZEPHIR_CALL_METHOD(NULL, &allAttributes, "next", NULL, 0);
@@ -3211,7 +3210,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 		ZEPHIR_INIT_VAR(&filtered);
 		array_init(&filtered);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
-		zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1942);
+		zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1941);
 		if (Z_TYPE_P(&_1$$3) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3)
 			{
@@ -3220,7 +3219,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 				ZEPHIR_CALL_METHOD(&_4$$4, &message, "getfield", NULL, 0);
 				zephir_check_call_status();
 				if (ZEPHIR_IS_EQUAL(&_4$$4, filter)) {
-					zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1938);
+					zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1937);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -3237,7 +3236,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages)
 					ZEPHIR_CALL_METHOD(&_5$$6, &message, "getfield", NULL, 0);
 					zephir_check_call_status();
 					if (ZEPHIR_IS_EQUAL(&_5$$6, filter)) {
-						zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1938);
+						zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1937);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &_1$$3, "next", NULL, 0);
 				zephir_check_call_status();
@@ -3282,7 +3281,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData)
 
 	ZEPHIR_OBS_VAR(&metaData);
 	zephir_read_property(&metaData, this_ptr, ZEND_STRL("modelsMetaData"), PH_NOISY_CC);
-	if (Z_TYPE_P(&metaData) != IS_OBJECT) {
+	if (Z_TYPE_P(&metaData) == IS_NULL) {
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_0$$3);
 		ZEPHIR_INIT_VAR(&_2$$3);
@@ -3291,7 +3290,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&metaData, &_1$$3);
 		if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/Mvc/Model.zep", 1976);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/Mvc/Model.zep", 1975);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("modelsMetaData"), &metaData);
@@ -3329,26 +3328,27 @@ PHP_METHOD(Phalcon_Mvc_Model, getOldSnapshotData)
  */
 PHP_METHOD(Phalcon_Mvc_Model, getReadConnection)
 {
-	zval transaction, _0;
+	zval _0, _2, _1$$3;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&transaction);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&transaction, &_0);
-	if (Z_TYPE_P(&transaction) == IS_OBJECT) {
-		ZEPHIR_RETURN_CALL_METHOD(&transaction, "getconnection", NULL, 0);
+	if (Z_TYPE_P(&_0) != IS_NULL) {
+		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_1$$3, "getconnection", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "getreadconnection", NULL, 0, this_ptr);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "getreadconnection", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -3436,7 +3436,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getRelated)
 		ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 29, &_3$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2055);
+		zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2050);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -3599,21 +3599,21 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&oldSnapshot, &_0);
 	if (UNEXPECTED(!(ZEPHIR_GLOBAL(orm).update_snapshot_on_save))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly", "phalcon/Mvc/Model.zep", 2179);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly", "phalcon/Mvc/Model.zep", 2174);
 		return;
 	}
 	if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2185);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2180);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!ZEPHIR_IS_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/Mvc/Model.zep", 2194);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/Mvc/Model.zep", 2189);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&updated);
 	array_init(&updated);
-	zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2209);
+	zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2204);
 	if (Z_TYPE_P(&snapshot) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _3, _4, _1)
 		{
@@ -3627,11 +3627,11 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 			ZVAL_COPY(&value, _1);
 			_5$$6 = !(zephir_array_isset(&oldSnapshot, &name));
 			if (!(_5$$6)) {
-				zephir_array_fetch(&_6$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2204);
+				zephir_array_fetch(&_6$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2199);
 				_5$$6 = !ZEPHIR_IS_IDENTICAL(&value, &_6$$6);
 			}
 			if (_5$$6) {
-				zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2205);
+				zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2200);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -3649,11 +3649,11 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
 			zephir_check_call_status();
 				_7$$8 = !(zephir_array_isset(&oldSnapshot, &name));
 				if (!(_7$$8)) {
-					zephir_array_fetch(&_8$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2204);
+					zephir_array_fetch(&_8$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2199);
 					_7$$8 = !ZEPHIR_IS_IDENTICAL(&value, &_8$$8);
 				}
 				if (_7$$8) {
-					zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2205);
+					zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2200);
 				}
 			ZEPHIR_CALL_METHOD(NULL, &snapshot, "next", NULL, 0);
 			zephir_check_call_status();
@@ -3669,26 +3669,27 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields)
  */
 PHP_METHOD(Phalcon_Mvc_Model, getWriteConnection)
 {
-	zval transaction, _0;
+	zval _0, _2, _1$$3;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&transaction);
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_1$$3);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&transaction, &_0);
-	if (Z_TYPE_P(&transaction) == IS_OBJECT) {
-		ZEPHIR_RETURN_CALL_METHOD(&transaction, "getconnection", NULL, 0);
+	if (Z_TYPE_P(&_0) != IS_NULL) {
+		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("transaction"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_RETURN_CALL_METHOD(&_1$$3, "getconnection", NULL, 0);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "getwriteconnection", NULL, 0, this_ptr);
+	zephir_read_property(&_2, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_RETURN_CALL_METHOD(&_2, "getwriteconnection", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -3779,7 +3780,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, 431, fieldName, &changedFields);
+		ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 427, fieldName, &changedFields);
 		zephir_check_call_status();
 		if (allFields) {
 			RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName));
@@ -3852,7 +3853,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, 431, fieldName, &updatedFields);
+		ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 427, fieldName, &updatedFields);
 		zephir_check_call_status();
 		if (allFields) {
 			RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName));
@@ -4067,12 +4068,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query)
 			zephir_check_call_status();
 		}
 
-		ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 432, container);
+		ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 428, container);
 		zephir_check_call_status();
 	}
 	ZEPHIR_INIT_VAR(&_3);
 	zephir_get_called_class(&_3);
-	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 433, &_3);
+	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 429, &_3);
 	zephir_check_call_status();
 	RETURN_CCTOR(&criteria);
 }
@@ -4167,18 +4168,18 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
 	if (UNEXPECTED(!ZEPHIR_IS_LONG(&_0, 0))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2464);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2455);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 434);
+	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 430);
 	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, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -4194,7 +4195,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 		ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "has", NULL, 0, &metaData, &readConnection);
 		zephir_check_call_status();
 		if (UNEXPECTED(!zephir_is_true(&_2$$6))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2489);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2480);
 			return;
 		}
 		zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("uniqueKey"), PH_NOISY_CC | PH_READONLY);
@@ -4203,14 +4204,14 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("uniqueParams"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&uniqueParams, &_1);
 	if (UNEXPECTED(Z_TYPE_P(&uniqueParams) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2500);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/Mvc/Model.zep", 2491);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&fields);
 	array_init(&fields);
 	ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 2515);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 2506);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5)
 		{
@@ -4219,7 +4220,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 			ZEPHIR_INIT_NVAR(&_7$$9);
 			zephir_create_array(&_7$$9, 1, 0);
 			zephir_array_fast_append(&_7$$9, &attribute);
-			zephir_array_append(&fields, &_7$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2509);
+			zephir_array_append(&fields, &_7$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2500);
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &_4, "rewind", NULL, 0);
@@ -4235,7 +4236,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh)
 				ZEPHIR_INIT_NVAR(&_8$$10);
 				zephir_create_array(&_8$$10, 1, 0);
 				zephir_array_fast_append(&_8$$10, &attribute);
-				zephir_array_append(&fields, &_8$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2509);
+				zephir_array_append(&fields, &_8$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2500);
 			ZEPHIR_CALL_METHOD(NULL, &_4, "next", NULL, 0);
 			zephir_check_call_status();
 		}
@@ -4337,7 +4338,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, 424);
+	ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 420);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "prepareSave");
@@ -4353,9 +4354,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save)
 			RETURN_MM_BOOL(0);
 		}
 	}
-	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -4365,7 +4366,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save)
 	} else {
 		ZEPHIR_CPY_WRT(&table, &source);
 	}
-	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 434);
+	ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 430);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection);
 	zephir_check_call_status();
@@ -4396,9 +4397,9 @@ 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, 435, this_ptr, &_7$$11);
+			ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 431, this_ptr, &_7$$11);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2666);
+			zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2657);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
@@ -4558,8 +4559,8 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		}
 		ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 2786);
+		if (Z_TYPE_P(&container) == IS_NULL) {
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injection container is required to access the services related to the ODM", "phalcon/Mvc/Model.zep", 2776);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container);
@@ -4569,7 +4570,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&manager, &_2$$3);
 		if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 2802);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/Mvc/Model.zep", 2792);
 			return;
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("modelsManager"), &manager);
@@ -4577,7 +4578,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize)
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&properties);
 		if (zephir_array_isset_string_fetch(&properties, &attributes, SL("attributes"), 0)) {
-			zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2825);
+			zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2815);
 			if (Z_TYPE_P(&properties) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _6$$7, _7$$7, _4$$7)
 				{
@@ -4827,7 +4828,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 	if (Z_TYPE_P(columnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&snapshot);
 		array_init(&snapshot);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2943);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2933);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -4851,7 +4852,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 						ZEPHIR_CONCAT_SVS(&_5$$7, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_6, 29, &_5$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2923);
+						zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2913);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -4867,7 +4868,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_6, 29, &_8$$10);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2934);
+							zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 2924);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -4901,7 +4902,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_10$$14, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_9$$14, "__construct", &_6, 29, &_10$$14);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2923);
+							zephir_throw_exception_debug(&_9$$14, "phalcon/Mvc/Model.zep", 2913);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -4917,7 +4918,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData)
 								ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_6, 29, &_12$$17);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2934);
+								zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 2924);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -4997,7 +4998,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 	if (Z_TYPE_P(columnMap) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&snapshot);
 		array_init(&snapshot);
-		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 3008);
+		zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2998);
 		if (Z_TYPE_P(&data) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3)
 			{
@@ -5017,7 +5018,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, 423, columnMap, &key);
+					ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&key, &_5$$6);
 				}
@@ -5030,7 +5031,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 						ZEPHIR_CONCAT_SVS(&_8$$8, "Column '", &key, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_7$$8, "__construct", &_9, 29, &_8$$8);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2988);
+						zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2978);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -5046,7 +5047,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_11$$11, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", &_9, 29, &_11$$11);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 2999);
+							zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 2989);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5076,7 +5077,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, 423, columnMap, &key);
+						ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 419, columnMap, &key);
 						zephir_check_call_status();
 						ZEPHIR_CPY_WRT(&key, &_13$$14);
 					}
@@ -5089,7 +5090,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 							ZEPHIR_CONCAT_SVS(&_15$$16, "Column '", &key, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_14$$16, "__construct", &_9, 29, &_15$$16);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2988);
+							zephir_throw_exception_debug(&_14$$16, "phalcon/Mvc/Model.zep", 2978);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5105,7 +5106,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData)
 								ZEPHIR_CONCAT_SVS(&_17$$19, "Column '", &key, "' doesn't make part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_16$$19, "__construct", &_9, 29, &_17$$19);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 2999);
+								zephir_throw_exception_debug(&_16$$19, "phalcon/Mvc/Model.zep", 2989);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -5494,7 +5495,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3285);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3275);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -5506,7 +5507,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, 423, &columnMap, &attribute);
+					ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 419, &columnMap, &attribute);
 					zephir_check_call_status();
 					ZEPHIR_CPY_WRT(&attribute, &_4$$5);
 				}
@@ -5519,7 +5520,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
 						ZEPHIR_CONCAT_SVS(&_7$$7, "Column '", &attribute, "' doesn't make part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", &_8, 29, &_7$$7);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3263);
+						zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3253);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -5557,7 +5558,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, 423, &columnMap, &attribute);
+						ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 419, &columnMap, &attribute);
 						zephir_check_call_status();
 						ZEPHIR_CPY_WRT(&attribute, &_10$$15);
 					}
@@ -5570,7 +5571,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
 							ZEPHIR_CONCAT_SVS(&_12$$17, "Column '", &attribute, "' doesn't make part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_11$$17, "__construct", &_8, 29, &_12$$17);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3263);
+							zephir_throw_exception_debug(&_11$$17, "phalcon/Mvc/Model.zep", 3253);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -5637,7 +5638,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, 434);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 430);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "has", NULL, 0, &metaData, &_2$$3);
 		zephir_check_call_status();
@@ -5777,7 +5778,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 	ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	error = 0;
-	zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3496);
+	zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3486);
 	if (Z_TYPE_P(&belongsTo) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1)
 		{
@@ -5792,7 +5793,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 			action = 1;
 			if (zephir_array_isset_string(&foreignKey, SL("action"))) {
 				ZEPHIR_OBS_NVAR(&_3$$5);
-				zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3387);
+				zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3377);
 				action = zephir_get_intval(&_3$$5);
 			}
 			if (action != 1) {
@@ -5812,7 +5813,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 			ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&fields) == IS_ARRAY) {
-				zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3430);
+				zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3420);
 				if (Z_TYPE_P(&fields) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _8$$7, _9$$7, _6$$7)
 					{
@@ -5826,11 +5827,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 						ZVAL_COPY(&field, _6$$7);
 						ZEPHIR_OBS_NVAR(&value);
 						zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-						zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
+						zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 						ZEPHIR_INIT_NVAR(&_11$$8);
 						ZEPHIR_CONCAT_SVSV(&_11$$8, "[", &_10$$8, "] = ?", &position);
-						zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
-						zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
+						zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+						zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 						if (Z_TYPE_P(&value) == IS_NULL) {
 							numberNull++;
 						}
@@ -5850,11 +5851,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 						zephir_check_call_status();
 							ZEPHIR_OBS_NVAR(&value);
 							zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-							zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
+							zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 							ZEPHIR_INIT_NVAR(&_13$$10);
 							ZEPHIR_CONCAT_SVSV(&_13$$10, "[", &_12$$10, "] = ?", &position);
-							zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
-							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
+							zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 							if (Z_TYPE_P(&value) == IS_NULL) {
 								numberNull++;
 							}
@@ -5870,15 +5871,15 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC);
 				ZEPHIR_INIT_NVAR(&_14$$12);
 				ZEPHIR_CONCAT_SVS(&_14$$12, "[", &referencedFields, "] = ?0");
-				zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434);
-				zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435);
+				zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3424);
+				zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3425);
 				if (Z_TYPE_P(&value) == IS_NULL) {
 					validateWithNulls = 1;
 				}
 			}
 			ZEPHIR_OBS_NVAR(&extraConditions);
 			if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) {
-				zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3446);
+				zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3436);
 			}
 			if (validateWithNulls) {
 				ZEPHIR_OBS_NVAR(&allowNulls);
@@ -5944,7 +5945,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				action = 1;
 				if (zephir_array_isset_string(&foreignKey, SL("action"))) {
 					ZEPHIR_OBS_NVAR(&_24$$24);
-					zephir_array_fetch_string(&_24$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3387);
+					zephir_array_fetch_string(&_24$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3377);
 					action = zephir_get_intval(&_24$$24);
 				}
 				if (action != 1) {
@@ -5964,7 +5965,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 				ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&fields) == IS_ARRAY) {
-					zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3430);
+					zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3420);
 					if (Z_TYPE_P(&fields) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _29$$26, _30$$26, _27$$26)
 						{
@@ -5978,11 +5979,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 							ZVAL_COPY(&field, _27$$26);
 							ZEPHIR_OBS_NVAR(&value);
 							zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-							zephir_array_fetch(&_31$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
+							zephir_array_fetch(&_31$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 							ZEPHIR_INIT_NVAR(&_32$$27);
 							ZEPHIR_CONCAT_SVSV(&_32$$27, "[", &_31$$27, "] = ?", &position);
-							zephir_array_append(&conditions, &_32$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
-							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
+							zephir_array_append(&conditions, &_32$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+							zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 							if (Z_TYPE_P(&value) == IS_NULL) {
 								numberNull++;
 							}
@@ -6002,11 +6003,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 							zephir_check_call_status();
 								ZEPHIR_OBS_NVAR(&value);
 								zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC);
-								zephir_array_fetch(&_33$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3422);
+								zephir_array_fetch(&_33$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3412);
 								ZEPHIR_INIT_NVAR(&_34$$29);
 								ZEPHIR_CONCAT_SVSV(&_34$$29, "[", &_33$$29, "] = ?", &position);
-								zephir_array_append(&conditions, &_34$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3422);
-								zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3423);
+								zephir_array_append(&conditions, &_34$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3412);
+								zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3413);
 								if (Z_TYPE_P(&value) == IS_NULL) {
 									numberNull++;
 								}
@@ -6022,15 +6023,15 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
 					zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC);
 					ZEPHIR_INIT_NVAR(&_35$$31);
 					ZEPHIR_CONCAT_SVS(&_35$$31, "[", &referencedFields, "] = ?0");
-					zephir_array_append(&conditions, &_35$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434);
-					zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435);
+					zephir_array_append(&conditions, &_35$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3424);
+					zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3425);
 					if (Z_TYPE_P(&value) == IS_NULL) {
 						validateWithNulls = 1;
 					}
 				}
 				ZEPHIR_OBS_NVAR(&extraConditions);
 				if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) {
-					zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3446);
+					zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3436);
 				}
 				if (validateWithNulls) {
 					ZEPHIR_OBS_NVAR(&allowNulls);
@@ -6126,7 +6127,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 	ZEPHIR_CPY_WRT(&manager, &_0);
 	ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3572);
+	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3562);
 	if (Z_TYPE_P(&relations) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
 		{
@@ -6144,7 +6145,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 			}
 			if (_3$$3) {
 				ZEPHIR_OBS_NVAR(&_4$$5);
-				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3546);
+				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3536);
 				action = zephir_get_intval(&_4$$5);
 			}
 			if (action != 2) {
@@ -6183,7 +6184,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
 				}
 				if (_7$$9) {
 					ZEPHIR_OBS_NVAR(&_8$$11);
-					zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3546);
+					zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3536);
 					action = zephir_get_intval(&_8$$11);
 				}
 				if (action != 2) {
@@ -6250,7 +6251,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 	ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
 	zephir_check_call_status();
 	error = 0;
-	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3658);
+	zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3648);
 	if (Z_TYPE_P(&relations) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
 		{
@@ -6268,7 +6269,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 			}
 			if (_3$$3) {
 				ZEPHIR_OBS_NVAR(&_4$$5);
-				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3617);
+				zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3607);
 				action = zephir_get_intval(&_4$$5);
 			}
 			if (action != 1) {
@@ -6324,7 +6325,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict)
 				}
 				if (_13$$9) {
 					ZEPHIR_OBS_NVAR(&_14$$11);
-					zephir_array_fetch_string(&_14$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3617);
+					zephir_array_fetch_string(&_14$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3607);
 					action = zephir_get_intval(&_14$$11);
 				}
 				if (action != 1) {
@@ -6501,7 +6502,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		ZEPHIR_INIT_NVAR(&columnMap);
 		ZVAL_NULL(&columnMap);
 	}
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3780);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3770);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1)
 		{
@@ -6516,7 +6517,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 					ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &field, "' isn't part of the column map");
 					ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 29, &_4$$7);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3714);
+					zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3704);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -6532,9 +6533,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							_6$$11 = zephir_array_isset(&defaultValues, &field);
 						}
 						if (_6$$11) {
-							zephir_array_fetch(&_7$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3731);
+							zephir_array_fetch(&_7$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3721);
 							zephir_array_update_zval(&snapshot, &attributeField, &_7$$12, PH_COPY | PH_SEPARATE);
-							zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3732);
+							zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3722);
 							zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_8$$12, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(&_9$$12, connection, "supportsdefaultvalue", &_10, 0);
 							zephir_check_call_status();
@@ -6554,18 +6555,18 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							ZEPHIR_CONCAT_SVS(&_13$$15, "Column '", &field, "' have not defined a bind data type");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$15, "__construct", &_5, 29, &_13$$15);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3749);
+							zephir_throw_exception_debug(&_12$$15, "phalcon/Mvc/Model.zep", 3739);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3752);
-						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3753);
-						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3742);
+						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3743);
+						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3744);
 					} else {
 						if (zephir_array_isset(&defaultValues, &field)) {
-							zephir_array_fetch(&_14$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3757);
+							zephir_array_fetch(&_14$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3747);
 							zephir_array_update_zval(&snapshot, &attributeField, &_14$$17, PH_COPY | PH_SEPARATE);
-							zephir_array_fetch(&_15$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3758);
+							zephir_array_fetch(&_15$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3748);
 							zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_15$$17, PH_COPY | PH_SEPARATE);
 							ZEPHIR_CALL_METHOD(&_16$$17, connection, "supportsdefaultvalue", &_17, 0);
 							zephir_check_call_status();
@@ -6574,13 +6575,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 							}
 							ZEPHIR_CALL_METHOD(&_18$$17, connection, "getdefaultvalue", &_19, 0);
 							zephir_check_call_status();
-							zephir_array_append(&values, &_18$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3764);
+							zephir_array_append(&values, &_18$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
 						} else {
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3756);
 							zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 						}
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3770);
-						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3771);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3761);
 					}
 				}
 			}
@@ -6605,7 +6606,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 						ZEPHIR_CONCAT_SVS(&_21$$22, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_20$$22, "__construct", &_5, 29, &_21$$22);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3714);
+						zephir_throw_exception_debug(&_20$$22, "phalcon/Mvc/Model.zep", 3704);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -6621,9 +6622,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								_22$$26 = zephir_array_isset(&defaultValues, &field);
 							}
 							if (_22$$26) {
-								zephir_array_fetch(&_23$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3731);
+								zephir_array_fetch(&_23$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3721);
 								zephir_array_update_zval(&snapshot, &attributeField, &_23$$27, PH_COPY | PH_SEPARATE);
-								zephir_array_fetch(&_24$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3732);
+								zephir_array_fetch(&_24$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3722);
 								zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_24$$27, PH_COPY | PH_SEPARATE);
 								ZEPHIR_CALL_METHOD(&_25$$27, connection, "supportsdefaultvalue", &_26, 0);
 								zephir_check_call_status();
@@ -6643,18 +6644,18 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								ZEPHIR_CONCAT_SVS(&_29$$30, "Column '", &field, "' have not defined a bind data type");
 								ZEPHIR_CALL_METHOD(NULL, &_28$$30, "__construct", &_5, 29, &_29$$30);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3749);
+								zephir_throw_exception_debug(&_28$$30, "phalcon/Mvc/Model.zep", 3739);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3752);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3753);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3742);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3743);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3744);
 						} else {
 							if (zephir_array_isset(&defaultValues, &field)) {
-								zephir_array_fetch(&_30$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3757);
+								zephir_array_fetch(&_30$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3747);
 								zephir_array_update_zval(&snapshot, &attributeField, &_30$$32, PH_COPY | PH_SEPARATE);
-								zephir_array_fetch(&_31$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3758);
+								zephir_array_fetch(&_31$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3748);
 								zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_31$$32, PH_COPY | PH_SEPARATE);
 								ZEPHIR_CALL_METHOD(&_32$$32, connection, "supportsdefaultvalue", &_33, 0);
 								zephir_check_call_status();
@@ -6663,13 +6664,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 								}
 								ZEPHIR_CALL_METHOD(&_34$$32, connection, "getdefaultvalue", &_35, 0);
 								zephir_check_call_status();
-								zephir_array_append(&values, &_34$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3764);
+								zephir_array_append(&values, &_34$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3754);
 							} else {
-								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3766);
+								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3756);
 								zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 							}
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3770);
-							zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3771);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3760);
+							zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3761);
 						}
 					}
 				}
@@ -6685,7 +6686,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		zephir_check_call_status();
 		useExplicitIdentity = zephir_get_boolval(&_36$$35);
 		if (useExplicitIdentity) {
-			zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3790);
+			zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3780);
 		}
 		if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
 			ZEPHIR_OBS_NVAR(&attributeField);
@@ -6696,7 +6697,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 				ZEPHIR_CONCAT_SVS(&_38$$38, "Identity column '", identityField, "' isn't part of the column map");
 				ZEPHIR_CALL_METHOD(NULL, &_37$$38, "__construct", &_5, 29, &_38$$38);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3800);
+				zephir_throw_exception_debug(&_37$$38, "phalcon/Mvc/Model.zep", 3790);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -6711,12 +6712,12 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 			}
 			if (_39$$40) {
 				if (useExplicitIdentity) {
-					zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812);
-					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812);
+					zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3802);
+					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3802);
 				}
 			} else {
 				if (!(useExplicitIdentity)) {
-					zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3820);
+					zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3810);
 				}
 				ZEPHIR_OBS_NVAR(&bindType);
 				if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0)))) {
@@ -6726,23 +6727,23 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 					ZEPHIR_CONCAT_SVS(&_41$$45, "Identity column '", identityField, "' isn\'t part of the table columns");
 					ZEPHIR_CALL_METHOD(NULL, &_40$$45, "__construct", &_5, 29, &_41$$45);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3829);
+					zephir_throw_exception_debug(&_40$$45, "phalcon/Mvc/Model.zep", 3819);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3832);
-				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
+				zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3822);
+				zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3823);
 			}
 		} else {
 			if (useExplicitIdentity) {
-				zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3837);
-				zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3838);
+				zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3827);
+				zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3828);
 			}
 		}
 	}
 	if (Z_TYPE_P(table) == IS_ARRAY) {
-		zephir_array_fetch_long(&_42$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3847);
-		zephir_array_fetch_long(&_43$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3847);
+		zephir_array_fetch_long(&_42$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3837);
+		zephir_array_fetch_long(&_43$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3837);
 		ZEPHIR_INIT_VAR(&_44$$48);
 		ZEPHIR_CONCAT_VSV(&_44$$48, &_42$$48, ".", &_43$$48);
 		ZEPHIR_CPY_WRT(table, &_44$$48);
@@ -6763,9 +6764,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, 427);
+				ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 				zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+				ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&sequenceName);
 				if (ZEPHIR_IS_EMPTY(&schema)) {
@@ -6788,7 +6789,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
 		zephir_update_property_zval(this_ptr, ZEND_STRL("uniqueParams"), &__$null);
 	}
 	if (zephir_is_true(&success)) {
-		zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3908);
+		zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3898);
 		if (Z_TYPE_P(&unsetDefaultValues) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&unsetDefaultValues), _51$$56, _52$$56, _49$$56)
 			{
@@ -6844,11 +6845,11 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 {
 	zval _17$$28, _18$$28, _30$$53, _31$$53;
 	zval _41;
-	zend_bool changed = 0, useDynamicUpdate = 0, _42, _43, _11$$22, _13$$22, _25$$47, _27$$47;
+	zend_bool changed = 0, useDynamicUpdate = 0, _43, _44, _11$$22, _13$$22, _25$$47, _27$$47;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL, *_15 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *metaData, metaData_sub, *connection, connection_sub, *table = NULL, table_sub, __$null, automaticAttributes, attributeField, bindSkip, bindDataTypes, bindType, bindTypes, columnMap, dataType, dataTypes, field, fields, manager, nonPrimary, newSnapshot, success, primaryKeys, snapshot, snapshotValue, uniqueKey, uniqueParams, uniqueTypes, value, values, updateValue, _0, _1, *_2, _3, _4$$10, _5$$10, _7$$13, _8$$13, _9$$23, _10$$23, _12$$24, _14$$27, _16$$27, _19$$35, _20$$35, _21$$38, _22$$38, _23$$48, _24$$48, _26$$49, _28$$52, _29$$52, *_32$$59, _33$$59, _34$$63, _35$$63, _36$$69, _37$$69, _38$$73, _39$$73, _40$$73, _44$$75, _45$$76;
+	zval *metaData, metaData_sub, *connection, connection_sub, *table = NULL, table_sub, __$null, automaticAttributes, attributeField, bindSkip, bindDataTypes, bindType, bindTypes, columnMap, dataType, dataTypes, field, fields, manager, nonPrimary, newSnapshot, success, primaryKeys, snapshot, snapshotValue, uniqueKey, uniqueParams, value, values, updateValue, _0, _1, *_2, _3, _42, _4$$10, _5$$10, _7$$13, _8$$13, _9$$23, _10$$23, _12$$24, _14$$27, _16$$27, _19$$35, _20$$35, _21$$38, _22$$38, _23$$48, _24$$48, _26$$49, _28$$52, _29$$52, *_32$$59, _33$$59, _34$$63, _35$$63, _36$$69, _37$$69, _38$$73, _39$$73, _40$$73, _45$$75, _46$$76;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&metaData_sub);
@@ -6875,13 +6876,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	ZVAL_UNDEF(&snapshotValue);
 	ZVAL_UNDEF(&uniqueKey);
 	ZVAL_UNDEF(&uniqueParams);
-	ZVAL_UNDEF(&uniqueTypes);
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&values);
 	ZVAL_UNDEF(&updateValue);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
+	ZVAL_UNDEF(&_42);
 	ZVAL_UNDEF(&_4$$10);
 	ZVAL_UNDEF(&_5$$10);
 	ZVAL_UNDEF(&_7$$13);
@@ -6908,8 +6909,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	ZVAL_UNDEF(&_38$$73);
 	ZVAL_UNDEF(&_39$$73);
 	ZVAL_UNDEF(&_40$$73);
-	ZVAL_UNDEF(&_44$$75);
-	ZVAL_UNDEF(&_45$$76);
+	ZVAL_UNDEF(&_45$$75);
+	ZVAL_UNDEF(&_46$$76);
 	ZVAL_UNDEF(&_41);
 	ZVAL_UNDEF(&_17$$28);
 	ZVAL_UNDEF(&_18$$28);
@@ -6967,7 +6968,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_INIT_NVAR(&columnMap);
 		ZVAL_NULL(&columnMap);
 	}
-	zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4097);
+	zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4087);
 	if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _2)
 		{
@@ -6983,7 +6984,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_5$$10, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_4$$10, "__construct", &_6, 29, &_5$$10);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3973);
+						zephir_throw_exception_debug(&_4$$10, "phalcon/Mvc/Model.zep", 3963);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7000,16 +7001,16 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 					ZEPHIR_CONCAT_SVS(&_8$$13, "Column '", &field, "' have not defined a bind data type");
 					ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", &_6, 29, &_8$$13);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3987);
+					zephir_throw_exception_debug(&_7$$13, "phalcon/Mvc/Model.zep", 3977);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				ZEPHIR_OBS_NVAR(&value);
 				if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 					if (!(useDynamicUpdate)) {
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3999);
-						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4000);
-						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4001);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3989);
+						zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3990);
+						zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3991);
 					} else {
 						ZEPHIR_OBS_NVAR(&snapshotValue);
 						if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0))) {
@@ -7029,7 +7030,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 										ZEPHIR_CONCAT_SVS(&_10$$23, "Column '", &field, "' have not defined a data type");
 										ZEPHIR_CALL_METHOD(NULL, &_9$$23, "__construct", &_6, 29, &_10$$23);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 4026);
+										zephir_throw_exception_debug(&_9$$23, "phalcon/Mvc/Model.zep", 4016);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -7077,17 +7078,17 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							}
 						}
 						if (changed) {
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4067);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4068);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4069);
 						}
 					}
 					zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 				} else {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4087);
-					zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4088);
-					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4089);
+					zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
+					zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
+					zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -7112,7 +7113,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							ZEPHIR_CONCAT_SVS(&_20$$35, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_19$$35, "__construct", &_6, 29, &_20$$35);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_19$$35, "phalcon/Mvc/Model.zep", 3973);
+							zephir_throw_exception_debug(&_19$$35, "phalcon/Mvc/Model.zep", 3963);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -7129,16 +7130,16 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_22$$38, "Column '", &field, "' have not defined a bind data type");
 						ZEPHIR_CALL_METHOD(NULL, &_21$$38, "__construct", &_6, 29, &_22$$38);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_21$$38, "phalcon/Mvc/Model.zep", 3987);
+						zephir_throw_exception_debug(&_21$$38, "phalcon/Mvc/Model.zep", 3977);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					ZEPHIR_OBS_NVAR(&value);
 					if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 						if (!(useDynamicUpdate)) {
-							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3999);
-							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4000);
-							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4001);
+							zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3989);
+							zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3990);
+							zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3991);
 						} else {
 							ZEPHIR_OBS_NVAR(&snapshotValue);
 							if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0))) {
@@ -7158,7 +7159,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 											ZEPHIR_CONCAT_SVS(&_24$$48, "Column '", &field, "' have not defined a data type");
 											ZEPHIR_CALL_METHOD(NULL, &_23$$48, "__construct", &_6, 29, &_24$$48);
 											zephir_check_call_status();
-											zephir_throw_exception_debug(&_23$$48, "phalcon/Mvc/Model.zep", 4026);
+											zephir_throw_exception_debug(&_23$$48, "phalcon/Mvc/Model.zep", 4016);
 											ZEPHIR_MM_RESTORE();
 											return;
 										}
@@ -7206,17 +7207,17 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 								}
 							}
 							if (changed) {
-								zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
-								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
-								zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
+								zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4067);
+								zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4068);
+								zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4069);
 							}
 						}
 						zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
 					} else {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4087);
-						zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4088);
-						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4089);
+						zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077);
+						zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078);
+						zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079);
 					}
 				}
 			ZEPHIR_CALL_METHOD(NULL, &nonPrimary, "next", NULL, 0);
@@ -7234,18 +7235,16 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	ZEPHIR_CPY_WRT(&uniqueKey, &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("uniqueParams"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&uniqueParams, &_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&uniqueTypes, &_0);
 	if (Z_TYPE_P(&uniqueParams) != IS_ARRAY) {
 		ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr);
 		zephir_check_call_status();
 		if (UNEXPECTED(!(zephir_fast_count_int(&primaryKeys)))) {
-			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 4121);
+			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/Mvc/Model.zep", 4110);
 			return;
 		}
 		ZEPHIR_INIT_NVAR(&uniqueParams);
 		array_init(&uniqueParams);
-		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4148);
+		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4137);
 		if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _32$$59)
 			{
@@ -7260,7 +7259,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 						ZEPHIR_CONCAT_SVS(&_35$$63, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_34$$63, "__construct", &_6, 29, &_35$$63);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_34$$63, "phalcon/Mvc/Model.zep", 4134);
+						zephir_throw_exception_debug(&_34$$63, "phalcon/Mvc/Model.zep", 4123);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7270,10 +7269,10 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 				ZEPHIR_OBS_NVAR(&value);
 				if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4142);
+					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4131);
 				} else {
 					zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4145);
+					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4134);
 				}
 			} ZEND_HASH_FOREACH_END();
 		} else {
@@ -7296,7 +7295,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 							ZEPHIR_CONCAT_SVS(&_37$$69, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_36$$69, "__construct", &_6, 29, &_37$$69);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_36$$69, "phalcon/Mvc/Model.zep", 4134);
+							zephir_throw_exception_debug(&_36$$69, "phalcon/Mvc/Model.zep", 4123);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -7306,10 +7305,10 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 					ZEPHIR_OBS_NVAR(&value);
 					if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4142);
+						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4131);
 					} else {
 						zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
-						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4145);
+						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4134);
 					}
 				ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 				zephir_check_call_status();
@@ -7318,8 +7317,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 		ZEPHIR_INIT_NVAR(&field);
 	}
 	if (Z_TYPE_P(table) == IS_ARRAY) {
-		zephir_array_fetch_long(&_38$$73, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4154);
-		zephir_array_fetch_long(&_39$$73, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4154);
+		zephir_array_fetch_long(&_38$$73, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4143);
+		zephir_array_fetch_long(&_39$$73, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4143);
 		ZEPHIR_INIT_VAR(&_40$$73);
 		ZEPHIR_CONCAT_VSV(&_40$$73, &_38$$73, ".", &_39$$73);
 		ZEPHIR_CPY_WRT(table, &_40$$73);
@@ -7328,29 +7327,31 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
 	zephir_create_array(&_41, 3, 0);
 	zephir_array_update_string(&_41, SL("conditions"), &uniqueKey, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&_41, SL("bind"), &uniqueParams, PH_COPY | PH_SEPARATE);
-	zephir_array_update_string(&_41, SL("bindTypes"), &uniqueTypes, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_VAR(&_42);
+	zephir_read_property(&_42, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC);
+	zephir_array_update_string(&_41, SL("bindTypes"), &_42, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_METHOD(&success, connection, "update", NULL, 0, table, &fields, &values, &_41, &bindTypes);
 	zephir_check_call_status();
-	_42 = zephir_is_true(&success);
-	if (_42) {
+	_43 = zephir_is_true(&success);
+	if (_43) {
 		ZEPHIR_CALL_METHOD(&_1, &manager, "iskeepingsnapshots", NULL, 0, this_ptr);
 		zephir_check_call_status();
-		_42 = zephir_is_true(&_1);
+		_43 = zephir_is_true(&_1);
 	}
-	_43 = _42;
-	if (_43) {
-		_43 = ZEPHIR_GLOBAL(orm).update_snapshot_on_save;
+	_44 = _43;
+	if (_44) {
+		_44 = ZEPHIR_GLOBAL(orm).update_snapshot_on_save;
 	}
-	if (_43) {
+	if (_44) {
 		if (Z_TYPE_P(&snapshot) == IS_ARRAY) {
 			zephir_update_property_zval(this_ptr, ZEND_STRL("oldSnapshot"), &snapshot);
-			ZEPHIR_INIT_VAR(&_44$$75);
-			zephir_fast_array_merge(&_44$$75, &snapshot, &newSnapshot);
-			zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &_44$$75);
+			ZEPHIR_INIT_VAR(&_45$$75);
+			zephir_fast_array_merge(&_45$$75, &snapshot, &newSnapshot);
+			zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &_45$$75);
 		} else {
-			ZEPHIR_INIT_VAR(&_45$$76);
-			array_init(&_45$$76);
-			zephir_update_property_zval(this_ptr, ZEND_STRL("oldSnapshot"), &_45$$76);
+			ZEPHIR_INIT_VAR(&_46$$76);
+			array_init(&_46$$76);
+			zephir_update_property_zval(this_ptr, ZEND_STRL("oldSnapshot"), &_46$$76);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("snapshot"), &newSnapshot);
 		}
 	}
@@ -7455,7 +7456,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 		array_init(&uniqueParams);
 		ZEPHIR_INIT_NVAR(&uniqueTypes);
 		array_init(&uniqueTypes);
-		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4278);
+		zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4267);
 		if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _1$$3)
 			{
@@ -7470,7 +7471,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 						ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map");
 						ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 29, &_4$$9);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4237);
+						zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4226);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -7488,9 +7489,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 					if (_6$$11) {
 						numberEmpty++;
 					}
-					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4258);
+					zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4247);
 				} else {
-					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
+					zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4249);
 					numberEmpty++;
 				}
 				ZEPHIR_OBS_NVAR(&type);
@@ -7501,16 +7502,16 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 					ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' isn't part of the table columns");
 					ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_5, 29, &_8$$14);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4267);
+					zephir_throw_exception_debug(&_7$$14, "phalcon/Mvc/Model.zep", 4256);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
-				zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4270);
+				zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4259);
 				ZEPHIR_CALL_METHOD(&_9$$7, connection, "escapeidentifier", &_10, 0, &field);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_11$$7);
 				ZEPHIR_CONCAT_VS(&_11$$7, &_9$$7, " = ?");
-				zephir_array_append(&wherePk, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4271);
+				zephir_array_append(&wherePk, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
 			} ZEND_HASH_FOREACH_END();
 		} else {
 			ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -7532,7 +7533,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 							ZEPHIR_CONCAT_SVS(&_13$$17, "Column '", &field, "' isn't part of the column map");
 							ZEPHIR_CALL_METHOD(NULL, &_12$$17, "__construct", &_5, 29, &_13$$17);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4237);
+							zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 4226);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -7550,9 +7551,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 						if (_14$$19) {
 							numberEmpty++;
 						}
-						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4258);
+						zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4247);
 					} else {
-						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
+						zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4249);
 						numberEmpty++;
 					}
 					ZEPHIR_OBS_NVAR(&type);
@@ -7563,16 +7564,16 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 						ZEPHIR_CONCAT_SVS(&_16$$22, "Column '", &field, "' isn't part of the table columns");
 						ZEPHIR_CALL_METHOD(NULL, &_15$$22, "__construct", &_5, 29, &_16$$22);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4267);
+						zephir_throw_exception_debug(&_15$$22, "phalcon/Mvc/Model.zep", 4256);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
-					zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4270);
+					zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4259);
 					ZEPHIR_CALL_METHOD(&_17$$15, connection, "escapeidentifier", &_18, 0, &field);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_19$$15);
 					ZEPHIR_CONCAT_VS(&_19$$15, &_17$$15, " = ?");
-					zephir_array_append(&wherePk, &_19$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4271);
+					zephir_array_append(&wherePk, &_19$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4260);
 				ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
 				zephir_check_call_status();
 			}
@@ -7604,9 +7605,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 		zephir_read_property(&_22$$27, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&uniqueTypes, &_22$$27);
 	}
-	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 426);
+	ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 422);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 427);
+	ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 423);
 	zephir_check_call_status();
 	if (zephir_is_true(&schema)) {
 		ZEPHIR_INIT_VAR(&table);
@@ -7623,7 +7624,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
 	ZVAL_NULL(&_25);
 	ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_24, &_25, &uniqueParams, &uniqueTypes);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_26, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4332);
+	zephir_array_fetch_string(&_26, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4321);
 	if (zephir_is_true(&_26)) {
 		ZEPHIR_INIT_ZVAL_NREF(_27$$30);
 		ZVAL_LONG(&_27$$30, 0);
@@ -7836,7 +7837,7 @@ PHP_METHOD(Phalcon_Mvc_Model, groupResult)
 		ZEPHIR_INIT_VAR(&params);
 		array_init(&params);
 		if (Z_TYPE_P(parameters) != IS_NULL) {
-			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4437);
+			zephir_array_append(&params, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4426);
 		}
 	} else {
 		ZEPHIR_CPY_WRT(&params, parameters);
@@ -7880,10 +7881,10 @@ PHP_METHOD(Phalcon_Mvc_Model, groupResult)
 	}
 	if (zephir_array_isset_string(&params, SL("bind"))) {
 		ZEPHIR_OBS_NVAR(&bindParams);
-		zephir_array_fetch_string(&bindParams, &params, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4480);
+		zephir_array_fetch_string(&bindParams, &params, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4469);
 		if (zephir_array_isset_string(&params, SL("bindTypes"))) {
 			ZEPHIR_OBS_NVAR(&bindTypes);
-			zephir_array_fetch_string(&bindTypes, &params, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4483);
+			zephir_array_fetch_string(&bindTypes, &params, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4472);
 		}
 	}
 	ZEPHIR_OBS_VAR(&cache);
@@ -7991,7 +7992,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder)
 		ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument");
 		ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 29, &_4$$7);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4562);
+		zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4551);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -8023,7 +8024,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder)
 				ZEPHIR_CONCAT_SVS(&_6$$13, "Cannot resolve attribute '", &extraMethod, "' in the model");
 				ZEPHIR_CALL_METHOD(NULL, &_5$$13, "__construct", NULL, 29, &_6$$13);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4599);
+				zephir_throw_exception_debug(&_5$$13, "phalcon/Mvc/Model.zep", 4588);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -8213,7 +8214,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 		}
 	}
 	if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) {
-		ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 436);
+		ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 432);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) {
 			RETURN_MM_BOOL(0);
@@ -8244,7 +8245,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 			ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr);
 			zephir_check_call_status();
 			error = 0;
-			zephir_is_iterable(&notNull, 0, "phalcon/Mvc/Model.zep", 4836);
+			zephir_is_iterable(&notNull, 0, "phalcon/Mvc/Model.zep", 4825);
 			if (Z_TYPE_P(&notNull) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&notNull), _4$$11)
 				{
@@ -8260,7 +8261,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 								ZEPHIR_CONCAT_SVS(&_7$$19, "Column '", &field, "' isn't part of the column map");
 								ZEPHIR_CALL_METHOD(NULL, &_6$$19, "__construct", &_8, 29, &_7$$19);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4760);
+								zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4749);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -8285,7 +8286,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 											if (_10$$27) {
 												_11$$27 = !(zephir_array_isset(&defaultValues, &field));
 												if (!(_11$$27)) {
-													zephir_array_fetch(&_12$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4790);
+													zephir_array_fetch(&_12$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4779);
 													_11$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_12$$27);
 												}
 												_10$$27 = _11$$27;
@@ -8348,7 +8349,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 									ZEPHIR_CONCAT_SVS(&_18$$39, "Column '", &field, "' isn't part of the column map");
 									ZEPHIR_CALL_METHOD(NULL, &_17$$39, "__construct", &_8, 29, &_18$$39);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4760);
+									zephir_throw_exception_debug(&_17$$39, "phalcon/Mvc/Model.zep", 4749);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -8373,7 +8374,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave)
 												if (_20$$47) {
 													_21$$47 = !(zephir_array_isset(&defaultValues, &field));
 													if (!(_21$$47)) {
-														zephir_array_fetch(&_22$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4790);
+														zephir_array_fetch(&_22$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4779);
 														_21$$47 = !ZEPHIR_IS_IDENTICAL(&value, &_22$$47);
 													}
 													_20$$47 = _21$$47;
@@ -8577,7 +8578,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_1);
-	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5016);
+	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5005);
 	if (Z_TYPE_P(related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _4, _5, _2)
 		{
@@ -8604,7 +8605,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, &_8$$6);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4957);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4946);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -8619,7 +8620,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_11, 0, &_10$$7);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4969);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4958);
 						return;
 					}
 					zephir_read_property(&_12$$5, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
@@ -8632,7 +8633,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 					if (_13$$5) {
 						ZEPHIR_CALL_METHOD(&_15$$8, &record, "getmessages", NULL, 0);
 						zephir_check_call_status();
-						zephir_is_iterable(&_15$$8, 0, "phalcon/Mvc/Model.zep", 5002);
+						zephir_is_iterable(&_15$$8, 0, "phalcon/Mvc/Model.zep", 4991);
 						if (Z_TYPE_P(&_15$$8) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_15$$8), _16$$8)
 							{
@@ -8716,7 +8717,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 							}
 							ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_27, 0, &_26$$16);
 							zephir_check_call_status();
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4957);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/Mvc/Model.zep", 4946);
 							return;
 						}
 						ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -8731,7 +8732,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 							}
 							ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_29, 0, &_28$$17);
 							zephir_check_call_status();
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4969);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 4958);
 							return;
 						}
 						zephir_read_property(&_30$$15, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY);
@@ -8744,7 +8745,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
 						if (_31$$15) {
 							ZEPHIR_CALL_METHOD(&_33$$18, &record, "getmessages", NULL, 0);
 							zephir_check_call_status();
-							zephir_is_iterable(&_33$$18, 0, "phalcon/Mvc/Model.zep", 5002);
+							zephir_is_iterable(&_33$$18, 0, "phalcon/Mvc/Model.zep", 4991);
 							if (Z_TYPE_P(&_33$$18) == IS_ARRAY) {
 								ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_33$$18), _34$$18)
 								{
@@ -9003,7 +9004,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&manager, &_0);
-	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5265);
+	zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5254);
 	if (Z_TYPE_P(related) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _1)
 		{
@@ -9036,7 +9037,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					}
 					ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, &_9$$6);
 					zephir_check_call_status();
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5078);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5067);
 					return;
 				}
 				ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -9053,7 +9054,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					}
 					ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_12, 0, &_11$$7);
 					zephir_check_call_status();
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5088);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5077);
 					return;
 				}
 				if (Z_TYPE_P(&record) == IS_OBJECT) {
@@ -9078,7 +9079,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CONCAT_SVS(&_16$$10, "The column '", &columns, "' needs to be present in the model");
 					ZEPHIR_CALL_METHOD(NULL, &_15$$10, "__construct", &_17, 29, &_16$$10);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 5105);
+					zephir_throw_exception_debug(&_15$$10, "phalcon/Mvc/Model.zep", 5094);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -9093,7 +9094,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0);
 					zephir_check_call_status();
 				}
-				zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5251);
+				zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5240);
 				if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _19$$4)
 					{
@@ -9108,7 +9109,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						if (!(zephir_is_true(&_21$$12))) {
 							ZEPHIR_CALL_METHOD(&_22$$14, &recordAfter, "getmessages", NULL, 0);
 							zephir_check_call_status();
-							zephir_is_iterable(&_22$$14, 0, "phalcon/Mvc/Model.zep", 5164);
+							zephir_is_iterable(&_22$$14, 0, "phalcon/Mvc/Model.zep", 5153);
 							if (Z_TYPE_P(&_22$$14) == IS_ARRAY) {
 								ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_22$$14), _23$$14)
 								{
@@ -9191,7 +9192,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_36$$19))) {
 								ZEPHIR_CALL_METHOD(&_37$$22, &intermediateModel, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_37$$22, 0, "phalcon/Mvc/Model.zep", 5245);
+								zephir_is_iterable(&_37$$22, 0, "phalcon/Mvc/Model.zep", 5234);
 								if (Z_TYPE_P(&_37$$22) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_37$$22), _38$$22)
 									{
@@ -9263,7 +9264,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_44$$27))) {
 								ZEPHIR_CALL_METHOD(&_45$$29, &recordAfter, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_45$$29, 0, "phalcon/Mvc/Model.zep", 5164);
+								zephir_is_iterable(&_45$$29, 0, "phalcon/Mvc/Model.zep", 5153);
 								if (Z_TYPE_P(&_45$$29) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_45$$29), _46$$29)
 									{
@@ -9346,7 +9347,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_58$$34))) {
 									ZEPHIR_CALL_METHOD(&_59$$37, &intermediateModel, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_59$$37, 0, "phalcon/Mvc/Model.zep", 5245);
+									zephir_is_iterable(&_59$$37, 0, "phalcon/Mvc/Model.zep", 5234);
 									if (Z_TYPE_P(&_59$$37) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_59$$37), _60$$37)
 										{
@@ -9417,7 +9418,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 					ZEPHIR_CONCAT_SVSVS(&_69$$43, "There are no defined relations for the model '", &className, "' using alias '", &name, "'");
 					ZEPHIR_CALL_METHOD(NULL, &_68$$43, "__construct", &_17, 29, &_69$$43);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5257);
+					zephir_throw_exception_debug(&_68$$43, "phalcon/Mvc/Model.zep", 5246);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -9457,7 +9458,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_75, 0, &_74$$47);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5078);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations", "phalcon/Mvc/Model.zep", 5067);
 						return;
 					}
 					ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", NULL, 0);
@@ -9474,7 +9475,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						}
 						ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_77, 0, &_76$$48);
 						zephir_check_call_status();
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5088);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/Mvc/Model.zep", 5077);
 						return;
 					}
 					if (Z_TYPE_P(&record) == IS_OBJECT) {
@@ -9500,7 +9501,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CONCAT_SVS(&_82$$51, "The column '", &columns, "' needs to be present in the model");
 						ZEPHIR_CALL_METHOD(NULL, &_81$$51, "__construct", &_17, 29, &_82$$51);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 5105);
+						zephir_throw_exception_debug(&_81$$51, "phalcon/Mvc/Model.zep", 5094);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -9515,7 +9516,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0);
 						zephir_check_call_status();
 					}
-					zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5251);
+					zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5240);
 					if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _84$$45)
 						{
@@ -9530,7 +9531,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 							if (!(zephir_is_true(&_86$$53))) {
 								ZEPHIR_CALL_METHOD(&_87$$55, &recordAfter, "getmessages", NULL, 0);
 								zephir_check_call_status();
-								zephir_is_iterable(&_87$$55, 0, "phalcon/Mvc/Model.zep", 5164);
+								zephir_is_iterable(&_87$$55, 0, "phalcon/Mvc/Model.zep", 5153);
 								if (Z_TYPE_P(&_87$$55) == IS_ARRAY) {
 									ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_87$$55), _88$$55)
 									{
@@ -9613,7 +9614,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_100$$60))) {
 									ZEPHIR_CALL_METHOD(&_101$$63, &intermediateModel, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_101$$63, 0, "phalcon/Mvc/Model.zep", 5245);
+									zephir_is_iterable(&_101$$63, 0, "phalcon/Mvc/Model.zep", 5234);
 									if (Z_TYPE_P(&_101$$63) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_101$$63), _102$$63)
 										{
@@ -9685,7 +9686,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 								if (!(zephir_is_true(&_108$$68))) {
 									ZEPHIR_CALL_METHOD(&_109$$70, &recordAfter, "getmessages", NULL, 0);
 									zephir_check_call_status();
-									zephir_is_iterable(&_109$$70, 0, "phalcon/Mvc/Model.zep", 5164);
+									zephir_is_iterable(&_109$$70, 0, "phalcon/Mvc/Model.zep", 5153);
 									if (Z_TYPE_P(&_109$$70) == IS_ARRAY) {
 										ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_109$$70), _110$$70)
 										{
@@ -9768,7 +9769,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 									if (!(zephir_is_true(&_122$$75))) {
 										ZEPHIR_CALL_METHOD(&_123$$78, &intermediateModel, "getmessages", NULL, 0);
 										zephir_check_call_status();
-										zephir_is_iterable(&_123$$78, 0, "phalcon/Mvc/Model.zep", 5245);
+										zephir_is_iterable(&_123$$78, 0, "phalcon/Mvc/Model.zep", 5234);
 										if (Z_TYPE_P(&_123$$78) == IS_ARRAY) {
 											ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_123$$78), _124$$78)
 											{
@@ -9839,7 +9840,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
 						ZEPHIR_CONCAT_SVSVS(&_133$$84, "There are no defined relations for the model '", &className, "' using alias '", &name, "'");
 						ZEPHIR_CALL_METHOD(NULL, &_132$$84, "__construct", &_17, 29, &_133$$84);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5257);
+						zephir_throw_exception_debug(&_132$$84, "phalcon/Mvc/Model.zep", 5246);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -9907,7 +9908,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5298);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5287);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -10790,7 +10791,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5757);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5746);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -10869,7 +10870,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate)
 
 	ZEPHIR_INIT_VAR(&keysAttributes);
 	array_init(&keysAttributes);
-	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5792);
+	zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5781);
 	if (Z_TYPE_P(&attributes) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
 		{
@@ -11120,7 +11121,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_array_keys(&_0, columnMap);
-	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5928);
+	zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5917);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
 		{
@@ -11163,7 +11164,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
 
 zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_type)
 {
-		zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8;
+		zval _0, _2, _4, _6, _8, _10, _12, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8, _13$$9;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
@@ -11171,12 +11172,14 @@ zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_ty
 	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_8);
 	ZVAL_UNDEF(&_10);
+	ZVAL_UNDEF(&_12);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_3$$4);
 	ZVAL_UNDEF(&_5$$5);
 	ZVAL_UNDEF(&_7$$6);
 	ZVAL_UNDEF(&_9$$7);
 	ZVAL_UNDEF(&_11$$8);
+	ZVAL_UNDEF(&_13$$9);
 	
 
 		ZEPHIR_MM_GROW();
@@ -11184,41 +11187,47 @@ zend_object *zephir_init_properties_Phalcon_Mvc_Model(zend_class_entry *class_ty
 	{
 		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("uniqueParams"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("uniqueTypes"), 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("uniqueParams"), &_1$$3);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("uniqueTypes"), &_1$$3);
 		}
-		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("uniqueParams"), 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("snapshot"), &_3$$4);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("uniqueParams"), &_3$$4);
 		}
-		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("snapshot"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_4) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_5$$5);
 			array_init(&_5$$5);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("oldSnapshot"), &_5$$5);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("snapshot"), &_5$$5);
 		}
-		zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("related"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("oldSnapshot"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_6) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_7$$6);
 			array_init(&_7$$6);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("related"), &_7$$6);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("oldSnapshot"), &_7$$6);
 		}
-		zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("related"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_8) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_9$$7);
 			array_init(&_9$$7);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("errorMessages"), &_9$$7);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("related"), &_9$$7);
 		}
-		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_10) == IS_NULL) {
 			ZEPHIR_INIT_VAR(&_11$$8);
 			array_init(&_11$$8);
-			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("dirtyRelated"), &_11$$8);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("errorMessages"), &_11$$8);
+		}
+		zephir_read_property_ex(&_12, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_12) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_13$$9);
+			array_init(&_13$$9);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("dirtyRelated"), &_13$$9);
 		}
 		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c
index 2772ffc26d9..b8e44924fb4 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(&timestamp, this_ptr, "gettimestamp", NULL, 437, &options);
+	ZEPHIR_CALL_METHOD(&timestamp, this_ptr, "gettimestamp", NULL, 433, &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, 438, &format);
+		ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 434, &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 f18c66e17d1..8d8d2a2a8f8 100644
--- a/ext/phalcon/mvc/model/binder.zep.c
+++ b/ext/phalcon/mvc/model/binder.zep.c
@@ -70,30 +70,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Binder)
 	return SUCCESS;
 }
 
-/**
- * Array for storing active bound models
- */
-PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "boundModels");
-}
-
-/**
- * Array for original values
- */
-PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "originalValues");
-}
-
 /**
  * Phalcon\Mvc\Model\Binder constructor
  */
@@ -288,6 +264,34 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, findBoundModel)
 	RETURN_MM();
 }
 
+/**
+ * Return the active bound models
+ *
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "boundModels");
+}
+
+/**
+ * Return the array for original values
+ *
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "originalValues");
+}
+
 /**
  * Sets cache instance
  */
@@ -431,7 +435,7 @@ 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, 439, handler, &methodName);
+		ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 435, handler, &methodName);
 		zephir_check_call_status();
 	} else {
 		object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction")));
@@ -444,7 +448,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&paramsKeys);
 	zephir_array_keys(&paramsKeys, &params);
-	zephir_is_iterable(&methodParams, 0, "phalcon/Mvc/Model/Binder.zep", 223);
+	zephir_is_iterable(&methodParams, 0, "phalcon/Mvc/Model/Binder.zep", 243);
 	if (Z_TYPE_P(&methodParams) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&methodParams), _3, _4, _1)
 		{
@@ -464,16 +468,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 			ZEPHIR_CALL_METHOD(&className, &reflectionClass, "getname", NULL, 0);
 			zephir_check_call_status();
 			if (!(zephir_array_isset(&params, &paramKey))) {
-				zephir_array_fetch(&_5$$7, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 175);
+				zephir_array_fetch(&_5$$7, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 195);
 				ZEPHIR_CPY_WRT(&paramKey, &_5$$7);
 			}
 			ZEPHIR_INIT_NVAR(&boundModel);
 			ZVAL_NULL(&boundModel);
 			ZEPHIR_OBS_NVAR(&paramValue);
-			zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179);
+			zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199);
 			ZEPHIR_INIT_NVAR(&_6$$5);
 			ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model");
-			ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 440, &className, &_6$$5);
+			ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 436, &className, &_6$$5);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) {
 				if (Z_TYPE_P(&realClasses) == IS_NULL) {
@@ -487,7 +491,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 						ZEPHIR_CALL_METHOD(&realClasses, handler, "getmodelname", NULL, 0);
 						zephir_check_call_status();
 					} else {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 191);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 211);
 						return;
 					}
 				}
@@ -500,7 +504,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 						ZEPHIR_CONCAT_SVS(&_11$$14, "You should provide model class name for ", &paramKey, " parameter");
 						ZEPHIR_CALL_METHOD(NULL, &_10$$14, "__construct", &_12, 29, &_11$$14);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_10$$14, "phalcon/Mvc/Model/Binder.zep", 199);
+						zephir_throw_exception_debug(&_10$$14, "phalcon/Mvc/Model/Binder.zep", 219);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -511,7 +515,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 					ZEPHIR_CALL_METHOD(&boundModel, this_ptr, "findboundmodel", &_13, 0, &paramValue, &className);
 					zephir_check_call_status();
 				} else {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 209);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 229);
 					return;
 				}
 			} else if (zephir_is_true(&_7$$5)) {
@@ -546,16 +550,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 				ZEPHIR_CALL_METHOD(&className, &reflectionClass, "getname", NULL, 0);
 				zephir_check_call_status();
 				if (!(zephir_array_isset(&params, &paramKey))) {
-					zephir_array_fetch(&_14$$21, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 175);
+					zephir_array_fetch(&_14$$21, &paramsKeys, &paramKey, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Binder.zep", 195);
 					ZEPHIR_CPY_WRT(&paramKey, &_14$$21);
 				}
 				ZEPHIR_INIT_NVAR(&boundModel);
 				ZVAL_NULL(&boundModel);
 				ZEPHIR_OBS_NVAR(&paramValue);
-				zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179);
+				zephir_array_fetch(&paramValue, &params, &paramKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199);
 				ZEPHIR_INIT_NVAR(&_15$$19);
 				ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model");
-				ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 440, &className, &_15$$19);
+				ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 436, &className, &_15$$19);
 				zephir_check_call_status();
 				if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) {
 					if (Z_TYPE_P(&realClasses) == IS_NULL) {
@@ -569,7 +573,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 							ZEPHIR_CALL_METHOD(&realClasses, handler, "getmodelname", NULL, 0);
 							zephir_check_call_status();
 						} else {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 191);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Handler must implement Phalcon\\Mvc\\Model\\Binder\\BindableInterface in order to use Phalcon\\Mvc\\Model as parameter", "phalcon/Mvc/Model/Binder.zep", 211);
 							return;
 						}
 					}
@@ -582,7 +586,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 							ZEPHIR_CONCAT_SVS(&_19$$28, "You should provide model class name for ", &paramKey, " parameter");
 							ZEPHIR_CALL_METHOD(NULL, &_18$$28, "__construct", &_12, 29, &_19$$28);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$28, "phalcon/Mvc/Model/Binder.zep", 199);
+							zephir_throw_exception_debug(&_18$$28, "phalcon/Mvc/Model/Binder.zep", 219);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -593,7 +597,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection)
 						ZEPHIR_CALL_METHOD(&boundModel, this_ptr, "findboundmodel", &_13, 0, &paramValue, &className);
 						zephir_check_call_status();
 					} else {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 209);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "getModelName should return array or string", "phalcon/Mvc/Model/Binder.zep", 229);
 						return;
 					}
 				} else if (zephir_is_true(&_16$$19)) {
diff --git a/ext/phalcon/mvc/model/binder.zep.h b/ext/phalcon/mvc/model/binder.zep.h
index f2d71158bf5..8960dfb8a12 100644
--- a/ext/phalcon/mvc/model/binder.zep.h
+++ b/ext/phalcon/mvc/model/binder.zep.h
@@ -3,23 +3,17 @@ extern zend_class_entry *phalcon_mvc_model_binder_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Binder);
 
-PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels);
-PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, __construct);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, bindToHandler);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, findBoundModel);
+PHP_METHOD(Phalcon_Mvc_Model_Binder, getBoundModels);
+PHP_METHOD(Phalcon_Mvc_Model_Binder, getOriginalValues);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, getCache);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromCache);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection);
 PHP_METHOD(Phalcon_Mvc_Model_Binder, setCache);
 zend_object *zephir_init_properties_Phalcon_Mvc_Model_Binder(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getboundmodels, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getoriginalvalues, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_binder___construct, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO(0, cache, Phalcon\\Cache\\Adapter\\AdapterInterface, 1)
 ZEND_END_ARG_INFO()
@@ -36,6 +30,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_binder_findboundmodel, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, className, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getboundmodels, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_binder_getoriginalvalues, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_binder_getcache, 0, 0, Phalcon\\Cache\\Adapter\\AdapterInterface, 0)
 ZEND_END_ARG_INFO()
 
@@ -58,11 +58,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_binder_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_model_binder_method_entry) {
-	PHP_ME(Phalcon_Mvc_Model_Binder, getBoundModels, arginfo_phalcon_mvc_model_binder_getboundmodels, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Model_Binder, getOriginalValues, arginfo_phalcon_mvc_model_binder_getoriginalvalues, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, __construct, arginfo_phalcon_mvc_model_binder___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Model_Binder, bindToHandler, arginfo_phalcon_mvc_model_binder_bindtohandler, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, findBoundModel, arginfo_phalcon_mvc_model_binder_findboundmodel, ZEND_ACC_PROTECTED)
+	PHP_ME(Phalcon_Mvc_Model_Binder, getBoundModels, arginfo_phalcon_mvc_model_binder_getboundmodels, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Model_Binder, getOriginalValues, arginfo_phalcon_mvc_model_binder_getoriginalvalues, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, getCache, arginfo_phalcon_mvc_model_binder_getcache, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Model_Binder, getParamsFromCache, arginfo_phalcon_mvc_model_binder_getparamsfromcache, ZEND_ACC_PROTECTED)
 	PHP_ME(Phalcon_Mvc_Model_Binder, getParamsFromReflection, arginfo_phalcon_mvc_model_binder_getparamsfromreflection, ZEND_ACC_PROTECTED)
diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c
index c67b0aea4ee..57c2fb696fa 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, 432, container);
+	ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 428, 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, 441, &_16$$16);
+		ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 437, &_16$$16);
 		zephir_check_call_status();
-		ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 442, &bind);
+		ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 438, &bind);
 		zephir_check_call_status();
 	}
-	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 433, &modelName);
+	ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 429, &modelName);
 	zephir_check_call_status();
 	RETURN_CCTOR(&criteria);
 }
diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c
index 41fc5f6f4ae..91791ebbc35 100644
--- a/ext/phalcon/mvc/model/manager.zep.c
+++ b/ext/phalcon/mvc/model/manager.zep.c
@@ -366,7 +366,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, 443, &_2, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_2, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -487,7 +487,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, 443, &_1, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_1, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -635,9 +635,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, 443, &_1, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_1, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 440, intermediateFields, &intermediateModel, intermediateReferencedFields);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -757,7 +757,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, 443, &_2, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_2, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -905,9 +905,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, 443, &_1, &referencedModel, fields, referencedFields, &options);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 439, &_1, &referencedModel, fields, referencedFields, &options);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields);
+	ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 440, intermediateFields, &intermediateModel, intermediateReferencedFields);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&alias);
 	if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) {
@@ -2402,7 +2402,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", 1401);
-		ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, parameters);
+		ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 441, &extraParameters, parameters);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3);
 		zephir_check_call_status();
@@ -2533,10 +2533,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, 445, &findParams, parameters);
+	ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "mergefindparameters", NULL, 441, &findParams, parameters);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&extraParameters) == IS_ARRAY) {
-		ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, &findArguments);
+		ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 441, &extraParameters, &findArguments);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CPY_WRT(&findParams, &findArguments);
@@ -3073,7 +3073,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasBelongsTo)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "belongsTo");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -3130,7 +3130,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasMany)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasMany");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -3187,7 +3187,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasManyToMany)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasManyToMany");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -3244,7 +3244,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOne)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasOne");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -3301,7 +3301,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOneThrough)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hasOneThrough");
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 442, &_0, &modelName, &modelRelation);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c
index e8eec8646d3..60e6a384311 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, "<?php return ", &_4$$3, "; ");
 		zephir_file_put_contents(&_3$$3, &path, &_5$$3);
 		if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$3)) {
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 447, &option);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 443, &option);
 			zephir_check_call_status_or_jump(try_end_1);
 		}
 
@@ -231,7 +231,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write)
 		if (zephir_is_instance_of(&_6, SL("Exception"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_7, &_6);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 447, &option);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 443, &option);
 			zephir_check_call_status();
 		}
 	}
diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c
index 7f0626066ac..265888e2f04 100644
--- a/ext/phalcon/mvc/model/query.zep.c
+++ b/ext/phalcon/mvc/model/query.zep.c
@@ -478,22 +478,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute)
 	ZEPHIR_CPY_WRT(&type, &_0);
 	do {
 		if (ZEPHIR_IS_LONG(&type, 309)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeselect", NULL, 448, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeselect", NULL, 444, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 306)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeinsert", NULL, 449, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeinsert", NULL, 445, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 300)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeupdate", NULL, 450, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executeupdate", NULL, 446, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 303)) {
-			ZEPHIR_CALL_METHOD(&result, this_ptr, "executedelete", NULL, 451, &intermediate, &mergedParams, &mergedTypes);
+			ZEPHIR_CALL_METHOD(&result, this_ptr, "executedelete", NULL, 447, &intermediate, &mergedParams, &mergedTypes);
 			zephir_check_call_status();
 			break;
 		}
@@ -678,7 +678,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSql)
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("bindParams"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("bindTypes"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_BOOL(&_3$$3, 1);
-		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "executeselect", NULL, 448, &intermediate, &_1$$3, &_2$$3, &_3$$3);
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "executeselect", NULL, 444, &intermediate, &_1$$3, &_2$$3, &_3$$3);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -787,22 +787,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &type);
 			do {
 				if (ZEPHIR_IS_LONG(&type, 309)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 452);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 448);
 					zephir_check_call_status();
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&type, 306)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 453);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 449);
 					zephir_check_call_status();
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&type, 300)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 454);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 450);
 					zephir_check_call_status();
 					break;
 				}
 				if (ZEPHIR_IS_LONG(&type, 303)) {
-					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 455);
+					ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 451);
 					zephir_check_call_status();
 					break;
 				}
@@ -1181,12 +1181,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 		ZEPHIR_CALL_METHOD(&model, &_1$$4, "load", NULL, 0, &modelName);
 		zephir_check_call_status();
 	}
-	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 456, &model, &intermediate, &bindParams, &bindTypes);
+	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 452, &model, &intermediate, &bindParams, &bindTypes);
 	zephir_check_call_status();
 	if (!(zephir_fast_count_int(&records))) {
 		object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 		ZVAL_BOOL(&_2$$5, 1);
-		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_2$$5);
+		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_2$$5);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -1211,7 +1211,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 			zephir_check_call_status();
 			object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 			ZVAL_BOOL(&_7$$7, 0);
-			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_7$$7, &record);
+			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_7$$7, &record);
 			zephir_check_call_status();
 			RETURN_MM();
 		}
@@ -1222,7 +1222,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete)
 	zephir_check_call_status();
 	object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 	ZVAL_BOOL(&_9, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_9);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_9);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -1520,7 +1520,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert)
 	object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 	ZEPHIR_CALL_METHOD(&_34, &insertModel, "create", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_34, &insertModel);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_34, &insertModel);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -2404,7 +2404,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 				}
 				ZEPHIR_INIT_VAR(&_93$$97);
 				ZVAL_STRING(&_93$$97, "Phalcon\\Mvc\\Model\\ResultsetInterface");
-				ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 440, &resultsetClassName, &_93$$97);
+				ZEPHIR_CALL_FUNCTION(&_94$$97, "is_subclass_of", NULL, 436, &resultsetClassName, &_93$$97);
 				zephir_check_call_status();
 				if (UNEXPECTED(!zephir_is_true(&_94$$97))) {
 					ZEPHIR_INIT_VAR(&_95$$99);
@@ -2437,12 +2437,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect)
 		} else {
 			ZVAL_BOOL(&_98$$83, 0);
 		}
-		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 458, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83);
+		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 454, &simpleColumnMap, &resultObject, &resultData, &cache, &_98$$83);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
 	object_init_ex(return_value, phalcon_mvc_model_resultset_complex_ce);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 459, &columns1, &resultData, &cache);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 455, &columns1, &resultData, &cache);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -2706,12 +2706,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 	}
 	ZEPHIR_INIT_NVAR(&field);
 	ZEPHIR_INIT_NVAR(&number);
-	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 456, &model, &intermediate, &selectBindParams, &selectBindTypes);
+	ZEPHIR_CALL_METHOD(&records, this_ptr, "getrelatedrecords", NULL, 452, &model, &intermediate, &selectBindParams, &selectBindTypes);
 	zephir_check_call_status();
 	if (!(zephir_fast_count_int(&records))) {
 		object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 		ZVAL_BOOL(&_28$$23, 1);
-		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_28$$23);
+		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_28$$23);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -2738,7 +2738,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 			zephir_check_call_status();
 			object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 			ZVAL_BOOL(&_33$$25, 0);
-			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_33$$25, &record);
+			ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_33$$25, &record);
 			zephir_check_call_status();
 			RETURN_MM();
 		}
@@ -2749,7 +2749,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate)
 	zephir_check_call_status();
 	object_init_ex(return_value, phalcon_mvc_model_query_status_ce);
 	ZVAL_BOOL(&_35, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 457, &_35);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &_35);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -2786,7 +2786,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument)
 		add_assoc_stringl_ex(return_value, SL("type"), SL("all"));
 		RETURN_MM();
 	}
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 460, &argument);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getexpression", NULL, 456, &argument);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -2851,11 +2851,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 				zephir_create_array(&_3$$4, 3, 0);
 				add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when"));
 				zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1545);
-				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_5$$4);
+				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 456, &_5$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE);
 				zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
-				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 460, &_7$$4);
+				ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 456, &_7$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE);
 				zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1547);
@@ -2864,7 +2864,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 				zephir_create_array(&_8$$5, 2, 0);
 				add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else"));
 				zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1551);
-				ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 460, &_10$$5);
+				ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 456, &_10$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE);
 				zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1552);
@@ -2886,11 +2886,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 					zephir_create_array(&_11$$7, 3, 0);
 					add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when"));
 					zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1545);
-					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_13$$7);
+					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 456, &_13$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE);
 					zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1546);
-					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 460, &_14$$7);
+					ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 456, &_14$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE);
 					zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1547);
@@ -2899,7 +2899,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 					zephir_create_array(&_15$$8, 2, 0);
 					add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else"));
 					zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1551);
-					ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 460, &_17$$8);
+					ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 456, &_17$$8);
 					zephir_check_call_status();
 					zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE);
 					zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1552);
@@ -2912,7 +2912,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression)
 	zephir_create_array(return_value, 3, 0);
 	add_assoc_stringl_ex(return_value, SL("type"), SL("case"));
 	zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1558);
-	ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 460, &_19);
+	ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 456, &_19);
 	zephir_check_call_status();
 	zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(return_value, SL("when-clauses"), &whenClauses, PH_COPY | PH_SEPARATE);
@@ -3071,7 +3071,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				} else {
 					ZVAL_BOOL(&_0$$5, 0);
 				}
-				ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 460, &exprLeft, &_0$$5);
+				ZEPHIR_CALL_METHOD(&left, this_ptr, "getexpression", NULL, 456, &exprLeft, &_0$$5);
 				zephir_check_call_status();
 			}
 			ZEPHIR_OBS_VAR(&exprRight);
@@ -3081,7 +3081,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				} else {
 					ZVAL_BOOL(&_1$$6, 0);
 				}
-				ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 460, &exprRight, &_1$$6);
+				ZEPHIR_CALL_METHOD(&right, this_ptr, "getexpression", NULL, 456, &exprRight, &_1$$6);
 				zephir_check_call_status();
 			}
 		}
@@ -3166,7 +3166,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 355)) {
-				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 461, &expr);
+				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getqualified", NULL, 457, &expr);
 				zephir_check_call_status();
 				break;
 			}
@@ -3661,12 +3661,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 350)) {
-				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 462, &expr);
+				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getfunctioncall", NULL, 458, &expr);
 				zephir_check_call_status();
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&exprType, 409)) {
-				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 463, &expr);
+				ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "getcaseexpression", NULL, 459, &expr);
 				zephir_check_call_status();
 				break;
 			}
@@ -3675,7 +3675,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				zephir_create_array(&_81$$69, 2, 0);
 				add_assoc_stringl_ex(&_81$$69, SL("type"), SL("select"));
 				ZVAL_BOOL(&_83$$69, 1);
-				ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 452, &expr, &_83$$69);
+				ZEPHIR_CALL_METHOD(&_82$$69, this_ptr, "_prepareselect", NULL, 448, &expr, &_83$$69);
 				zephir_check_call_status();
 				zephir_array_update_string(&_81$$69, SL("value"), &_82$$69, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CPY_WRT(&exprReturn, &_81$$69);
@@ -3695,7 +3695,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 		RETURN_CCTOR(&exprReturn);
 	}
 	if (zephir_array_isset_string(&expr, SL("domain"))) {
-		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 461, &expr);
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualified", NULL, 457, &expr);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -3708,7 +3708,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 			{
 				ZEPHIR_INIT_NVAR(&exprListItem);
 				ZVAL_COPY(&exprListItem, _86$$72);
-				ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 460, &exprListItem);
+				ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 456, &exprListItem);
 				zephir_check_call_status();
 				zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158);
 			} ZEND_HASH_FOREACH_END();
@@ -3723,7 +3723,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression)
 				}
 				ZEPHIR_CALL_METHOD(&exprListItem, &expr, "current", NULL, 0);
 				zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 460, &exprListItem);
+					ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 456, &exprListItem);
 					zephir_check_call_status();
 					zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2158);
 				ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0);
@@ -3794,7 +3794,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 				{
 					ZEPHIR_INIT_NVAR(&argument);
 					ZVAL_COPY(&argument, _0$$6);
-					ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 464, &argument);
+					ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 460, &argument);
 					zephir_check_call_status();
 					zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191);
 				} ZEND_HASH_FOREACH_END();
@@ -3809,7 +3809,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 					}
 					ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0);
 					zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 464, &argument);
+						ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 460, &argument);
 						zephir_check_call_status();
 						zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2191);
 					ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0);
@@ -3820,7 +3820,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall)
 		} else {
 			ZEPHIR_INIT_VAR(&_5$$9);
 			zephir_create_array(&_5$$9, 1, 0);
-			ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 464, &arguments);
+			ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "getcallargument", &_3, 460, &arguments);
 			zephir_check_call_status();
 			zephir_array_fast_append(&_5$$9, &_6$$9);
 			ZEPHIR_CPY_WRT(&functionArgs, &_5$$9);
@@ -3896,7 +3896,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 			{
 				ZEPHIR_INIT_NVAR(&groupItem);
 				ZVAL_COPY(&groupItem, _0$$3);
-				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 460, &groupItem);
+				ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 456, &groupItem);
 				zephir_check_call_status();
 				zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237);
 			} ZEND_HASH_FOREACH_END();
@@ -3911,7 +3911,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 				}
 				ZEPHIR_CALL_METHOD(&groupItem, &group, "current", NULL, 0);
 				zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 460, &groupItem);
+					ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 456, &groupItem);
 					zephir_check_call_status();
 					zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2237);
 				ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0);
@@ -3922,7 +3922,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause)
 	} else {
 		ZEPHIR_INIT_VAR(&_5$$6);
 		zephir_create_array(&_5$$6, 1, 0);
-		ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 460, &group);
+		ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getexpression", &_3, 456, &group);
 		zephir_check_call_status();
 		zephir_array_fast_append(&_5$$6, &_6$$6);
 		ZEPHIR_CPY_WRT(&groupParts, &_5$$6);
@@ -3964,13 +3964,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getLimitClause)
 	array_init(&limit);
 	ZEPHIR_OBS_VAR(&number);
 	if (zephir_array_isset_string_fetch(&number, &limitClause, SL("number"), 0)) {
-		ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 460, &number);
+		ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexpression", NULL, 456, &number);
 		zephir_check_call_status();
 		zephir_array_update_string(&limit, SL("number"), &_0$$3, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&offset);
 	if (zephir_array_isset_string_fetch(&offset, &limitClause, SL("offset"), 0)) {
-		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 460, &offset);
+		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getexpression", NULL, 456, &offset);
 		zephir_check_call_status();
 		zephir_array_update_string(&limit, SL("offset"), &_1$$4, PH_COPY | PH_SEPARATE);
 	}
@@ -4290,7 +4290,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 		{
 			ZEPHIR_INIT_NVAR(&joinItem);
 			ZVAL_COPY(&joinItem, _1);
-			ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem);
+			ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 461, &manager, &joinItem);
 			zephir_check_call_status();
 			ZEPHIR_OBS_NVAR(&source);
 			zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2382);
@@ -4304,7 +4304,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			zephir_create_array(&completeSource, 2, 0);
 			zephir_array_fast_append(&completeSource, &source);
 			zephir_array_fast_append(&completeSource, &schema);
-			ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 466, &joinItem);
+			ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 462, &joinItem);
 			zephir_check_call_status();
 			ZEPHIR_OBS_NVAR(&aliasExpr);
 			if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) {
@@ -4368,7 +4368,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			}
 			ZEPHIR_CALL_METHOD(&joinItem, &selectJoins, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 465, &manager, &joinItem);
+				ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 461, &manager, &joinItem);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&source);
 				zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2382);
@@ -4383,7 +4383,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 				zephir_array_fast_append(&_12$$12, &source);
 				zephir_array_fast_append(&_12$$12, &schema);
 				ZEPHIR_CPY_WRT(&completeSource, &_12$$12);
-				ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 466, &joinItem);
+				ZEPHIR_CALL_METHOD(&joinType, this_ptr, "getjointype", &_4, 462, &joinItem);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&aliasExpr);
 				if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) {
@@ -4460,7 +4460,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			ZVAL_COPY(&joinItem, _19);
 			ZEPHIR_OBS_NVAR(&joinExpr);
 			if (zephir_array_isset_string_fetch(&joinExpr, &joinItem, SL("conditions"), 0)) {
-				ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 460, &joinExpr);
+				ZEPHIR_CALL_METHOD(&_23$$18, this_ptr, "getexpression", &_24, 456, &joinExpr);
 				zephir_check_call_status();
 				zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_23$$18, PH_COPY | PH_SEPARATE);
 			}
@@ -4480,7 +4480,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 			zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&joinExpr);
 				if (zephir_array_isset_string_fetch(&joinExpr, &joinItem, SL("conditions"), 0)) {
-					ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 460, &joinExpr);
+					ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "getexpression", &_24, 456, &joinExpr);
 					zephir_check_call_status();
 					zephir_array_update_zval(&joinPreCondition, &joinAliasName, &_25$$20, PH_COPY | PH_SEPARATE);
 				}
@@ -4651,10 +4651,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 							ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0);
 							zephir_check_call_status();
 							if (!(zephir_is_true(&_55$$32))) {
-								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 								zephir_check_call_status();
 							} else {
-								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+								ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 								zephir_check_call_status();
 							}
 							if (zephir_array_isset_long(&sqlJoin, 0)) {
@@ -4757,10 +4757,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0);
 								zephir_check_call_status();
 								if (!(zephir_is_true(&_69$$46))) {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								} else {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								}
 								if (zephir_array_isset_long(&sqlJoin, 0)) {
@@ -4881,10 +4881,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 								ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0);
 								zephir_check_call_status();
 								if (!(zephir_is_true(&_85$$61))) {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								} else {
-									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+									ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 									zephir_check_call_status();
 								}
 								if (zephir_array_isset_long(&sqlJoin, 0)) {
@@ -4987,10 +4987,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins)
 									ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0);
 									zephir_check_call_status();
 									if (!(zephir_is_true(&_97$$75))) {
-										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 467, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getsinglejoin", &_56, 463, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 										zephir_check_call_status();
 									} else {
-										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 468, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
+										ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "getmultijoin", &_57, 464, &joinType, &joinSource, &modelAlias, &joinAlias, &relation);
 										zephir_check_call_status();
 									}
 									if (zephir_array_isset_long(&sqlJoin, 0)) {
@@ -5206,7 +5206,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 				add_assoc_long_ex(&_10$$4, SL("type"), 355);
 				zephir_array_update_string(&_10$$4, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_10$$4, SL("name"), &field, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 461, &_10$$4);
+				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 457, &_10$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_9$$4, PH_COPY | PH_SEPARATE);
 				ZEPHIR_INIT_NVAR(&_12$$4);
@@ -5214,7 +5214,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 				add_assoc_stringl_ex(&_12$$4, SL("type"), SL("qualified"));
 				zephir_array_update_string(&_12$$4, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_12$$4, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 461, &_12$$4);
+				ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "getqualified", &_11, 457, &_12$$4);
 				zephir_check_call_status();
 				zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_9$$4, PH_COPY | PH_SEPARATE);
 			} ZEND_HASH_FOREACH_END();
@@ -5254,7 +5254,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 					add_assoc_long_ex(&_18$$6, SL("type"), 355);
 					zephir_array_update_string(&_18$$6, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_18$$6, SL("name"), &field, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 461, &_18$$6);
+					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 457, &_18$$6);
 					zephir_check_call_status();
 					zephir_array_update_string(&_16$$6, SL("left"), &_17$$6, PH_COPY | PH_SEPARATE);
 					ZEPHIR_INIT_NVAR(&_19$$6);
@@ -5262,7 +5262,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 					add_assoc_stringl_ex(&_19$$6, SL("type"), SL("qualified"));
 					zephir_array_update_string(&_19$$6, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_19$$6, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 461, &_19$$6);
+					ZEPHIR_CALL_METHOD(&_17$$6, this_ptr, "getqualified", &_11, 457, &_19$$6);
 					zephir_check_call_status();
 					zephir_array_update_string(&_16$$6, SL("right"), &_17$$6, PH_COPY | PH_SEPARATE);
 					ZEPHIR_CPY_WRT(&sqlEqualsJoinCondition, &_16$$6);
@@ -5294,7 +5294,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_long_ex(&_25$$8, SL("type"), 355);
 		zephir_array_update_string(&_25$$8, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_25$$8, SL("name"), &fields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_25$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_25$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("left"), &_24$$8, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_26$$8);
@@ -5302,7 +5302,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_stringl_ex(&_26$$8, SL("type"), SL("qualified"));
 		zephir_array_update_string(&_26$$8, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_26$$8, SL("name"), &intermediateFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_26$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_26$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("right"), &_24$$8, PH_COPY | PH_SEPARATE);
 		zephir_array_fast_append(&_22$$8, &_23$$8);
@@ -5323,7 +5323,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_long_ex(&_27$$8, SL("type"), 355);
 		zephir_array_update_string(&_27$$8, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_27$$8, SL("name"), &intermediateReferencedFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_27$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_27$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("left"), &_24$$8, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_28$$8);
@@ -5331,7 +5331,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin)
 		add_assoc_stringl_ex(&_28$$8, SL("type"), SL("qualified"));
 		zephir_array_update_string(&_28$$8, SL("domain"), &referencedModelName, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_28$$8, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 461, &_28$$8);
+		ZEPHIR_CALL_METHOD(&_24$$8, this_ptr, "getqualified", &_11, 457, &_28$$8);
 		zephir_check_call_status();
 		zephir_array_update_string(&_23$$8, SL("right"), &_24$$8, PH_COPY | PH_SEPARATE);
 		zephir_array_fast_append(&_22$$8, &_23$$8);
@@ -5403,7 +5403,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 			ZEPHIR_INIT_NVAR(&orderItem);
 			ZVAL_COPY(&orderItem, _0);
 			zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2894);
-			ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_2$$5);
+			ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 456, &_2$$5);
 			zephir_check_call_status();
 			if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) {
 				if (ZEPHIR_IS_LONG(&orderSort, 327)) {
@@ -5442,7 +5442,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause)
 			ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0);
 			zephir_check_call_status();
 				zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2894);
-				ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 460, &_8$$10);
+				ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 456, &_8$$10);
 				zephir_check_call_status();
 				ZEPHIR_OBS_NVAR(&orderSort);
 				if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 0)) {
@@ -5929,17 +5929,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords)
 	}
 	ZEPHIR_INIT_VAR(&query);
 	object_init_ex(&query, phalcon_mvc_model_query_ce);
-	ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 469);
+	ZEPHIR_CALL_METHOD(NULL, &query, "__construct", NULL, 465);
 	zephir_check_call_status();
 	zephir_read_property(&_5, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 470, &_5);
+	ZEPHIR_CALL_METHOD(NULL, &query, "setdi", NULL, 466, &_5);
 	zephir_check_call_status();
 	ZVAL_LONG(&_6, 309);
-	ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 471, &_6);
+	ZEPHIR_CALL_METHOD(NULL, &query, "settype", NULL, 467, &_6);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 472, &selectIr);
+	ZEPHIR_CALL_METHOD(NULL, &query, "setintermediate", NULL, 468, &selectIr);
 	zephir_check_call_status();
-	ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 473, &bindParams, &bindTypes);
+	ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 469, &bindParams, &bindTypes);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -6137,7 +6137,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn)
 		ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16);
 		ZEPHIR_OBS_VAR(&columnData);
 		zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3294);
-		ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 460, &columnData);
+		ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 456, &columnData);
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&balias);
 		if (zephir_array_isset_string_fetch(&balias, &sqlExprColumn, SL("balias"), 0)) {
@@ -6258,7 +6258,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 		add_assoc_long_ex(&_3$$3, SL("type"), 355);
 		zephir_array_update_string(&_3$$3, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_3$$3, SL("name"), &fields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 461, &_3$$3);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 457, &_3$$3);
 		zephir_check_call_status();
 		zephir_array_update_string(&_1$$3, SL("left"), &_2$$3, PH_COPY | PH_SEPARATE);
 		ZEPHIR_INIT_VAR(&_4$$3);
@@ -6266,7 +6266,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 		add_assoc_stringl_ex(&_4$$3, SL("type"), SL("qualified"));
 		zephir_array_update_string(&_4$$3, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 		zephir_array_update_string(&_4$$3, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE);
-		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 461, &_4$$3);
+		ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getqualified", NULL, 457, &_4$$3);
 		zephir_check_call_status();
 		zephir_array_update_string(&_1$$3, SL("right"), &_2$$3, PH_COPY | PH_SEPARATE);
 		zephir_array_fast_append(&_0$$3, &_1$$3);
@@ -6308,7 +6308,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 				add_assoc_long_ex(&_15$$5, SL("type"), 355);
 				zephir_array_update_string(&_15$$5, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_15$$5, SL("name"), &field, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 461, &_15$$5);
+				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 457, &_15$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_13$$5, SL("left"), &_14$$5, PH_COPY | PH_SEPARATE);
 				ZEPHIR_INIT_NVAR(&_16$$5);
@@ -6316,7 +6316,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 				add_assoc_stringl_ex(&_16$$5, SL("type"), SL("qualified"));
 				zephir_array_update_string(&_16$$5, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 				zephir_array_update_string(&_16$$5, SL("name"), &referencedField, PH_COPY | PH_SEPARATE);
-				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 461, &_16$$5);
+				ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 457, &_16$$5);
 				zephir_check_call_status();
 				zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE);
 				zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3403);
@@ -6356,7 +6356,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					add_assoc_long_ex(&_22$$7, SL("type"), 355);
 					zephir_array_update_string(&_22$$7, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_22$$7, SL("name"), &field, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 461, &_22$$7);
+					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 457, &_22$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_20$$7, SL("left"), &_21$$7, PH_COPY | PH_SEPARATE);
 					ZEPHIR_INIT_NVAR(&_23$$7);
@@ -6364,7 +6364,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin)
 					add_assoc_stringl_ex(&_23$$7, SL("type"), SL("qualified"));
 					zephir_array_update_string(&_23$$7, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE);
 					zephir_array_update_string(&_23$$7, SL("name"), &referencedField, PH_COPY | PH_SEPARATE);
-					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 461, &_23$$7);
+					ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 457, &_23$$7);
 					zephir_check_call_status();
 					zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE);
 					zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3403);
@@ -6707,13 +6707,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete)
 	ZEPHIR_OBS_VAR(&where);
 	if (zephir_array_isset_string_fetch(&where, &ast, SL("where"), 0)) {
 		ZVAL_BOOL(&_10$$17, 1);
-		ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 460, &where, &_10$$17);
+		ZEPHIR_CALL_METHOD(&_9$$17, this_ptr, "getexpression", NULL, 456, &where, &_10$$17);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlDelete, SL("where"), &_9$$17, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&limit);
 	if (zephir_array_isset_string_fetch(&limit, &ast, SL("limit"), 0)) {
-		ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 474, &limit);
+		ZEPHIR_CALL_METHOD(&_11$$18, this_ptr, "getlimitclause", NULL, 470, &limit);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$18, PH_COPY | PH_SEPARATE);
 	}
@@ -6827,7 +6827,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 			} else {
 				ZVAL_BOOL(&_8$$7, 0);
 			}
-			ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 460, &exprValue, &_8$$7);
+			ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 456, &exprValue, &_8$$7);
 			zephir_check_call_status();
 			zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE);
 			zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3619);
@@ -6853,7 +6853,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert)
 				} else {
 					ZVAL_BOOL(&_13$$8, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 460, &exprValue, &_13$$8);
+				ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 456, &exprValue, &_13$$8);
 				zephir_check_call_status();
 				zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE);
 				zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3619);
@@ -7710,12 +7710,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 				zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE);
 			}
 		}
-		ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 475, &select);
+		ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 471, &select);
 		zephir_check_call_status();
 	} else {
 		if (zephir_fast_count_int(&automaticJoins)) {
 			zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE);
-			ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 475, &select);
+			ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "getjoins", NULL, 471, &select);
 			zephir_check_call_status();
 		} else {
 			ZEPHIR_INIT_NVAR(&sqlJoins);
@@ -7731,7 +7731,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 		{
 			ZEPHIR_INIT_NVAR(&column);
 			ZVAL_COPY(&column, _82);
-			ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 476, &column);
+			ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 472, &column);
 			zephir_check_call_status();
 			zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3969);
 			if (Z_TYPE_P(&_84$$60) == IS_ARRAY) {
@@ -7816,7 +7816,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 			}
 			ZEPHIR_CALL_METHOD(&column, &selectColumns, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 476, &column);
+				ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 472, &column);
 				zephir_check_call_status();
 				zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3969);
 				if (Z_TYPE_P(&_94$$75) == IS_ARRAY) {
@@ -7911,31 +7911,31 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect)
 	}
 	ZEPHIR_OBS_VAR(&where);
 	if (zephir_array_isset_string_fetch(&where, ast, SL("where"), 0)) {
-		ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 460, &where);
+		ZEPHIR_CALL_METHOD(&_104$$92, this_ptr, "getexpression", NULL, 456, &where);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("where"), &_104$$92, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&groupBy);
 	if (zephir_array_isset_string_fetch(&groupBy, ast, SL("groupBy"), 0)) {
-		ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 477, &groupBy);
+		ZEPHIR_CALL_METHOD(&_105$$93, this_ptr, "getgroupclause", NULL, 473, &groupBy);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("group"), &_105$$93, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&having);
 	if (zephir_array_isset_string_fetch(&having, ast, SL("having"), 0)) {
-		ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 460, &having);
+		ZEPHIR_CALL_METHOD(&_106$$94, this_ptr, "getexpression", NULL, 456, &having);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("having"), &_106$$94, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&order);
 	if (zephir_array_isset_string_fetch(&order, ast, SL("orderBy"), 0)) {
-		ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 478, &order);
+		ZEPHIR_CALL_METHOD(&_107$$95, this_ptr, "getorderclause", NULL, 474, &order);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("order"), &_107$$95, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&limit);
 	if (zephir_array_isset_string_fetch(&limit, ast, SL("limit"), 0)) {
-		ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 474, &limit);
+		ZEPHIR_CALL_METHOD(&_108$$96, this_ptr, "getlimitclause", NULL, 470, &limit);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlSelect, SL("limit"), &_108$$96, PH_COPY | PH_SEPARATE);
 	}
@@ -8191,7 +8191,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			} else {
 				ZVAL_BOOL(&_13$$20, 0);
 			}
-			ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 460, &_12$$20, &_13$$20);
+			ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 456, &_12$$20, &_13$$20);
 			zephir_check_call_status();
 			zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138);
 			ZEPHIR_OBS_NVAR(&exprColumn);
@@ -8206,7 +8206,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 			} else {
 				ZVAL_BOOL(&_18$$20, 0);
 			}
-			ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 460, &exprColumn, &_18$$20);
+			ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 456, &exprColumn, &_18$$20);
 			zephir_check_call_status();
 			zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE);
 			zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4143);
@@ -8228,7 +8228,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 				} else {
 					ZVAL_BOOL(&_21$$21, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 460, &_20$$21, &_21$$21);
+				ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 456, &_20$$21, &_21$$21);
 				zephir_check_call_status();
 				zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138);
 				ZEPHIR_OBS_NVAR(&exprColumn);
@@ -8243,7 +8243,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 				} else {
 					ZVAL_BOOL(&_25$$21, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 460, &exprColumn, &_25$$21);
+				ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 456, &exprColumn, &_25$$21);
 				zephir_check_call_status();
 				zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE);
 				zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4143);
@@ -8261,13 +8261,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate)
 	ZEPHIR_OBS_VAR(&where);
 	if (zephir_array_isset_string_fetch(&where, &ast, SL("where"), 0)) {
 		ZVAL_BOOL(&_27$$22, 1);
-		ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 460, &where, &_27$$22);
+		ZEPHIR_CALL_METHOD(&_26$$22, this_ptr, "getexpression", &_14, 456, &where, &_27$$22);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlUpdate, SL("where"), &_26$$22, PH_COPY | PH_SEPARATE);
 	}
 	ZEPHIR_OBS_VAR(&limit);
 	if (zephir_array_isset_string_fetch(&limit, &ast, SL("limit"), 0)) {
-		ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 474, &limit);
+		ZEPHIR_CALL_METHOD(&_28$$23, this_ptr, "getlimitclause", NULL, 470, &limit);
 		zephir_check_call_status();
 		zephir_array_update_string(&sqlUpdate, SL("limit"), &_28$$23, PH_COPY | PH_SEPARATE);
 	}
diff --git a/ext/phalcon/mvc/model/query/builder.zep.c b/ext/phalcon/mvc/model/query/builder.zep.c
index 2635ad7f230..b5e4129be86 100644
--- a/ext/phalcon/mvc/model/query/builder.zep.c
+++ b/ext/phalcon/mvc/model/query/builder.zep.c
@@ -1082,7 +1082,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getModels)
 	}
 	if (_1) {
 		ZEPHIR_MAKE_REF(&models);
-		ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 479, &models);
+		ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 475, &models);
 		ZEPHIR_UNREF(&models);
 		zephir_check_call_status();
 		RETURN_MM();
@@ -1333,9 +1333,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					ZEPHIR_CONCAT_SVS(&_6$$19, "'", &conditions, "'");
 					ZEPHIR_CPY_WRT(&conditions, &_6$$19);
 				}
-				ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "autoescape", NULL, 480, &model);
+				ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "autoescape", NULL, 476, &model);
 				zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_8$$13, this_ptr, "autoescape", NULL, 480, &attributeField);
+				ZEPHIR_CALL_METHOD(&_8$$13, this_ptr, "autoescape", NULL, 476, &attributeField);
 				zephir_check_call_status();
 				ZEPHIR_INIT_VAR(&_9$$13);
 				ZEPHIR_CONCAT_VSVSV(&_9$$13, &_7$$13, ".", &_8$$13, " = ", &conditions);
@@ -1382,7 +1382,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					if (Z_TYPE_P(&columnAlias) == IS_LONG) {
 						zephir_array_append(&selectedColumns, &column, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 793);
 					} else {
-						ZEPHIR_CALL_METHOD(&_14$$29, this_ptr, "autoescape", NULL, 480, &columnAlias);
+						ZEPHIR_CALL_METHOD(&_14$$29, this_ptr, "autoescape", NULL, 476, &columnAlias);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_15$$29);
 						ZEPHIR_CONCAT_VSV(&_15$$29, &column, " AS ", &_14$$29);
@@ -1405,7 +1405,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 						if (Z_TYPE_P(&columnAlias) == IS_LONG) {
 							zephir_array_append(&selectedColumns, &column, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 793);
 						} else {
-							ZEPHIR_CALL_METHOD(&_16$$32, this_ptr, "autoescape", NULL, 480, &columnAlias);
+							ZEPHIR_CALL_METHOD(&_16$$32, this_ptr, "autoescape", NULL, 476, &columnAlias);
 							zephir_check_call_status();
 							ZEPHIR_INIT_NVAR(&_17$$32);
 							ZEPHIR_CONCAT_VSV(&_17$$32, &column, " AS ", &_16$$32);
@@ -1441,11 +1441,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					ZVAL_COPY(&model, _19$$35);
 					ZEPHIR_INIT_NVAR(&selectedColumn);
 					if (Z_TYPE_P(&modelColumnAlias) == IS_LONG) {
-						ZEPHIR_CALL_METHOD(&_23$$37, this_ptr, "autoescape", NULL, 480, &model);
+						ZEPHIR_CALL_METHOD(&_23$$37, this_ptr, "autoescape", NULL, 476, &model);
 						zephir_check_call_status();
 						ZEPHIR_CONCAT_VS(&selectedColumn, &_23$$37, ".*");
 					} else {
-						ZEPHIR_CALL_METHOD(&_24$$38, this_ptr, "autoescape", NULL, 480, &modelColumnAlias);
+						ZEPHIR_CALL_METHOD(&_24$$38, this_ptr, "autoescape", NULL, 476, &modelColumnAlias);
 						zephir_check_call_status();
 						ZEPHIR_CONCAT_VS(&selectedColumn, &_24$$38, ".*");
 					}
@@ -1466,11 +1466,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&selectedColumn);
 						if (Z_TYPE_P(&modelColumnAlias) == IS_LONG) {
-							ZEPHIR_CALL_METHOD(&_25$$40, this_ptr, "autoescape", NULL, 480, &model);
+							ZEPHIR_CALL_METHOD(&_25$$40, this_ptr, "autoescape", NULL, 476, &model);
 							zephir_check_call_status();
 							ZEPHIR_CONCAT_VS(&selectedColumn, &_25$$40, ".*");
 						} else {
-							ZEPHIR_CALL_METHOD(&_26$$41, this_ptr, "autoescape", NULL, 480, &modelColumnAlias);
+							ZEPHIR_CALL_METHOD(&_26$$41, this_ptr, "autoescape", NULL, 476, &modelColumnAlias);
 							zephir_check_call_status();
 							ZEPHIR_CONCAT_VS(&selectedColumn, &_26$$41, ".*");
 						}
@@ -1485,7 +1485,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 			zephir_fast_join_str(&_27$$35, SL(", "), &selectedColumns);
 			zephir_concat_self(&phql, &_27$$35);
 		} else {
-			ZEPHIR_CALL_METHOD(&_28$$42, this_ptr, "autoescape", NULL, 480, &models);
+			ZEPHIR_CALL_METHOD(&_28$$42, this_ptr, "autoescape", NULL, 476, &models);
 			zephir_check_call_status();
 			ZEPHIR_INIT_VAR(&_29$$42);
 			ZEPHIR_CONCAT_VS(&_29$$42, &_28$$42, ".*");
@@ -1508,14 +1508,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				ZEPHIR_INIT_NVAR(&model);
 				ZVAL_COPY(&model, _30$$43);
 				if (Z_TYPE_P(&modelAlias) == IS_STRING) {
-					ZEPHIR_CALL_METHOD(&_34$$45, this_ptr, "autoescape", NULL, 480, &model);
+					ZEPHIR_CALL_METHOD(&_34$$45, this_ptr, "autoescape", NULL, 476, &model);
 					zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_35$$45, this_ptr, "autoescape", NULL, 480, &modelAlias);
+					ZEPHIR_CALL_METHOD(&_35$$45, this_ptr, "autoescape", NULL, 476, &modelAlias);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&selectedModel);
 					ZEPHIR_CONCAT_VSV(&selectedModel, &_34$$45, " AS ", &_35$$45);
 				} else {
-					ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 480, &model);
+					ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 476, &model);
 					zephir_check_call_status();
 				}
 				zephir_array_append(&selectedModels, &selectedModel, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 839);
@@ -1534,14 +1534,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				ZEPHIR_CALL_METHOD(&model, &models, "current", NULL, 0);
 				zephir_check_call_status();
 					if (Z_TYPE_P(&modelAlias) == IS_STRING) {
-						ZEPHIR_CALL_METHOD(&_36$$48, this_ptr, "autoescape", NULL, 480, &model);
+						ZEPHIR_CALL_METHOD(&_36$$48, this_ptr, "autoescape", NULL, 476, &model);
 						zephir_check_call_status();
-						ZEPHIR_CALL_METHOD(&_37$$48, this_ptr, "autoescape", NULL, 480, &modelAlias);
+						ZEPHIR_CALL_METHOD(&_37$$48, this_ptr, "autoescape", NULL, 476, &modelAlias);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&selectedModel);
 						ZEPHIR_CONCAT_VSV(&selectedModel, &_36$$48, " AS ", &_37$$48);
 					} else {
-						ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 480, &model);
+						ZEPHIR_CALL_METHOD(&selectedModel, this_ptr, "autoescape", NULL, 476, &model);
 						zephir_check_call_status();
 					}
 					zephir_array_append(&selectedModels, &selectedModel, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 839);
@@ -1557,7 +1557,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 		ZEPHIR_CONCAT_SV(&_39$$43, " FROM ", &_38$$43);
 		zephir_concat_self(&phql, &_39$$43);
 	} else {
-		ZEPHIR_CALL_METHOD(&_40$$50, this_ptr, "autoescape", NULL, 480, &models);
+		ZEPHIR_CALL_METHOD(&_40$$50, this_ptr, "autoescape", NULL, 476, &models);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_41$$50);
 		ZEPHIR_CONCAT_SV(&_41$$50, " FROM ", &_40$$50);
@@ -1581,20 +1581,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				ZEPHIR_OBS_NVAR(&joinType);
 				zephir_array_fetch_long(&joinType, &join, 3, PH_NOISY, "phalcon/Mvc/Model/Query/Builder.zep", 872);
 				if (zephir_is_true(&joinType)) {
-					ZEPHIR_CALL_METHOD(&_44$$53, this_ptr, "autoescape", NULL, 480, &joinModel);
+					ZEPHIR_CALL_METHOD(&_44$$53, this_ptr, "autoescape", NULL, 476, &joinModel);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_45$$53);
 					ZEPHIR_CONCAT_SVSV(&_45$$53, " ", &joinType, " JOIN ", &_44$$53);
 					zephir_concat_self(&phql, &_45$$53);
 				} else {
-					ZEPHIR_CALL_METHOD(&_46$$54, this_ptr, "autoescape", NULL, 480, &joinModel);
+					ZEPHIR_CALL_METHOD(&_46$$54, this_ptr, "autoescape", NULL, 476, &joinModel);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_47$$54);
 					ZEPHIR_CONCAT_SV(&_47$$54, " JOIN ", &_46$$54);
 					zephir_concat_self(&phql, &_47$$54);
 				}
 				if (zephir_is_true(&joinAlias)) {
-					ZEPHIR_CALL_METHOD(&_48$$55, this_ptr, "autoescape", NULL, 480, &joinAlias);
+					ZEPHIR_CALL_METHOD(&_48$$55, this_ptr, "autoescape", NULL, 476, &joinAlias);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_49$$55);
 					ZEPHIR_CONCAT_SV(&_49$$55, " AS ", &_48$$55);
@@ -1626,20 +1626,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 					ZEPHIR_OBS_NVAR(&joinType);
 					zephir_array_fetch_long(&joinType, &join, 3, PH_NOISY, "phalcon/Mvc/Model/Query/Builder.zep", 872);
 					if (zephir_is_true(&joinType)) {
-						ZEPHIR_CALL_METHOD(&_51$$58, this_ptr, "autoescape", NULL, 480, &joinModel);
+						ZEPHIR_CALL_METHOD(&_51$$58, this_ptr, "autoescape", NULL, 476, &joinModel);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_52$$58);
 						ZEPHIR_CONCAT_SVSV(&_52$$58, " ", &joinType, " JOIN ", &_51$$58);
 						zephir_concat_self(&phql, &_52$$58);
 					} else {
-						ZEPHIR_CALL_METHOD(&_53$$59, this_ptr, "autoescape", NULL, 480, &joinModel);
+						ZEPHIR_CALL_METHOD(&_53$$59, this_ptr, "autoescape", NULL, 476, &joinModel);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_54$$59);
 						ZEPHIR_CONCAT_SV(&_54$$59, " JOIN ", &_53$$59);
 						zephir_concat_self(&phql, &_54$$59);
 					}
 					if (zephir_is_true(&joinAlias)) {
-						ZEPHIR_CALL_METHOD(&_55$$60, this_ptr, "autoescape", NULL, 480, &joinAlias);
+						ZEPHIR_CALL_METHOD(&_55$$60, this_ptr, "autoescape", NULL, 476, &joinAlias);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_56$$60);
 						ZEPHIR_CONCAT_SV(&_56$$60, " AS ", &_55$$60);
@@ -1674,7 +1674,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 			{
 				ZEPHIR_INIT_NVAR(&groupItem);
 				ZVAL_COPY(&groupItem, _59$$64);
-				ZEPHIR_CALL_METHOD(&_61$$65, this_ptr, "autoescape", NULL, 480, &groupItem);
+				ZEPHIR_CALL_METHOD(&_61$$65, this_ptr, "autoescape", NULL, 476, &groupItem);
 				zephir_check_call_status();
 				zephir_array_append(&groupItems, &_61$$65, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 914);
 			} ZEND_HASH_FOREACH_END();
@@ -1689,7 +1689,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 				}
 				ZEPHIR_CALL_METHOD(&groupItem, &group, "current", NULL, 0);
 				zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_62$$66, this_ptr, "autoescape", NULL, 480, &groupItem);
+					ZEPHIR_CALL_METHOD(&_62$$66, this_ptr, "autoescape", NULL, 476, &groupItem);
 					zephir_check_call_status();
 					zephir_array_append(&groupItems, &_62$$66, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 914);
 				ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0);
@@ -1732,7 +1732,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 						ZEPHIR_INIT_NVAR(&itemExplode$$73);
 						zephir_fast_explode_str(&itemExplode$$73, SL(" "), &orderItem, LONG_MAX);
 						zephir_array_fetch_long(&_69$$73, &itemExplode$$73, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
-						ZEPHIR_CALL_METHOD(&_68$$73, this_ptr, "autoescape", NULL, 480, &_69$$73);
+						ZEPHIR_CALL_METHOD(&_68$$73, this_ptr, "autoescape", NULL, 476, &_69$$73);
 						zephir_check_call_status();
 						zephir_array_fetch_long(&_70$$73, &itemExplode$$73, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 						ZEPHIR_INIT_NVAR(&_71$$73);
@@ -1740,7 +1740,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 						zephir_array_append(&orderItems, &_71$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 						continue;
 					}
-					ZEPHIR_CALL_METHOD(&_72$$71, this_ptr, "autoescape", NULL, 480, &orderItem);
+					ZEPHIR_CALL_METHOD(&_72$$71, this_ptr, "autoescape", NULL, 476, &orderItem);
 					zephir_check_call_status();
 					zephir_array_append(&orderItems, &_72$$71, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 958);
 				} ZEND_HASH_FOREACH_END();
@@ -1763,7 +1763,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 							ZEPHIR_INIT_NVAR(&itemExplode$$76);
 							zephir_fast_explode_str(&itemExplode$$76, SL(" "), &orderItem, LONG_MAX);
 							zephir_array_fetch_long(&_74$$76, &itemExplode$$76, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
-							ZEPHIR_CALL_METHOD(&_73$$76, this_ptr, "autoescape", NULL, 480, &_74$$76);
+							ZEPHIR_CALL_METHOD(&_73$$76, this_ptr, "autoescape", NULL, 476, &_74$$76);
 							zephir_check_call_status();
 							zephir_array_fetch_long(&_75$$76, &itemExplode$$76, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 							ZEPHIR_INIT_NVAR(&_76$$76);
@@ -1771,7 +1771,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getPhql)
 							zephir_array_append(&orderItems, &_76$$76, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 953);
 							continue;
 						}
-						ZEPHIR_CALL_METHOD(&_77$$74, this_ptr, "autoescape", NULL, 480, &orderItem);
+						ZEPHIR_CALL_METHOD(&_77$$74, this_ptr, "autoescape", NULL, 476, &orderItem);
 						zephir_check_call_status();
 						zephir_array_append(&orderItems, &_77$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query/Builder.zep", 958);
 					ZEPHIR_CALL_METHOD(NULL, &order, "next", NULL, 0);
@@ -1887,7 +1887,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getQuery)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 481);
+	ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 477);
 	zephir_check_call_status();
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&container, &_0);
diff --git a/ext/phalcon/mvc/model/resultset.zep.h b/ext/phalcon/mvc/model/resultset.zep.h
index cf912c1c505..25e514c9c8e 100644
--- a/ext/phalcon/mvc/model/resultset.zep.h
+++ b/ext/phalcon/mvc/model/resultset.zep.h
@@ -78,7 +78,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c
index fb5ff12c925..ebed56110f7 100644
--- a/ext/phalcon/mvc/model/resultset/complex.zep.c
+++ b/ext/phalcon/mvc/model/resultset/complex.zep.c
@@ -511,7 +511,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray)
 		if (!(zephir_is_true(&_0))) {
 			break;
 		}
-		ZEPHIR_CALL_METHOD(&current, this_ptr, "current", &_2, 482);
+		ZEPHIR_CALL_METHOD(&current, this_ptr, "current", &_2, 478);
 		zephir_check_call_status();
 		zephir_array_append(&records, &current, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 279);
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0);
diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.h b/ext/phalcon/mvc/model/resultset/complex.zep.h
index 7c88947f648..6954f9507e5 100644
--- a/ext/phalcon/mvc/model/resultset/complex.zep.h
+++ b/ext/phalcon/mvc/model/resultset/complex.zep.h
@@ -20,7 +20,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/mvc/model/row.zep.c b/ext/phalcon/mvc/model/row.zep.c
index e701180d13c..1c5beb31bc6 100644
--- a/ext/phalcon/mvc/model/row.zep.c
+++ b/ext/phalcon/mvc/model/row.zep.c
@@ -270,7 +270,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, toArray)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 429, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 425, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/phalcon/mvc/model/row.zep.h b/ext/phalcon/mvc/model/row.zep.h
index ae5b4249926..226a0668038 100644
--- a/ext/phalcon/mvc/model/row.zep.h
+++ b/ext/phalcon/mvc/model/row.zep.h
@@ -19,7 +19,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/model/transaction.zep.c b/ext/phalcon/mvc/model/transaction.zep.c
index 5020316ae66..5adc4548085 100644
--- a/ext/phalcon/mvc/model/transaction.zep.c
+++ b/ext/phalcon/mvc/model/transaction.zep.c
@@ -240,7 +240,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("rollbackOnAbort"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_is_true(&_0)) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 483);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 479);
 		zephir_check_call_status();
 		if (zephir_is_true(&_1$$3)) {
 			ZEPHIR_INIT_VAR(&_2$$4);
@@ -371,7 +371,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback)
 			ZEPHIR_INIT_VAR(&_3$$7);
 			object_init_ex(&_3$$7, phalcon_mvc_model_transaction_failed_ce);
 			zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("rollbackRecord"), PH_NOISY_CC | PH_READONLY);
-			ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 484, &rollbackMessage, &_4$$7);
+			ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 480, &rollbackMessage, &_4$$7);
 			zephir_check_call_status();
 			zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model/Transaction.zep", 215);
 			ZEPHIR_MM_RESTORE();
diff --git a/ext/phalcon/mvc/model/transaction/manager.zep.c b/ext/phalcon/mvc/model/transaction/manager.zep.c
index 1529f44ade1..b03e63105fc 100644
--- a/ext/phalcon/mvc/model/transaction/manager.zep.c
+++ b/ext/phalcon/mvc/model/transaction/manager.zep.c
@@ -327,7 +327,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get)
 			ZEPHIR_INIT_VAR(&_3$$4);
 			ZVAL_STRING(&_3$$4, "rollbackPendent");
 			zephir_array_fast_append(&_2$$4, &_3$$4);
-			ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 485, &_2$$4);
+			ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 481, &_2$$4);
 			zephir_check_call_status();
 		}
 		if (1) {
@@ -467,9 +467,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction)
 	} else {
 		ZVAL_BOOL(&_7, 0);
 	}
-	ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 486, &container, &_7, &_6);
+	ZEPHIR_CALL_METHOD(NULL, &transaction, "__construct", NULL, 482, &container, &_7, &_6);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 487, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &transaction, "settransactionmanager", NULL, 483, this_ptr);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("transactions"), &transaction);
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("number")));
diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c
index 453bf711ef2..855a484c121 100644
--- a/ext/phalcon/mvc/router.zep.c
+++ b/ext/phalcon/mvc/router.zep.c
@@ -12,13 +12,13 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
 #include "kernel/array.h"
+#include "kernel/object.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/exception.h"
+#include "kernel/operators.h"
 #include "kernel/string.h"
 #include "kernel/concat.h"
 
@@ -149,82 +149,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "keyRouteNames");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *keyRouteNames_param = NULL;
-	zval keyRouteNames;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&keyRouteNames);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ARRAY(keyRouteNames)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &keyRouteNames_param);
-	zephir_get_arrval(&keyRouteNames, keyRouteNames_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteNames"), &keyRouteNames);
-	RETURN_THIS();
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "keyRouteIds");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds)
-{
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *keyRouteIds_param = NULL;
-	zval keyRouteIds;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&keyRouteIds);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ARRAY(keyRouteIds)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &keyRouteIds_param);
-	zephir_get_arrval(&keyRouteIds, keyRouteIds_param);
-
-
-	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteIds"), &keyRouteIds);
-	RETURN_THIS();
-}
-
 /**
  * Phalcon\Mvc\Router constructor
  *
@@ -279,7 +203,7 @@ PHP_METHOD(Phalcon_Mvc_Router, __construct)
 		ZVAL_STRING(&_2$$3, "#^/([\\w0-9\\_\\-]+)[/]{0,1}$#u");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 97, &_2$$3, &_1$$3);
 		zephir_check_call_status();
-		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 171);
+		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 170);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		object_init_ex(&_2$$3, phalcon_mvc_router_route_ce);
 		ZEPHIR_INIT_VAR(&_3$$3);
@@ -291,7 +215,7 @@ PHP_METHOD(Phalcon_Mvc_Router, __construct)
 		ZVAL_STRING(&_4$$3, "#^/([\\w0-9\\_\\-]+)/([\\w0-9\\.\\_]+)(/.*)*$#u");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 97, &_4$$3, &_3$$3);
 		zephir_check_call_status();
-		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 180);
+		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 179);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("routes"), &routes);
 	ZEPHIR_MM_RESTORE();
@@ -1144,7 +1068,7 @@ PHP_METHOD(Phalcon_Mvc_Router, attach)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("routes"), &_0$$4);
 			break;
 		}
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/Mvc/Router.zep", 459);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/Mvc/Router.zep", 494);
 		return;
 	} while(0);
 
@@ -1207,6 +1131,63 @@ PHP_METHOD(Phalcon_Mvc_Router, getControllerName)
 	RETURN_MEMBER(getThis(), "controller");
 }
 
+/**
+ * Returns an array of default parameters
+ */
+PHP_METHOD(Phalcon_Mvc_Router, getDefaults)
+{
+	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&_0);
+
+
+	ZEPHIR_MM_GROW();
+
+	zephir_create_array(return_value, 5, 0);
+	ZEPHIR_OBS_VAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultNamespace"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("namespace"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("module"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultController"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("controller"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultAction"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("action"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_OBS_NVAR(&_0);
+	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultParams"), PH_NOISY_CC);
+	zephir_array_update_string(return_value, SL("params"), &_0, PH_COPY | PH_SEPARATE);
+	RETURN_MM();
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "keyRouteNames");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "keyRouteIds");
+}
+
 /**
  * Returns the route that matches the handled URI
  */
@@ -1308,11 +1289,11 @@ PHP_METHOD(Phalcon_Mvc_Router, getRouteById)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("keyRouteIds"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset_fetch(&key, &_0, id, 0)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 549);
+		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 614);
 		RETURN_CTOR(&_2$$3);
 	}
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 561);
+	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 626);
 	if (Z_TYPE_P(&_3) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_3), _6, _7, _4)
 		{
@@ -1410,11 +1391,11 @@ PHP_METHOD(Phalcon_Mvc_Router, getRouteByName)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("keyRouteNames"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset_fetch(&key, &_0, &name, 0)) {
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 576);
+		zephir_array_fetch(&_2$$3, &_1$$3, &key, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router.zep", 641);
 		RETURN_CTOR(&_2$$3);
 	}
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 591);
+	zephir_is_iterable(&_3, 0, "phalcon/Mvc/Router.zep", 656);
 	if (Z_TYPE_P(&_3) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_3), _6, _7, _4)
 		{
@@ -1632,7 +1613,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("removeExtraSlashes"), PH_NOISY_CC | PH_READONLY);
 	_2 = zephir_is_true(&_0);
 	if (_2) {
-		_2 = !ZEPHIR_IS_STRING(&uri, "/");
+		_2 = !ZEPHIR_IS_STRING_IDENTICAL(&uri, "/");
 	}
 	if (_2) {
 		ZEPHIR_INIT_VAR(&_3$$3);
@@ -1666,14 +1647,14 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("matchedRoute"), &__$null);
 	zephir_read_property(&_4, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&eventsManager, &_4);
-	if (Z_TYPE_P(&eventsManager) == IS_OBJECT) {
+	if (Z_TYPE_P(&eventsManager) != IS_NULL) {
 		ZEPHIR_INIT_VAR(&_5$$6);
 		ZVAL_STRING(&_5$$6, "router:beforeCheckRoutes");
 		ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_5$$6, this_ptr);
 		zephir_check_call_status();
 	}
 	zephir_read_property(&_4, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY);
-	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Router.zep", 888);
+	zephir_is_iterable(&_4, 0, "phalcon/Mvc/Router.zep", 948);
 	if (Z_TYPE_P(&_4) == IS_ARRAY) {
 		ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(&_4), _6)
 		{
@@ -1689,8 +1670,8 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (Z_TYPE_P(&request) == IS_NULL) {
 					zephir_read_property(&_8$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&container, &_8$$9);
-					if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 676);
+					if (Z_TYPE_P(&container) == IS_NULL) {
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 739);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&_10$$9);
@@ -1712,8 +1693,8 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (Z_TYPE_P(&request) == IS_NULL) {
 					zephir_read_property(&_13$$13, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&container, &_13$$13);
-					if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 705);
+					if (Z_TYPE_P(&container) == IS_NULL) {
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 766);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&_15$$13);
@@ -1729,11 +1710,11 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (!(zephir_is_true(&currentHostName))) {
 					continue;
 				}
-				if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 729)) {
-					if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 730))) {
+				if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 790)) {
+					if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 791))) {
 						ZEPHIR_INIT_NVAR(&regexHostName);
 						ZEPHIR_CONCAT_SV(&regexHostName, "#^", &hostname);
-						if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 733))) {
+						if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 794))) {
 							zephir_concat_self_str(&regexHostName, SL("(:[[:digit:]]+)?"));
 						}
 						zephir_concat_self_str(&regexHostName, SL("$#i"));
@@ -1759,7 +1740,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 			}
 			ZEPHIR_CALL_METHOD(&pattern, &route, "getcompiledpattern", NULL, 0);
 			zephir_check_call_status();
-			if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 761)) {
+			if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 822)) {
 				ZEPHIR_INIT_NVAR(&routeFound);
 				zephir_preg_match(&routeFound, &pattern, &handledUri, &matches, 0, 0 , 0 );
 			} else {
@@ -1777,7 +1758,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 				zephir_check_call_status();
 				if (Z_TYPE_P(&beforeMatch) != IS_NULL) {
 					if (UNEXPECTED(!(zephir_is_callable(&beforeMatch)))) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 784);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 844);
 						return;
 					}
 					ZEPHIR_INIT_NVAR(&_21$$28);
@@ -1804,7 +1785,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 				if (Z_TYPE_P(&matches) == IS_ARRAY) {
 					ZEPHIR_CALL_METHOD(&converters, &route, "getconverters", NULL, 0);
 					zephir_check_call_status();
-					zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 876);
+					zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 936);
 					if (Z_TYPE_P(&paths) == IS_ARRAY) {
 						ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _26$$33, _27$$33, _24$$33)
 						{
@@ -1823,7 +1804,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 								ZEPHIR_CONCAT_SV(&_29$$35, "Wrong key in paths: ", &part);
 								ZEPHIR_CALL_METHOD(NULL, &_28$$35, "__construct", &_30, 29, &_29$$35);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_28$$35, "phalcon/Mvc/Router.zep", 824);
+								zephir_throw_exception_debug(&_28$$35, "phalcon/Mvc/Router.zep", 884);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -1889,7 +1870,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 									ZEPHIR_CONCAT_SV(&_37$$46, "Wrong key in paths: ", &part);
 									ZEPHIR_CALL_METHOD(NULL, &_36$$46, "__construct", &_30, 29, &_37$$46);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_36$$46, "phalcon/Mvc/Router.zep", 824);
+									zephir_throw_exception_debug(&_36$$46, "phalcon/Mvc/Router.zep", 884);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -1967,8 +1948,8 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (Z_TYPE_P(&request) == IS_NULL) {
 						zephir_read_property(&_43$$58, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 						ZEPHIR_CPY_WRT(&container, &_43$$58);
-						if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 676);
+						if (Z_TYPE_P(&container) == IS_NULL) {
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 739);
 							return;
 						}
 						ZEPHIR_INIT_NVAR(&_45$$58);
@@ -1990,8 +1971,8 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (Z_TYPE_P(&request) == IS_NULL) {
 						zephir_read_property(&_48$$62, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 						ZEPHIR_CPY_WRT(&container, &_48$$62);
-						if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 705);
+						if (Z_TYPE_P(&container) == IS_NULL) {
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 766);
 							return;
 						}
 						ZEPHIR_INIT_NVAR(&_50$$62);
@@ -2007,11 +1988,11 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (!(zephir_is_true(&currentHostName))) {
 						continue;
 					}
-					if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 729)) {
-						if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 730))) {
+					if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 790)) {
+						if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 791))) {
 							ZEPHIR_INIT_NVAR(&regexHostName);
 							ZEPHIR_CONCAT_SV(&regexHostName, "#^", &hostname);
-							if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 733))) {
+							if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 794))) {
 								zephir_concat_self_str(&regexHostName, SL("(:[[:digit:]]+)?"));
 							}
 							zephir_concat_self_str(&regexHostName, SL("$#i"));
@@ -2037,7 +2018,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 				}
 				ZEPHIR_CALL_METHOD(&pattern, &route, "getcompiledpattern", NULL, 0);
 				zephir_check_call_status();
-				if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 761)) {
+				if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 822)) {
 					ZEPHIR_INIT_NVAR(&routeFound);
 					zephir_preg_match(&routeFound, &pattern, &handledUri, &matches, 0, 0 , 0 );
 				} else {
@@ -2055,7 +2036,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 					zephir_check_call_status();
 					if (Z_TYPE_P(&beforeMatch) != IS_NULL) {
 						if (UNEXPECTED(!(zephir_is_callable(&beforeMatch)))) {
-							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 784);
+							ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 844);
 							return;
 						}
 						ZEPHIR_INIT_NVAR(&_56$$77);
@@ -2082,7 +2063,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 					if (Z_TYPE_P(&matches) == IS_ARRAY) {
 						ZEPHIR_CALL_METHOD(&converters, &route, "getconverters", NULL, 0);
 						zephir_check_call_status();
-						zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 876);
+						zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 936);
 						if (Z_TYPE_P(&paths) == IS_ARRAY) {
 							ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _61$$82, _62$$82, _59$$82)
 							{
@@ -2101,7 +2082,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 									ZEPHIR_CONCAT_SV(&_64$$84, "Wrong key in paths: ", &part);
 									ZEPHIR_CALL_METHOD(NULL, &_63$$84, "__construct", &_30, 29, &_64$$84);
 									zephir_check_call_status();
-									zephir_throw_exception_debug(&_63$$84, "phalcon/Mvc/Router.zep", 824);
+									zephir_throw_exception_debug(&_63$$84, "phalcon/Mvc/Router.zep", 884);
 									ZEPHIR_MM_RESTORE();
 									return;
 								}
@@ -2167,7 +2148,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle)
 										ZEPHIR_CONCAT_SV(&_71$$95, "Wrong key in paths: ", &part);
 										ZEPHIR_CALL_METHOD(NULL, &_70$$95, "__construct", &_30, 29, &_71$$95);
 										zephir_check_call_status();
-										zephir_throw_exception_debug(&_70$$95, "phalcon/Mvc/Router.zep", 824);
+										zephir_throw_exception_debug(&_70$$95, "phalcon/Mvc/Router.zep", 884);
 										ZEPHIR_MM_RESTORE();
 										return;
 									}
@@ -2374,13 +2355,13 @@ PHP_METHOD(Phalcon_Mvc_Router, mount)
 	ZEPHIR_CALL_METHOD(&groupRoutes, group, "getroutes", NULL, 0);
 	zephir_check_call_status();
 	if (UNEXPECTED(!(zephir_fast_count_int(&groupRoutes)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/Mvc/Router.zep", 1009);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/Mvc/Router.zep", 1069);
 		return;
 	}
 	ZEPHIR_CALL_METHOD(&beforeMatch, group, "getbeforematch", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&beforeMatch) != IS_NULL) {
-		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1021);
+		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1081);
 		if (Z_TYPE_P(&groupRoutes) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&groupRoutes), _2$$5)
 			{
@@ -2411,7 +2392,7 @@ PHP_METHOD(Phalcon_Mvc_Router, mount)
 	ZEPHIR_CALL_METHOD(&hostname, group, "gethostname", NULL, 0);
 	zephir_check_call_status();
 	if (Z_TYPE_P(&hostname) != IS_NULL) {
-		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1030);
+		zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1090);
 		if (Z_TYPE_P(&groupRoutes) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&groupRoutes), _4$$8)
 			{
@@ -2478,7 +2459,7 @@ PHP_METHOD(Phalcon_Mvc_Router, notFound)
 		_0 = Z_TYPE_P(paths) != IS_STRING;
 	}
 	if (UNEXPECTED(_0)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/Mvc/Router.zep", 1052);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/Mvc/Router.zep", 1112);
 		return;
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("notFoundPaths"), paths);
@@ -2750,63 +2731,90 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaults)
 }
 
 /**
- * Returns an array of default parameters
+ * Sets the events manager
+ *
+ * @param ManagerInterface eventsManager
+ *
+ * @return void
  */
-PHP_METHOD(Phalcon_Mvc_Router, getDefaults)
+PHP_METHOD(Phalcon_Mvc_Router, setEventsManager)
+{
+	zval *eventsManager, eventsManager_sub;
+	zval *this_ptr = getThis();
+
+	ZVAL_UNDEF(&eventsManager_sub);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	zephir_fetch_params_without_memory_grow(1, 0, &eventsManager);
+
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("eventsManager"), eventsManager);
+}
+
+/**
+ * @param array $routeNames
+ *
+ * @return Router
+ */
+PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames)
 {
-	zval _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *routeNames_param = NULL;
+	zval routeNames;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&routeNames);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_ARRAY(routeNames)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
 
 
 	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &routeNames_param);
+	zephir_get_arrval(&routeNames, routeNames_param);
 
-	zephir_create_array(return_value, 5, 0);
-	ZEPHIR_OBS_VAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultNamespace"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("namespace"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("module"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultController"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("controller"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultAction"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("action"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_OBS_NVAR(&_0);
-	zephir_read_property(&_0, this_ptr, ZEND_STRL("defaultParams"), PH_NOISY_CC);
-	zephir_array_update_string(return_value, SL("params"), &_0, PH_COPY | PH_SEPARATE);
-	RETURN_MM();
+
+	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteNames"), &routeNames);
+	RETURN_THIS();
 }
 
 /**
- * Sets the events manager
- *
- * @param ManagerInterface eventsManager
+ * @param array $routeIds
  *
- * @return void
+ * @return Router
  */
-PHP_METHOD(Phalcon_Mvc_Router, setEventsManager)
+PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds)
 {
-	zval *eventsManager, eventsManager_sub;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *routeIds_param = NULL;
+	zval routeIds;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&eventsManager_sub);
+	ZVAL_UNDEF(&routeIds);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_OBJECT_OF_CLASS(eventsManager, phalcon_events_managerinterface_ce)
+		Z_PARAM_ARRAY(routeIds)
 	ZEND_PARSE_PARAMETERS_END();
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &eventsManager);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &routeIds_param);
+	zephir_get_arrval(&routeIds, routeIds_param);
 
 
-	zephir_update_property_zval(this_ptr, ZEND_STRL("eventsManager"), eventsManager);
+	zephir_update_property_zval(this_ptr, ZEND_STRL("keyRouteIds"), &routeIds);
+	RETURN_THIS();
 }
 
 /**
diff --git a/ext/phalcon/mvc/router.zep.h b/ext/phalcon/mvc/router.zep.h
index eae7b5e5b58..ffe5d07e9a9 100644
--- a/ext/phalcon/mvc/router.zep.h
+++ b/ext/phalcon/mvc/router.zep.h
@@ -3,10 +3,6 @@ extern zend_class_entry *phalcon_mvc_router_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router);
 
-PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames);
-PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames);
-PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds);
-PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds);
 PHP_METHOD(Phalcon_Mvc_Router, __construct);
 PHP_METHOD(Phalcon_Mvc_Router, add);
 PHP_METHOD(Phalcon_Mvc_Router, addConnect);
@@ -24,6 +20,9 @@ PHP_METHOD(Phalcon_Mvc_Router, clear);
 PHP_METHOD(Phalcon_Mvc_Router, getEventsManager);
 PHP_METHOD(Phalcon_Mvc_Router, getActionName);
 PHP_METHOD(Phalcon_Mvc_Router, getControllerName);
+PHP_METHOD(Phalcon_Mvc_Router, getDefaults);
+PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteNames);
+PHP_METHOD(Phalcon_Mvc_Router, getKeyRouteIds);
 PHP_METHOD(Phalcon_Mvc_Router, getMatchedRoute);
 PHP_METHOD(Phalcon_Mvc_Router, getMatches);
 PHP_METHOD(Phalcon_Mvc_Router, getModuleName);
@@ -42,25 +41,12 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaultController);
 PHP_METHOD(Phalcon_Mvc_Router, setDefaultModule);
 PHP_METHOD(Phalcon_Mvc_Router, setDefaultNamespace);
 PHP_METHOD(Phalcon_Mvc_Router, setDefaults);
-PHP_METHOD(Phalcon_Mvc_Router, getDefaults);
 PHP_METHOD(Phalcon_Mvc_Router, setEventsManager);
+PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteNames);
+PHP_METHOD(Phalcon_Mvc_Router, setKeyRouteIds);
 PHP_METHOD(Phalcon_Mvc_Router, wasMatched);
 zend_object *zephir_init_properties_Phalcon_Mvc_Router(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyroutenames, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_setkeyroutenames, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, keyRouteNames, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyrouteids, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_setkeyrouteids, 0, 0, 1)
-	ZEND_ARG_ARRAY_INFO(0, keyRouteIds, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, defaultRoutes, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -149,6 +135,15 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getcontrollername, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getdefaults, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyroutenames, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getkeyrouteids, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_getmatchedroute, 0, 0, Phalcon\\Mvc\\Router\\RouteInterface, 1)
 ZEND_END_ARG_INFO()
 
@@ -215,14 +210,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_setdefaults, 0
 	ZEND_ARG_ARRAY_INFO(0, defaults, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_getdefaults, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_seteventsmanager, 0, 1, IS_VOID, 0)
 
 	ZEND_ARG_OBJ_INFO(0, eventsManager, Phalcon\\Events\\ManagerInterface, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_setkeyroutenames, 0, 1, Phalcon\\Mvc\\Router, 0)
+	ZEND_ARG_ARRAY_INFO(0, routeNames, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_router_setkeyrouteids, 0, 1, Phalcon\\Mvc\\Router, 0)
+	ZEND_ARG_ARRAY_INFO(0, routeIds, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_wasmatched, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
@@ -230,10 +230,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_zephir_init_properties_phalcon
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_router_method_entry) {
-	PHP_ME(Phalcon_Mvc_Router, getKeyRouteNames, arginfo_phalcon_mvc_router_getkeyroutenames, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, setKeyRouteNames, arginfo_phalcon_mvc_router_setkeyroutenames, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, getKeyRouteIds, arginfo_phalcon_mvc_router_getkeyrouteids, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, setKeyRouteIds, arginfo_phalcon_mvc_router_setkeyrouteids, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, __construct, arginfo_phalcon_mvc_router___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Router, add, arginfo_phalcon_mvc_router_add, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, addConnect, arginfo_phalcon_mvc_router_addconnect, ZEND_ACC_PUBLIC)
@@ -251,6 +247,9 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_router_method_entry) {
 	PHP_ME(Phalcon_Mvc_Router, getEventsManager, arginfo_phalcon_mvc_router_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getActionName, arginfo_phalcon_mvc_router_getactionname, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getControllerName, arginfo_phalcon_mvc_router_getcontrollername, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, getDefaults, arginfo_phalcon_mvc_router_getdefaults, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, getKeyRouteNames, arginfo_phalcon_mvc_router_getkeyroutenames, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, getKeyRouteIds, arginfo_phalcon_mvc_router_getkeyrouteids, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getMatchedRoute, arginfo_phalcon_mvc_router_getmatchedroute, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getMatches, arginfo_phalcon_mvc_router_getmatches, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, getModuleName, arginfo_phalcon_mvc_router_getmodulename, ZEND_ACC_PUBLIC)
@@ -269,8 +268,9 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_router_method_entry) {
 	PHP_ME(Phalcon_Mvc_Router, setDefaultModule, arginfo_phalcon_mvc_router_setdefaultmodule, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, setDefaultNamespace, arginfo_phalcon_mvc_router_setdefaultnamespace, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, setDefaults, arginfo_phalcon_mvc_router_setdefaults, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_Router, getDefaults, arginfo_phalcon_mvc_router_getdefaults, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, setEventsManager, arginfo_phalcon_mvc_router_seteventsmanager, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, setKeyRouteNames, arginfo_phalcon_mvc_router_setkeyroutenames, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router, setKeyRouteIds, arginfo_phalcon_mvc_router_setkeyrouteids, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router, wasMatched, arginfo_phalcon_mvc_router_wasmatched, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c
index 14cc40cd0b5..9c880ac0874 100644
--- a/ext/phalcon/mvc/router/annotations.zep.c
+++ b/ext/phalcon/mvc/router/annotations.zep.c
@@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle)
 				object_init_ex(&route, phalcon_mvc_router_route_ce);
 				ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 97, &prefix);
 				zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 488);
+				ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 484);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_7$$6);
 				ZVAL_STRING(&_7$$6, "$#");
@@ -556,7 +556,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle)
 					object_init_ex(&route, phalcon_mvc_router_route_ce);
 					ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 97, &prefix);
 					zephir_check_call_status();
-					ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 488);
+					ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 484);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_29$$29);
 					ZVAL_STRING(&_29$$29, "$#");
diff --git a/ext/phalcon/mvc/router/group.zep.c b/ext/phalcon/mvc/router/group.zep.c
index a137696a87d..25e2642ecb2 100644
--- a/ext/phalcon/mvc/router/group.zep.c
+++ b/ext/phalcon/mvc/router/group.zep.c
@@ -1104,7 +1104,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Group, addRoute)
 	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 97, &_2, &mergedPaths, httpMethods);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("routes"), &route);
-	ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 489, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 485, this_ptr);
 	zephir_check_call_status();
 	RETURN_CCTOR(&route);
 }
diff --git a/ext/phalcon/mvc/router/route.zep.c b/ext/phalcon/mvc/router/route.zep.c
index 366292e843e..e039745abfd 100644
--- a/ext/phalcon/mvc/router/route.zep.c
+++ b/ext/phalcon/mvc/router/route.zep.c
@@ -12,8 +12,8 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/fcall.h"
+#include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/operators.h"
 #include "ext/spl/spl_exceptions.h"
@@ -94,17 +94,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Route)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Mvc_Router_Route, getId)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "id");
-}
-
 /**
  * Phalcon\Mvc\Router\Route constructor
  */
@@ -694,6 +683,18 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getHostname)
 	RETURN_MEMBER(getThis(), "hostname");
 }
 
+/**
+ * @return string | null
+ */
+PHP_METHOD(Phalcon_Mvc_Router_Route, getId)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "id");
+}
+
 /**
  * Returns the 'match' callback if any
  */
@@ -830,23 +831,23 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths)
 			_0$$4 = zephir_fast_count_int(&parts);
 			if (_0$$4 == 3) {
 				ZEPHIR_OBS_NVAR(&moduleName);
-				zephir_array_fetch_long(&moduleName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 459);
+				zephir_array_fetch_long(&moduleName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 467);
 				ZEPHIR_OBS_NVAR(&controllerName);
-				zephir_array_fetch_long(&controllerName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 460);
+				zephir_array_fetch_long(&controllerName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 468);
 				ZEPHIR_OBS_NVAR(&actionName);
-				zephir_array_fetch_long(&actionName, &parts, 2, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 461);
+				zephir_array_fetch_long(&actionName, &parts, 2, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 469);
 				break;
 			}
 			if (_0$$4 == 2) {
 				ZEPHIR_OBS_NVAR(&controllerName);
-				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 465);
+				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 473);
 				ZEPHIR_OBS_NVAR(&actionName);
-				zephir_array_fetch_long(&actionName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 466);
+				zephir_array_fetch_long(&actionName, &parts, 1, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 474);
 				break;
 			}
 			if (_0$$4 == 1) {
 				ZEPHIR_OBS_NVAR(&controllerName);
-				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 470);
+				zephir_array_fetch_long(&controllerName, &parts, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 478);
 				break;
 			}
 		} while(0);
@@ -857,7 +858,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths)
 			zephir_array_update_string(&routePaths, SL("module"), &moduleName, PH_COPY | PH_SEPARATE);
 		}
 		if (Z_TYPE_P(&controllerName) != IS_NULL) {
-			if (zephir_memnstr_str(&controllerName, SL("\\"), "phalcon/Mvc/Router/Route.zep", 484)) {
+			if (zephir_memnstr_str(&controllerName, SL("\\"), "phalcon/Mvc/Router/Route.zep", 492)) {
 				ZEPHIR_INIT_VAR(&realClassName);
 				zephir_get_class_ns(&realClassName, &controllerName, 0);
 				ZEPHIR_INIT_VAR(&namespaceName);
@@ -877,7 +878,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths)
 		ZEPHIR_CPY_WRT(&routePaths, paths);
 	}
 	if (UNEXPECTED(Z_TYPE_P(&routePaths) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The route contains invalid paths", "phalcon/Mvc/Router/Route.zep", 511);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The route contains invalid paths", "phalcon/Mvc/Router/Route.zep", 519);
 		return;
 	}
 	RETURN_CCTOR(&routePaths);
@@ -968,13 +969,13 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, reConfigure)
 	ZEPHIR_CALL_SELF(&routePaths, "getroutepaths", NULL, 0, paths);
 	zephir_check_call_status();
 	if (!(zephir_start_with_str(&pattern, SL("#")))) {
-		if (zephir_memnstr_str(&pattern, SL("{"), "phalcon/Mvc/Router/Route.zep", 551)) {
+		if (zephir_memnstr_str(&pattern, SL("{"), "phalcon/Mvc/Router/Route.zep", 559)) {
 			ZEPHIR_CALL_METHOD(&extracted, this_ptr, "extractnamedparams", NULL, 0, &pattern);
 			zephir_check_call_status();
 			ZEPHIR_OBS_VAR(&pcrePattern);
-			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 556);
+			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "phalcon/Mvc/Router/Route.zep", 564);
 			ZEPHIR_INIT_VAR(&_0$$4);
-			zephir_array_fetch_long(&_1$$4, &extracted, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router/Route.zep", 557);
+			zephir_array_fetch_long(&_1$$4, &extracted, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Router/Route.zep", 565);
 			zephir_fast_array_merge(&_0$$4, &routePaths, &_1$$4);
 			ZEPHIR_CPY_WRT(&routePaths, &_0$$4);
 		} else {
diff --git a/ext/phalcon/mvc/router/route.zep.h b/ext/phalcon/mvc/router/route.zep.h
index c7755aeb378..e7f56808098 100644
--- a/ext/phalcon/mvc/router/route.zep.h
+++ b/ext/phalcon/mvc/router/route.zep.h
@@ -3,7 +3,6 @@ extern zend_class_entry *phalcon_mvc_router_route_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Route);
 
-PHP_METHOD(Phalcon_Mvc_Router_Route, getId);
 PHP_METHOD(Phalcon_Mvc_Router_Route, __construct);
 PHP_METHOD(Phalcon_Mvc_Router_Route, beforeMatch);
 PHP_METHOD(Phalcon_Mvc_Router_Route, compilePattern);
@@ -15,6 +14,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getConverters);
 PHP_METHOD(Phalcon_Mvc_Router_Route, getGroup);
 PHP_METHOD(Phalcon_Mvc_Router_Route, getHttpMethods);
 PHP_METHOD(Phalcon_Mvc_Router_Route, getHostname);
+PHP_METHOD(Phalcon_Mvc_Router_Route, getId);
 PHP_METHOD(Phalcon_Mvc_Router_Route, getMatch);
 PHP_METHOD(Phalcon_Mvc_Router_Route, getName);
 PHP_METHOD(Phalcon_Mvc_Router_Route, getPaths);
@@ -32,9 +32,6 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, setName);
 PHP_METHOD(Phalcon_Mvc_Router_Route, via);
 zend_object *zephir_init_properties_Phalcon_Mvc_Router_Route(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_getid, 0, 0, IS_STRING, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_INFO(0, paths)
@@ -76,6 +73,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_gethostname, 0, 0, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_getid, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route_getmatch, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -135,7 +135,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route_zephir_init_properties_p
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_router_route_method_entry) {
-	PHP_ME(Phalcon_Mvc_Router_Route, getId, arginfo_phalcon_mvc_router_route_getid, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router_Route, __construct, arginfo_phalcon_mvc_router_route___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_Router_Route, beforeMatch, arginfo_phalcon_mvc_router_route_beforematch, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_Router_Route, compilePattern, arginfo_phalcon_mvc_router_route_compilepattern, ZEND_ACC_PUBLIC)
@@ -155,6 +154,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_router_route_method_entry) {
 	PHP_ME(Phalcon_Mvc_Router_Route, getHttpMethods, NULL, ZEND_ACC_PUBLIC)
 #endif
 	PHP_ME(Phalcon_Mvc_Router_Route, getHostname, arginfo_phalcon_mvc_router_route_gethostname, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_Router_Route, getId, arginfo_phalcon_mvc_router_route_getid, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
 	PHP_ME(Phalcon_Mvc_Router_Route, getMatch, arginfo_phalcon_mvc_router_route_getmatch, ZEND_ACC_PUBLIC)
 #else
diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/mvc/url.zep.c
index 7ea147b1d1d..9cb3ebe8470 100644
--- a/ext/phalcon/mvc/url.zep.c
+++ b/ext/phalcon/mvc/url.zep.c
@@ -309,7 +309,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get)
 		zephir_check_call_status();
 	}
 	if (zephir_is_true(args)) {
-		ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 490, args);
+		ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 486, args);
 		zephir_check_call_status();
 		_20$$16 = Z_TYPE_P(&queryString) == IS_STRING;
 		if (_20$$16) {
@@ -450,21 +450,19 @@ PHP_METHOD(Phalcon_Mvc_Url, getStatic)
  */
 PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri)
 {
-	zval staticBaseUri, _0;
+	zval _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&staticBaseUri);
 	ZVAL_UNDEF(&_0);
 
 
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("staticBaseUri"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_CPY_WRT(&staticBaseUri, &_0);
-	if (Z_TYPE_P(&staticBaseUri) != IS_NULL) {
-		RETURN_CCTOR(&staticBaseUri);
+	if (Z_TYPE_P(&_0) != IS_NULL) {
+		RETURN_MM_MEMBER(getThis(), "staticBaseUri");
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbaseuri", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c
index da9afb8f6b4..a39b724b5e0 100644
--- a/ext/phalcon/mvc/view.zep.c
+++ b/ext/phalcon/mvc/view.zep.c
@@ -191,39 +191,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_View)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "currentRenderLevel");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "registeredEngines");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Mvc_View, getRenderLevel)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "renderLevel");
-}
-
 /**
  * Phalcon\Mvc\View constructor
  */
@@ -555,7 +522,7 @@ PHP_METHOD(Phalcon_Mvc_View, finish)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 	zephir_check_call_status();
 	RETURN_THIS();
 }
@@ -648,6 +615,42 @@ PHP_METHOD(Phalcon_Mvc_View, getControllerName)
 	RETURN_MEMBER(getThis(), "controllerName");
 }
 
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "currentRenderLevel");
+}
+
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "registeredEngines");
+}
+
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Mvc_View, getRenderLevel)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "renderLevel");
+}
+
 /**
  * Returns the internal event manager
  */
@@ -1033,14 +1036,14 @@ PHP_METHOD(Phalcon_Mvc_View, has)
 	}
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "getviewsdirs", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&_2, 0, "phalcon/Mvc/View.zep", 573);
+	zephir_is_iterable(&_2, 0, "phalcon/Mvc/View.zep", 597);
 	if (Z_TYPE_P(&_2) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3)
 		{
 			ZEPHIR_INIT_NVAR(&viewsDir);
 			ZVAL_COPY(&viewsDir, _3);
 			ZEPHIR_INIT_NVAR(&_5$$4);
-			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 571);
+			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 595);
 			if (Z_TYPE_P(&engines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _8$$4, _9$$4, _6$$4)
 				{
@@ -1095,7 +1098,7 @@ PHP_METHOD(Phalcon_Mvc_View, has)
 			ZEPHIR_CALL_METHOD(&viewsDir, &_2, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&_12$$9);
-				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 571);
+				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 595);
 				if (Z_TYPE_P(&engines) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _15$$9, _16$$9, _13$$9)
 					{
@@ -1293,18 +1296,18 @@ PHP_METHOD(Phalcon_Mvc_View, pick)
 	} else {
 		ZEPHIR_INIT_VAR(&layout);
 		ZVAL_NULL(&layout);
-		if (zephir_memnstr_str(renderView, SL("/"), "phalcon/Mvc/View.zep", 675)) {
+		if (zephir_memnstr_str(renderView, SL("/"), "phalcon/Mvc/View.zep", 699)) {
 			ZEPHIR_INIT_VAR(&parts);
 			zephir_fast_explode_str(&parts, SL("/"), renderView, LONG_MAX);
 			ZEPHIR_OBS_NVAR(&layout);
-			zephir_array_fetch_long(&layout, &parts, 0, PH_NOISY, "phalcon/Mvc/View.zep", 677);
+			zephir_array_fetch_long(&layout, &parts, 0, PH_NOISY, "phalcon/Mvc/View.zep", 701);
 		}
 		ZEPHIR_INIT_VAR(&_0$$4);
 		zephir_create_array(&_0$$4, 1, 0);
 		zephir_array_fast_append(&_0$$4, renderView);
 		ZEPHIR_CPY_WRT(&pickView, &_0$$4);
 		if (Z_TYPE_P(&layout) != IS_NULL) {
-			zephir_array_append(&pickView, &layout, PH_SEPARATE, "phalcon/Mvc/View.zep", 683);
+			zephir_array_append(&pickView, &layout, PH_SEPARATE, "phalcon/Mvc/View.zep", 707);
 		}
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("pickView"), &pickView);
@@ -1963,17 +1966,17 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir)
 		_0 = Z_TYPE_P(viewsDir) != IS_ARRAY;
 	}
 	if (_0) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory must be a string or an array", "phalcon/Mvc/View.zep", 956);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory must be a string or an array", "phalcon/Mvc/View.zep", 980);
 		return;
 	}
 	if (Z_TYPE_P(viewsDir) == IS_STRING) {
-		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 492, viewsDir);
+		ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 488, viewsDir);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDirs"), &_1$$4);
 	} else {
 		ZEPHIR_INIT_VAR(&newViewsDir);
 		array_init(&newViewsDir);
-		zephir_is_iterable(viewsDir, 0, "phalcon/Mvc/View.zep", 974);
+		zephir_is_iterable(viewsDir, 0, "phalcon/Mvc/View.zep", 998);
 		if (Z_TYPE_P(viewsDir) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(viewsDir), _4$$5, _5$$5, _2$$5)
 			{
@@ -1986,10 +1989,10 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir)
 				ZEPHIR_INIT_NVAR(&directory);
 				ZVAL_COPY(&directory, _2$$5);
 				if (Z_TYPE_P(&directory) != IS_STRING) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 968);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 992);
 					return;
 				}
-				ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 492, &directory);
+				ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 488, &directory);
 				zephir_check_call_status();
 				zephir_array_update_zval(&newViewsDir, &position, &_6$$6, PH_COPY | PH_SEPARATE);
 			} ZEND_HASH_FOREACH_END();
@@ -2007,10 +2010,10 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir)
 				ZEPHIR_CALL_METHOD(&directory, viewsDir, "current", NULL, 0);
 				zephir_check_call_status();
 					if (Z_TYPE_P(&directory) != IS_STRING) {
-						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 968);
+						ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 992);
 						return;
 					}
-					ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 492, &directory);
+					ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 488, &directory);
 					zephir_check_call_status();
 					zephir_array_update_zval(&newViewsDir, &position, &_7$$8, PH_COPY | PH_SEPARATE);
 				ZEPHIR_CALL_METHOD(NULL, viewsDir, "next", NULL, 0);
@@ -2207,13 +2210,13 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 	array_init(&viewEnginePaths);
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "getviewsdirs", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&_1, 0, "phalcon/Mvc/View.zep", 1080);
+	zephir_is_iterable(&_1, 0, "phalcon/Mvc/View.zep", 1104);
 	if (Z_TYPE_P(&_1) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1), _2)
 		{
 			ZEPHIR_INIT_NVAR(&viewsDir);
 			ZVAL_COPY(&viewsDir, _2);
-			ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 493, &viewPath);
+			ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 489, &viewPath);
 			zephir_check_call_status();
 			if (!(zephir_is_true(&_4$$3))) {
 				ZEPHIR_INIT_NVAR(&viewsDirPath);
@@ -2221,7 +2224,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 			} else {
 				ZEPHIR_CPY_WRT(&viewsDirPath, &viewPath);
 			}
-			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1075);
+			zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1099);
 			if (Z_TYPE_P(&engines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _8$$3, _9$$3, _6$$3)
 				{
@@ -2264,7 +2267,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 						}
 						RETURN_MM_NULL();
 					}
-					zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+					zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 				} ZEND_HASH_FOREACH_END();
 			} else {
 				ZEPHIR_CALL_METHOD(NULL, &engines, "rewind", NULL, 0);
@@ -2310,7 +2313,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 							}
 							RETURN_MM_NULL();
 						}
-						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 					ZEPHIR_CALL_METHOD(NULL, &engines, "next", NULL, 0);
 					zephir_check_call_status();
 				}
@@ -2329,7 +2332,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 			}
 			ZEPHIR_CALL_METHOD(&viewsDir, &_1, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 493, &viewPath);
+				ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 489, &viewPath);
 				zephir_check_call_status();
 				if (!(zephir_is_true(&_24$$16))) {
 					ZEPHIR_INIT_NVAR(&viewsDirPath);
@@ -2337,7 +2340,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 				} else {
 					ZEPHIR_CPY_WRT(&viewsDirPath, &viewPath);
 				}
-				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1075);
+				zephir_is_iterable(&engines, 0, "phalcon/Mvc/View.zep", 1099);
 				if (Z_TYPE_P(&engines) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _27$$16, _28$$16, _25$$16)
 					{
@@ -2380,7 +2383,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 							}
 							RETURN_MM_NULL();
 						}
-						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+						zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 					} ZEND_HASH_FOREACH_END();
 				} else {
 					ZEPHIR_CALL_METHOD(NULL, &engines, "rewind", NULL, 0);
@@ -2426,7 +2429,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 								}
 								RETURN_MM_NULL();
 							}
-							zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1073);
+							zephir_array_append(&viewEnginePaths, &viewEnginePath, PH_SEPARATE, "phalcon/Mvc/View.zep", 1097);
 						ZEPHIR_CALL_METHOD(NULL, &engines, "next", NULL, 0);
 						zephir_check_call_status();
 					}
@@ -2452,7 +2455,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender)
 		ZEPHIR_CONCAT_SVS(&_45$$30, "View '", &viewPath, "' was not found in any of the views directory");
 		ZEPHIR_CALL_METHOD(NULL, &_44$$30, "__construct", NULL, 29, &_45$$30);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_44$$30, "phalcon/Mvc/View.zep", 1089);
+		zephir_throw_exception_debug(&_44$$30, "phalcon/Mvc/View.zep", 1113);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -2488,7 +2491,7 @@ PHP_METHOD(Phalcon_Mvc_View, isAbsolutePath)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "PHP_OS");
-	if (ZEPHIR_IS_STRING(&_0, "WINNT")) {
+	if (ZEPHIR_IS_STRING_IDENTICAL(&_0, "WINNT")) {
 		_1$$3 = zephir_fast_strlen_ev(&path) >= 3;
 		if (_1$$3) {
 			_2$$3 = ZEPHIR_STRING_OFFSET(&path, 1);
@@ -2560,15 +2563,15 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines)
 		if (ZEPHIR_IS_EMPTY(&registeredEngines)) {
 			ZEPHIR_INIT_VAR(&_2$$4);
 			object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce);
-			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 494, this_ptr, &di);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 490, this_ptr, &di);
 			zephir_check_call_status();
 			zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE);
 		} else {
 			if (Z_TYPE_P(&di) != IS_OBJECT) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access application services", "phalcon/Mvc/View.zep", 1132);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access application services", "phalcon/Mvc/View.zep", 1156);
 				return;
 			}
-			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View.zep", 1169);
+			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View.zep", 1193);
 			if (Z_TYPE_P(&registeredEngines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&registeredEngines), _5$$5, _6$$5, _3$$5)
 				{
@@ -2600,7 +2603,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines)
 							ZEPHIR_CONCAT_SV(&_12$$12, "Invalid template engine registration for extension: ", &extension);
 							ZEPHIR_CALL_METHOD(NULL, &_11$$12, "__construct", &_13, 29, &_12$$12);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_11$$12, "phalcon/Mvc/View.zep", 1160);
+							zephir_throw_exception_debug(&_11$$12, "phalcon/Mvc/View.zep", 1184);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -2645,7 +2648,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines)
 								ZEPHIR_CONCAT_SV(&_19$$18, "Invalid template engine registration for extension: ", &extension);
 								ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_13, 29, &_19$$18);
 								zephir_check_call_status();
-								zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View.zep", 1160);
+								zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View.zep", 1184);
 								ZEPHIR_MM_RESTORE();
 								return;
 							}
@@ -2775,7 +2778,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("currentRenderLevel"), &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("disabled"), PH_NOISY_CC | PH_READONLY);
 	if (!ZEPHIR_IS_FALSE_IDENTICAL(&_0)) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 495);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 491);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_1$$3);
 		RETURN_MM_BOOL(0);
@@ -2807,7 +2810,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender)
 		ZEPHIR_CPY_WRT(&renderView, &_3$$7);
 	} else {
 		ZEPHIR_OBS_NVAR(&renderView);
-		zephir_array_fetch_long(&renderView, &pickView, 0, PH_NOISY, "phalcon/Mvc/View.zep", 1247);
+		zephir_array_fetch_long(&renderView, &pickView, 0, PH_NOISY, "phalcon/Mvc/View.zep", 1271);
 		if (Z_TYPE_P(&layoutName) == IS_NULL) {
 			ZEPHIR_OBS_VAR(&pickViewAction);
 			if (zephir_array_isset_long_fetch(&pickViewAction, &pickView, 1, 0)) {
@@ -2833,7 +2836,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender)
 			RETURN_MM_BOOL(0);
 		}
 	}
-	ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 495);
+	ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 491);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_8);
 	silence = 1;
@@ -2865,7 +2868,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender)
 				zephir_read_property(&_11$$17, this_ptr, ZEND_STRL("templatesBefore"), PH_NOISY_CC | PH_READONLY);
 				ZEPHIR_CPY_WRT(&templatesBefore, &_11$$17);
 				silence = 0;
-				zephir_is_iterable(&templatesBefore, 0, "phalcon/Mvc/View.zep", 1323);
+				zephir_is_iterable(&templatesBefore, 0, "phalcon/Mvc/View.zep", 1347);
 				if (Z_TYPE_P(&templatesBefore) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&templatesBefore), _12$$17)
 					{
@@ -2933,7 +2936,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender)
 				zephir_read_property(&_20$$23, this_ptr, ZEND_STRL("templatesAfter"), PH_NOISY_CC | PH_READONLY);
 				ZEPHIR_CPY_WRT(&templatesAfter, &_20$$23);
 				silence = 0;
-				zephir_is_iterable(&templatesAfter, 0, "phalcon/Mvc/View.zep", 1359);
+				zephir_is_iterable(&templatesAfter, 0, "phalcon/Mvc/View.zep", 1383);
 				if (Z_TYPE_P(&templatesAfter) == IS_ARRAY) {
 					ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&templatesAfter), _21$$23)
 					{
diff --git a/ext/phalcon/mvc/view.zep.h b/ext/phalcon/mvc/view.zep.h
index 444e98f125b..e5e8ac1489a 100644
--- a/ext/phalcon/mvc/view.zep.h
+++ b/ext/phalcon/mvc/view.zep.h
@@ -3,9 +3,6 @@ extern zend_class_entry *phalcon_mvc_view_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_View);
 
-PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel);
-PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines);
-PHP_METHOD(Phalcon_Mvc_View, getRenderLevel);
 PHP_METHOD(Phalcon_Mvc_View, __construct);
 PHP_METHOD(Phalcon_Mvc_View, __get);
 PHP_METHOD(Phalcon_Mvc_View, __isset);
@@ -22,6 +19,9 @@ PHP_METHOD(Phalcon_Mvc_View, getActiveRenderPath);
 PHP_METHOD(Phalcon_Mvc_View, getBasePath);
 PHP_METHOD(Phalcon_Mvc_View, getContent);
 PHP_METHOD(Phalcon_Mvc_View, getControllerName);
+PHP_METHOD(Phalcon_Mvc_View, getCurrentRenderLevel);
+PHP_METHOD(Phalcon_Mvc_View, getRegisteredEngines);
+PHP_METHOD(Phalcon_Mvc_View, getRenderLevel);
 PHP_METHOD(Phalcon_Mvc_View, getEventsManager);
 PHP_METHOD(Phalcon_Mvc_View, getLayout);
 PHP_METHOD(Phalcon_Mvc_View, getLayoutsDir);
@@ -63,15 +63,6 @@ PHP_METHOD(Phalcon_Mvc_View, processRender);
 PHP_METHOD(Phalcon_Mvc_View, getDirSeparator);
 zend_object *zephir_init_properties_Phalcon_Mvc_View(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getcurrentrenderlevel, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getregisteredengines, 0, 0, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getrenderlevel, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
@@ -131,6 +122,15 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getcontrollername, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getcurrentrenderlevel, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getregisteredengines, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_getrenderlevel, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_view_geteventsmanager, 0, 0, Phalcon\\Events\\ManagerInterface, 1)
 ZEND_END_ARG_INFO()
 
@@ -314,9 +314,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_zephir_init_properties_phalcon_m
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_view_method_entry) {
-	PHP_ME(Phalcon_Mvc_View, getCurrentRenderLevel, arginfo_phalcon_mvc_view_getcurrentrenderlevel, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_View, getRegisteredEngines, arginfo_phalcon_mvc_view_getregisteredengines, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Mvc_View, getRenderLevel, arginfo_phalcon_mvc_view_getrenderlevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, __construct, arginfo_phalcon_mvc_view___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_View, __get, arginfo_phalcon_mvc_view___get, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, __isset, arginfo_phalcon_mvc_view___isset, ZEND_ACC_PUBLIC)
@@ -337,6 +334,9 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_view_method_entry) {
 	PHP_ME(Phalcon_Mvc_View, getBasePath, arginfo_phalcon_mvc_view_getbasepath, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getContent, arginfo_phalcon_mvc_view_getcontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getControllerName, arginfo_phalcon_mvc_view_getcontrollername, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View, getCurrentRenderLevel, arginfo_phalcon_mvc_view_getcurrentrenderlevel, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View, getRegisteredEngines, arginfo_phalcon_mvc_view_getregisteredengines, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View, getRenderLevel, arginfo_phalcon_mvc_view_getrenderlevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getEventsManager, arginfo_phalcon_mvc_view_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getLayout, arginfo_phalcon_mvc_view_getlayout, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View, getLayoutsDir, arginfo_phalcon_mvc_view_getlayoutsdir, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c
index 018257d5f2f..283eb526ed6 100644
--- a/ext/phalcon/mvc/view/engine/php.zep.c
+++ b/ext/phalcon/mvc/view/engine/php.zep.c
@@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render)
 
 
 	if (mustClean) {
-		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496);
+		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 492);
 		zephir_check_call_status();
 	}
 	if (Z_TYPE_P(params) == IS_ARRAY) {
@@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render)
 	}
 	if (mustClean) {
 		zephir_read_property(&_6$$7, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 495);
+		ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 491);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(NULL, &_6$$7, "setcontent", NULL, 0, &_7$$7);
 		zephir_check_call_status();
diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c
index 9a0b2251184..9c168960539 100644
--- a/ext/phalcon/mvc/view/engine/volt.zep.c
+++ b/ext/phalcon/mvc/view/engine/volt.zep.c
@@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding)
 		_0 = ZEPHIR_IS_STRING_IDENTICAL(&to, "utf8");
 	}
 	if (_0) {
-		ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 497, &text);
+		ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 493, &text);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -236,18 +236,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler)
 		ZEPHIR_INIT_NVAR(&compiler);
 		object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 498, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 494, &_1$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&container, &_2$$3);
 		if (Z_TYPE_P(&container) == IS_OBJECT) {
-			ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 499, &container);
+			ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 495, &container);
 			zephir_check_call_status();
 		}
 		zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&options, &_2$$3);
 		if (Z_TYPE_P(&options) == IS_ARRAY) {
-			ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 500, &options);
+			ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 496, &options);
 			zephir_check_call_status();
 		}
 		zephir_update_property_zval(this_ptr, ZEND_STRL("compiler"), &compiler);
@@ -470,7 +470,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload)
 		zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href);
 		ZEPHIR_INIT_VAR(&_8$$5);
 		ZVAL_STRING(&_8$$5, "preload");
-		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 501, &_8$$5, &_5$$5, &attributes);
+		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 497, &_8$$5, &_5$$5, &attributes);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_8$$5);
 		object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce);
@@ -482,7 +482,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload)
 		ZEPHIR_INIT_VAR(&_10$$5);
 		zephir_create_array(&_10$$5, 1, 0);
 		zephir_array_fast_append(&_10$$5, &link);
-		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 502, &_10$$5);
+		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 498, &_10$$5);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&header);
 		ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5);
@@ -559,7 +559,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render)
 
 
 	if (mustClean) {
-		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496);
+		ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 492);
 		zephir_check_call_status();
 	}
 	ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0);
@@ -635,7 +635,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render)
 	}
 	if (mustClean) {
 		zephir_read_property(&_11$$11, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 495);
+		ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 491);
 		zephir_check_call_status();
 		ZEPHIR_CALL_METHOD(NULL, &_11$$11, "setcontent", NULL, 0, &_12$$11);
 		zephir_check_call_status();
@@ -792,7 +792,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice)
 	}
 	if (Z_TYPE_P(value) == IS_ARRAY) {
 		ZVAL_LONG(&_5$$9, start);
-		ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, value, &_5$$9, &length);
+		ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 499, value, &_5$$9, &length);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -844,7 +844,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort)
 
 
 	ZEPHIR_MAKE_REF(&value);
-	ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 504, &value);
+	ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 500, &value);
 	ZEPHIR_UNREF(&value);
 	zephir_check_call_status();
 	RETURN_CTOR(&value);
diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c
index d43e0503b44..0a1310b3e88 100644
--- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c
+++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c
@@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader)
 			}
 		}
 	} else {
-		ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 505, &left);
+		ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 501, &left);
 		zephir_check_call_status();
 		ZEPHIR_OBS_VAR(&leftType);
 		zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 244);
@@ -407,7 +407,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader)
 		zephir_array_fetch_string(&_11$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 258);
 		zephir_concat_self(&exprCode, &_11$$11);
 	} else {
-		ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 505, &right);
+		ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 501, &right);
 		zephir_check_call_status();
 		zephir_concat_self(&exprCode, &_12$$12);
 	}
@@ -679,7 +679,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compile)
 						object_init_ex(&_17$$35, phalcon_mvc_view_engine_volt_exception_ce);
 						ZEPHIR_INIT_VAR(&_18$$35);
 						ZEPHIR_CONCAT_SVS(&_18$$35, "Extends compilation file ", &compiledTemplatePath, " could not be opened");
-						ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 506, &_18$$35);
+						ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 502, &_18$$35);
 						zephir_check_call_status();
 						zephir_throw_exception_debug(&_17$$35, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 478);
 						ZEPHIR_MM_RESTORE();
@@ -752,7 +752,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape)
 	} else {
 		ZVAL_BOOL(&_1, 0);
 	}
-	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &_0, &_1);
+	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 503, &_0, &_1);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &oldAutoescape);
 	RETURN_CCTOR(&compilation);
@@ -841,13 +841,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase)
 		object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$4);
 		ZVAL_STRING(&_1$$4, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 506, &_1$$4, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 502, &_1$$4, &statement);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 568);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php case ", &_2, ": ?>");
 	RETURN_MM();
@@ -889,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo)
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 592);
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php ", &_0, "; ?>");
 	RETURN_MM();
@@ -941,21 +941,21 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 616);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 624);
 	if (ZEPHIR_IS_LONG(&_2, 350)) {
-		ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 508, &expr);
+		ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 504, &expr);
 		zephir_check_call_status();
 		if (ZEPHIR_IS_TRUE_IDENTICAL(&_3$$4)) {
 			ZVAL_BOOL(&_4$$5, 1);
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr, &_4$$5);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 501, &expr, &_4$$5);
 			zephir_check_call_status();
 		}
 		zephir_array_fetch_string(&name, &expr, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 629);
@@ -1015,13 +1015,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 666);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php } elseif (", &_2, ") { ?>");
 	RETURN_MM();
@@ -1111,7 +1111,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile)
 		object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$4);
 		ZEPHIR_CONCAT_SVS(&_1$$4, "Template file ", &path, " does not exist");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 506, &_1$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 502, &_1$$4);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 706);
 		ZEPHIR_MM_RESTORE();
@@ -1124,7 +1124,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile)
 		object_init_ex(&_2$$5, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_3$$5);
 		ZEPHIR_CONCAT_SVS(&_3$$5, "Template file ", &path, " could not be opened");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 506, &_3$$5);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 502, &_3$$5);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 718);
 		ZEPHIR_MM_RESTORE();
@@ -1248,15 +1248,15 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 	ZEPHIR_INIT_VAR(&prefixLevel);
 	ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level);
 	ZEPHIR_OBS_VAR(&expr);
-	zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 784);
-	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr);
+	zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 782);
+	ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&blockStatements);
-	zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 791);
+	zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 788);
 	ZEPHIR_INIT_NVAR(&forElse);
 	ZVAL_BOOL(&forElse, 0);
 	if (Z_TYPE_P(&blockStatements) == IS_ARRAY) {
-		zephir_is_iterable(&blockStatements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 812);
+		zephir_is_iterable(&blockStatements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 808);
 		if (Z_TYPE_P(&blockStatements) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&blockStatements), _0$$4)
 			{
@@ -1309,7 +1309,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 	} else {
 		ZVAL_BOOL(&_4, 0);
 	}
-	ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 507, &blockStatements, &_4);
+	ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 503, &blockStatements, &_4);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&loopContext);
 	zephir_read_property(&loopContext, this_ptr, ZEND_STRL("loopPointers"), PH_NOISY_CC);
@@ -1347,7 +1347,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 		ZEPHIR_CPY_WRT(&iterator, &exprCode);
 	}
 	ZEPHIR_OBS_VAR(&variable);
-	zephir_array_fetch_string(&variable, &statement, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 843);
+	zephir_array_fetch_string(&variable, &statement, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 838);
 	ZEPHIR_OBS_VAR(&key);
 	if (zephir_array_isset_string_fetch(&key, &statement, SL("key"), 0)) {
 		ZEPHIR_INIT_VAR(&_14$$13);
@@ -1360,7 +1360,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach)
 	}
 	ZEPHIR_OBS_VAR(&ifExpr);
 	if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) {
-		ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 505, &ifExpr);
+		ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 501, &ifExpr);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_17$$15);
 		ZEPHIR_CONCAT_SVS(&_17$$15, "if (", &_16$$15, ") { ?>");
@@ -1502,21 +1502,21 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 946);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 941);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 952);
+	zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 947);
 	if (extendsMode) {
 		ZVAL_BOOL(&_5, 1);
 	} else {
 		ZVAL_BOOL(&_5, 0);
 	}
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 507, &_4, &_5);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 503, &_4, &_5);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_6);
 	ZEPHIR_CONCAT_SVSV(&_6, "<?php if (", &_2, ") { ?>", &_3);
@@ -1528,7 +1528,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf)
 		} else {
 			ZVAL_BOOL(&_8$$4, 0);
 		}
-		ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 507, &blockStatements, &_8$$4);
+		ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 503, &blockStatements, &_8$$4);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_9$$4);
 		ZEPHIR_CONCAT_SV(&_9$$4, "<?php } else { ?>", &_7$$4);
@@ -1580,14 +1580,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude)
 
 	ZEPHIR_OBS_VAR(&pathExpr);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&pathExpr, &statement, SL("path"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 986);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 981);
 		return;
 	}
-	zephir_array_fetch_string(&_0, &pathExpr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 993);
+	zephir_array_fetch_string(&_0, &pathExpr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 988);
 	if (ZEPHIR_IS_LONG(&_0, 260)) {
 		if (!(zephir_array_isset_string(&statement, SL("params")))) {
 			ZEPHIR_OBS_VAR(&path);
-			zephir_array_fetch_string(&path, &pathExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1002);
+			zephir_array_fetch_string(&path, &pathExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 997);
 			ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", NULL, 0, &path);
 			zephir_check_call_status();
 			ZEPHIR_INIT_VAR(&subCompiler);
@@ -1606,14 +1606,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude)
 			RETURN_CCTOR(&compilation);
 		}
 	}
-	ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 505, &pathExpr);
+	ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 501, &pathExpr);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&params);
 	if (!(zephir_array_isset_string_fetch(&params, &statement, SL("params"), 0))) {
 		ZEPHIR_CONCAT_SVS(return_value, "<?php $this->partial(", &path, "); ?>");
 		RETURN_MM();
 	}
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 505, &params);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 501, &params);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVSVS(return_value, "<?php $this->partial(", &path, ", ", &_3, "); ?>");
 	RETURN_MM();
@@ -1692,7 +1692,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 
 	ZEPHIR_OBS_VAR(&name);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&name, &statement, SL("name"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1061);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1056);
 		return;
 	}
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("macros"), PH_NOISY_CC | PH_READONLY);
@@ -1701,9 +1701,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 		object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_2$$4);
 		ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined");
-		ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 506, &_2$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 502, &_2$$4);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1068);
+		zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1063);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -1722,7 +1722,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 		ZEPHIR_INIT_VAR(&_5$$6);
 		ZEPHIR_CONCAT_VS(&_5$$6, &macroName, " = function($__p = null) { ");
 		zephir_concat_self(&code, &_5$$6);
-		zephir_is_iterable(&parameters, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1107);
+		zephir_is_iterable(&parameters, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1100);
 		if (Z_TYPE_P(&parameters) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&parameters), _8$$6, _9$$6, _6$$6)
 			{
@@ -1735,7 +1735,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 				ZEPHIR_INIT_NVAR(&parameter);
 				ZVAL_COPY(&parameter, _6$$6);
 				ZEPHIR_OBS_NVAR(&variableName);
-				zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1089);
+				zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1082);
 				ZEPHIR_INIT_NVAR(&_10$$7);
 				ZEPHIR_CONCAT_SVS(&_10$$7, "if (isset($__p[", &position, "])) { ");
 				zephir_concat_self(&code, &_10$$7);
@@ -1752,7 +1752,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 				zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1);
 				ZEPHIR_OBS_NVAR(&defaultValue);
 				if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, &parameter, SL("default"), 0))) {
-					ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 505, &defaultValue);
+					ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 501, &defaultValue);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_16$$8);
 					ZEPHIR_CONCAT_SVSVS(&_16$$8, "$", &variableName, " = ", &_14$$8, ";");
@@ -1778,7 +1778,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 				ZEPHIR_CALL_METHOD(&parameter, &parameters, "current", NULL, 0);
 				zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&variableName);
-					zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1089);
+					zephir_array_fetch_string(&variableName, &parameter, SL("variable"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1082);
 					ZEPHIR_INIT_NVAR(&_18$$10);
 					ZEPHIR_CONCAT_SVS(&_18$$10, "if (isset($__p[", &position, "])) { ");
 					zephir_concat_self(&code, &_18$$10);
@@ -1795,7 +1795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 					zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1);
 					ZEPHIR_OBS_NVAR(&defaultValue);
 					if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, &parameter, SL("default"), 0))) {
-						ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 505, &defaultValue);
+						ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 501, &defaultValue);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_23$$11);
 						ZEPHIR_CONCAT_SVSVS(&_23$$11, "$", &variableName, " = ", &_22$$11, ";");
@@ -1821,7 +1821,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro)
 		} else {
 			ZVAL_BOOL(&_26$$13, 0);
 		}
-		ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 507, &blockStatements, &_26$$13);
+		ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 503, &blockStatements, &_26$$13);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_27$$13);
 		ZEPHIR_CONCAT_VS(&_27$$13, &_25$$13, "<?php }; ");
@@ -1867,10 +1867,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn)
 
 	ZEPHIR_OBS_VAR(&expr);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&expr, &statement, SL("expr"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1144);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1137);
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_SVS(return_value, "<?php return ", &_0, "; ?>");
 	RETURN_MM();
@@ -1932,24 +1932,24 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet)
 
 	ZEPHIR_OBS_VAR(&assignments);
 	if (UNEXPECTED(!(zephir_array_isset_string_fetch(&assignments, &statement, SL("assignments"), 0)))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1170);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1163);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&compilation);
 	ZVAL_STRING(&compilation, "<?php");
-	zephir_is_iterable(&assignments, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1219);
+	zephir_is_iterable(&assignments, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1212);
 	if (Z_TYPE_P(&assignments) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&assignments), _0)
 		{
 			ZEPHIR_INIT_NVAR(&assignment);
 			ZVAL_COPY(&assignment, _0);
-			zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_2$$4);
+			zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1174);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 501, &_2$$4);
 			zephir_check_call_status();
-			zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1188);
-			ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_4$$4);
+			zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
+			ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 501, &_4$$4);
 			zephir_check_call_status();
-			zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1194);
+			zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1187);
 			do {
 				if (ZEPHIR_IS_LONG(&_5$$4, 281)) {
 					ZEPHIR_INIT_NVAR(&_6$$5);
@@ -1993,13 +1993,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet)
 			}
 			ZEPHIR_CALL_METHOD(&assignment, &assignments, "current", NULL, 0);
 			zephir_check_call_status();
-				zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
-				ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_11$$10);
+				zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1174);
+				ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 501, &_11$$10);
 				zephir_check_call_status();
-				zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1188);
-				ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_12$$10);
+				zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181);
+				ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 501, &_12$$10);
 				zephir_check_call_status();
-				zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1194);
+				zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1187);
 				do {
 					if (ZEPHIR_IS_LONG(&_13$$10, 281)) {
 						ZEPHIR_INIT_NVAR(&_14$$11);
@@ -2162,13 +2162,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch)
 		object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "Corrupt statement");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 502, &_1$$3, &statement);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1260);
+		zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1253);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 501, &expr);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&compilation);
 	ZEPHIR_CONCAT_SVS(&compilation, "<?php switch (", &_2, "): ?>");
@@ -2179,7 +2179,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch)
 		} else {
 			ZVAL_BOOL(&_3$$4, 0);
 		}
-		ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 507, &caseClauses, &_3$$4);
+		ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 503, &caseClauses, &_3$$4);
 		zephir_check_call_status();
 		if (zephir_fast_strlen_ev(&lines) != 0) {
 			ZEPHIR_INIT_VAR(&_4$$5);
@@ -2292,7 +2292,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			zephir_array_fast_append(&_1$$4, &expr);
 			ZEPHIR_INIT_NVAR(&_2$$4);
 			ZVAL_STRING(&_2$$4, "resolveExpression");
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 509, &_2$$4, &_1$$4);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 505, &_2$$4, &_1$$4);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&exprCode) == IS_STRING) {
 				break;
@@ -2302,27 +2302,27 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 		if (!(zephir_array_isset_string_fetch(&type, &expr, SL("type"), 0))) {
 			ZEPHIR_INIT_NVAR(&items);
 			array_init(&items);
-			zephir_is_iterable(&expr, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1359);
+			zephir_is_iterable(&expr, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1352);
 			if (Z_TYPE_P(&expr) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _4$$6)
 				{
 					ZEPHIR_INIT_NVAR(&singleExpr);
 					ZVAL_COPY(&singleExpr, _4$$6);
-					zephir_array_fetch_string(&_6$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
+					zephir_array_fetch_string(&_6$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1341);
 					if (doubleQuotes) {
 						ZVAL_BOOL(&_7$$7, 1);
 					} else {
 						ZVAL_BOOL(&_7$$7, 0);
 					}
-					ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_6$$7, &_7$$7);
+					ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 501, &_6$$7, &_7$$7);
 					zephir_check_call_status();
 					ZEPHIR_OBS_NVAR(&name);
 					if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) {
 						ZEPHIR_INIT_NVAR(&_9$$8);
 						ZEPHIR_CONCAT_SVSV(&_9$$8, "'", &name, "' => ", &singleExprCode);
-						zephir_array_append(&items, &_9$$8, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1353);
+						zephir_array_append(&items, &_9$$8, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1346);
 					} else {
-						zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1355);
+						zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
 					}
 				} ZEND_HASH_FOREACH_END();
 			} else {
@@ -2336,21 +2336,21 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					}
 					ZEPHIR_CALL_METHOD(&singleExpr, &expr, "current", NULL, 0);
 					zephir_check_call_status();
-						zephir_array_fetch_string(&_10$$10, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
+						zephir_array_fetch_string(&_10$$10, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1341);
 						if (doubleQuotes) {
 							ZVAL_BOOL(&_11$$10, 1);
 						} else {
 							ZVAL_BOOL(&_11$$10, 0);
 						}
-						ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_10$$10, &_11$$10);
+						ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 501, &_10$$10, &_11$$10);
 						zephir_check_call_status();
 						ZEPHIR_OBS_NVAR(&name);
 						if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) {
 							ZEPHIR_INIT_NVAR(&_12$$11);
 							ZEPHIR_CONCAT_SVSV(&_12$$11, "'", &name, "' => ", &singleExprCode);
-							zephir_array_append(&items, &_12$$11, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1353);
+							zephir_array_append(&items, &_12$$11, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1346);
 						} else {
-							zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1355);
+							zephir_array_append(&items, &singleExprCode, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1348);
 						}
 					ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0);
 					zephir_check_call_status();
@@ -2373,18 +2373,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			} else {
 				ZVAL_BOOL(&_14$$14, 0);
 			}
-			ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 505, &left, &_14$$14);
+			ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 501, &left, &_14$$14);
 			zephir_check_call_status();
 		}
 		if (ZEPHIR_IS_LONG(&type, 311)) {
-			zephir_array_fetch_string(&_15$$15, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1385);
+			zephir_array_fetch_string(&_15$$15, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1378);
 			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvetest", &_16, 0, &_15$$15, &leftCode);
 			zephir_check_call_status();
 			break;
 		}
 		if (ZEPHIR_IS_LONG(&type, 124)) {
-			zephir_array_fetch_string(&_17$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1397);
-			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 510, &_17$$16, &leftCode);
+			zephir_array_fetch_string(&_17$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1390);
+			ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 506, &_17$$16, &leftCode);
 			zephir_check_call_status();
 			break;
 		}
@@ -2395,7 +2395,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			} else {
 				ZVAL_BOOL(&_19$$17, 0);
 			}
-			ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 505, &right, &_19$$17);
+			ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 501, &right, &_19$$17);
 			zephir_check_call_status();
 		}
 		ZEPHIR_INIT_NVAR(&exprCode);
@@ -2467,19 +2467,19 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			}
 			if (ZEPHIR_IS_LONG(&type, 258)) {
 				ZEPHIR_OBS_NVAR(&exprCode);
-				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1468);
+				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1461);
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 259)) {
 				ZEPHIR_OBS_NVAR(&exprCode);
-				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1472);
+				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1465);
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 260)) {
 				ZEPHIR_INIT_NVAR(&exprCode);
 				if (EXPECTED(doubleQuotes == 0)) {
 					ZEPHIR_INIT_NVAR(&_20$$35);
-					zephir_array_fetch_string(&_21$$35, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1477);
+					zephir_array_fetch_string(&_21$$35, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1470);
 					ZEPHIR_INIT_NVAR(&_22$$35);
 					ZVAL_STRING(&_22$$35, "'");
 					ZEPHIR_INIT_NVAR(&_23$$35);
@@ -2487,7 +2487,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					zephir_fast_str_replace(&_20$$35, &_22$$35, &_23$$35, &_21$$35);
 					ZEPHIR_CONCAT_SVS(&exprCode, "'", &_20$$35, "'");
 				} else {
-					zephir_array_fetch_string(&_24$$36, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1479);
+					zephir_array_fetch_string(&_24$$36, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1472);
 					ZEPHIR_CONCAT_SVS(&exprCode, "\"", &_24$$36, "\"");
 				}
 				break;
@@ -2508,7 +2508,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 265)) {
-				zephir_array_fetch_string(&_25$$40, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1496);
+				zephir_array_fetch_string(&_25$$40, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1489);
 				ZEPHIR_INIT_NVAR(&exprCode);
 				ZEPHIR_CONCAT_SV(&exprCode, "$", &_25$$40);
 				break;
@@ -2586,7 +2586,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					} else {
 						ZVAL_BOOL(&_28$$54, 0);
 					}
-					ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 505, &start, &_28$$54);
+					ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 501, &start, &_28$$54);
 					zephir_check_call_status();
 				} else {
 					ZEPHIR_INIT_NVAR(&startCode);
@@ -2599,7 +2599,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 					} else {
 						ZVAL_BOOL(&_29$$56, 0);
 					}
-					ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 505, &end, &_29$$56);
+					ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 501, &end, &_29$$56);
 					zephir_check_call_status();
 				} else {
 					ZEPHIR_INIT_NVAR(&endCode);
@@ -2690,13 +2690,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 				break;
 			}
 			if (ZEPHIR_IS_LONG(&type, 366)) {
-				zephir_array_fetch_string(&_31$$74, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1635);
+				zephir_array_fetch_string(&_31$$74, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1628);
 				if (doubleQuotes) {
 					ZVAL_BOOL(&_32$$74, 1);
 				} else {
 					ZVAL_BOOL(&_32$$74, 0);
 				}
-				ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 505, &_31$$74, &_32$$74);
+				ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 501, &_31$$74, &_32$$74);
 				zephir_check_call_status();
 				ZEPHIR_INIT_NVAR(&exprCode);
 				ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_30$$74, " ? ", &leftCode, " : ", &rightCode, ")");
@@ -2714,18 +2714,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression)
 			}
 			if (ZEPHIR_IS_LONG(&type, 364)) {
 				ZEPHIR_OBS_NVAR(&exprCode);
-				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1647);
+				zephir_array_fetch_string(&exprCode, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1640);
 				break;
 			}
 			ZEPHIR_INIT_NVAR(&_33$$78);
 			object_init_ex(&_33$$78, phalcon_mvc_view_engine_volt_exception_ce);
-			zephir_array_fetch_string(&_34$$78, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1652);
-			zephir_array_fetch_string(&_35$$78, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1653);
+			zephir_array_fetch_string(&_34$$78, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1645);
+			zephir_array_fetch_string(&_35$$78, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646);
 			ZEPHIR_INIT_NVAR(&_36$$78);
 			ZEPHIR_CONCAT_SVSVSV(&_36$$78, "Unknown expression ", &type, " in ", &_34$$78, " on line ", &_35$$78);
-			ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 506, &_36$$78);
+			ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 502, &_36$$78);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_33$$78, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1653);
+			zephir_throw_exception_debug(&_33$$78, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646);
 			ZEPHIR_MM_RESTORE();
 			return;
 		} while(0);
@@ -2795,7 +2795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, fireExtensionEvent)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extensions, &_0);
-	zephir_is_iterable(&extensions, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1701);
+	zephir_is_iterable(&extensions, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1694);
 	if (Z_TYPE_P(&extensions) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&extensions), _1)
 		{
@@ -2950,9 +2950,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 	ZEPHIR_INIT_VAR(&funcArguments);
 	ZVAL_NULL(&funcArguments);
 	ZEPHIR_OBS_VAR(&nameExpr);
-	zephir_array_fetch_string(&nameExpr, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1720);
+	zephir_array_fetch_string(&nameExpr, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1713);
 	ZEPHIR_OBS_VAR(&nameType);
-	zephir_array_fetch_string(&nameType, &nameExpr, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1721);
+	zephir_array_fetch_string(&nameType, &nameExpr, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1714);
 	ZEPHIR_OBS_NVAR(&funcArguments);
 	if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) {
 		if (doubleQuotes) {
@@ -2960,7 +2960,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 		} else {
 			ZVAL_BOOL(&_0$$3, 0);
 		}
-		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_0$$3);
+		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 501, &funcArguments, &_0$$3);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_INIT_NVAR(&arguments);
@@ -2968,7 +2968,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 	}
 	if (ZEPHIR_IS_LONG(&nameType, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &nameExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1738);
+		zephir_array_fetch_string(&name, &nameExpr, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1731);
 		zephir_read_property(&_1$$5, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&extensions, &_1$$5);
 		if (Z_TYPE_P(&extensions) == IS_ARRAY) {
@@ -2979,7 +2979,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 			zephir_array_fast_append(&_2$$6, &funcArguments);
 			ZEPHIR_INIT_VAR(&_3$$6);
 			ZVAL_STRING(&_3$$6, "compileFunction");
-			ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_3$$6, &_2$$6);
+			ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 505, &_3$$6, &_2$$6);
 			zephir_check_call_status();
 			if (Z_TYPE_P(&code) == IS_STRING) {
 				RETURN_CCTOR(&code);
@@ -3007,13 +3007,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 				}
 				ZEPHIR_INIT_VAR(&_5$$9);
 				object_init_ex(&_5$$9, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_6$$9, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1788);
-				zephir_array_fetch_string(&_7$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1789);
+				zephir_array_fetch_string(&_6$$9, &expr, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1781);
+				zephir_array_fetch_string(&_7$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782);
 				ZEPHIR_INIT_VAR(&_8$$9);
 				ZEPHIR_CONCAT_SVSVSV(&_8$$9, "Invalid definition for user function '", &name, "' in ", &_6$$9, " on line ", &_7$$9);
-				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 506, &_8$$9);
+				ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 502, &_8$$9);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1789);
+				zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -3040,7 +3040,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 					zephir_read_property(&_12$$17, this_ptr, ZEND_STRL("exprLevel"), PH_NOISY_CC | PH_READONLY);
 					ZEPHIR_CPY_WRT(&exprLevel, &_12$$17);
 					if (Z_TYPE_P(&block) == IS_ARRAY) {
-						ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 511, &block);
+						ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 507, &block);
 						zephir_check_call_status();
 						if (ZEPHIR_IS_LONG(&exprLevel, 1)) {
 							ZEPHIR_CPY_WRT(&escapedCode, &code);
@@ -3125,7 +3125,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 				ZEPHIR_OBS_NVAR(&funcArguments);
 				if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) {
 					ZVAL_BOOL(&_22$$30, 1);
-					ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_22$$30);
+					ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 501, &funcArguments, &_22$$30);
 					zephir_check_call_status();
 				} else {
 					ZEPHIR_INIT_NVAR(&arguments);
@@ -3176,7 +3176,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall)
 	} else {
 		ZVAL_BOOL(&_24, 0);
 	}
-	ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 505, &nameExpr, &_24);
+	ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 501, &nameExpr, &_24);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_VSVS(return_value, &_23, "(", &arguments, ")");
 	RETURN_MM();
@@ -3378,7 +3378,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getUniquePrefix)
 	ZEPHIR_OBS_VAR(&_8);
 	zephir_read_property(&_8, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC);
 	if (UNEXPECTED(Z_TYPE_P(&_8) != IS_STRING)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "The unique compilation prefix is invalid", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2083);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "The unique compilation prefix is invalid", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2076);
 		return;
 	}
 	RETURN_MM_MEMBER(getThis(), "prefix");
@@ -3475,10 +3475,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest)
 
 
 	ZEPHIR_OBS_VAR(&type);
-	zephir_array_fetch_string(&type, &test, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2117);
+	zephir_array_fetch_string(&type, &test, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2110);
 	if (ZEPHIR_IS_LONG(&type, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &test, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2123);
+		zephir_array_fetch_string(&name, &test, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2116);
 		do {
 			if (ZEPHIR_IS_STRING(&name, "empty")) {
 				ZEPHIR_CONCAT_SVS(return_value, "empty(", &left, ")");
@@ -3509,27 +3509,27 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest)
 	}
 	if (ZEPHIR_IS_LONG(&type, 350)) {
 		ZEPHIR_OBS_VAR(&testName);
-		zephir_array_fetch_string(&testName, &test, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2146);
+		zephir_array_fetch_string(&testName, &test, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2139);
 		ZEPHIR_OBS_NVAR(&name);
 		if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) {
 			do {
 				if (ZEPHIR_IS_STRING(&name, "divisibleby")) {
-					zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2151);
-					ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 505, &_1$$12);
+					zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2144);
+					ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 501, &_1$$12);
 					zephir_check_call_status();
 					ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)");
 					RETURN_MM();
 				}
 				if (ZEPHIR_IS_STRING(&name, "sameas")) {
-					zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2153);
-					ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 505, &_3$$13);
+					zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2146);
+					ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 501, &_3$$13);
 					zephir_check_call_status();
 					ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")");
 					RETURN_MM();
 				}
 				if (ZEPHIR_IS_STRING(&name, "type")) {
-					zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2155);
-					ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 505, &_5$$14);
+					zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2148);
+					ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 501, &_5$$14);
 					zephir_check_call_status();
 					ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")");
 					RETURN_MM();
@@ -3538,7 +3538,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest)
 
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 505, &test);
+	ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 501, &test);
 	zephir_check_call_status();
 	ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6);
 	RETURN_MM();
@@ -3739,7 +3739,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 		ZEPHIR_OBS_VAR(&autoescape);
 		if (zephir_array_isset_string_fetch(&autoescape, &options, SL("autoescape"), 0)) {
 			if (UNEXPECTED(((Z_TYPE_P(&autoescape) == IS_TRUE || Z_TYPE_P(&autoescape) == IS_FALSE) != 1))) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "'autoescape' must be bool", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2224);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "'autoescape' must be bool", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2217);
 				return;
 			}
 			zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &autoescape);
@@ -3749,7 +3749,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 	ZEPHIR_LAST_CALL_STATUS = phvolt_parse_view(&intermediate, &viewCode, &currentPath);
 	zephir_check_call_status();
 	if (UNEXPECTED(Z_TYPE_P(&intermediate) != IS_ARRAY)) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Invalid intermediate representation", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2237);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Invalid intermediate representation", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2230);
 		return;
 	}
 	if (extendsMode) {
@@ -3757,7 +3757,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 	} else {
 		ZVAL_BOOL(&_0, 0);
 	}
-	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &intermediate, &_0);
+	ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 503, &intermediate, &_0);
 	zephir_check_call_status();
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("extended"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extended, &_1);
@@ -3772,7 +3772,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 		ZEPHIR_CPY_WRT(&blocks, &_2$$7);
 		zephir_read_property(&_2$$7, this_ptr, ZEND_STRL("extendedBlocks"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&extendedBlocks, &_2$$7);
-		zephir_is_iterable(&extendedBlocks, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2309);
+		zephir_is_iterable(&extendedBlocks, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2302);
 		if (Z_TYPE_P(&extendedBlocks) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&extendedBlocks), _5$$7, _6$$7, _3$$7)
 			{
@@ -3787,17 +3787,17 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 				if (Z_TYPE_P(&name) == IS_STRING) {
 					if (zephir_array_isset(&blocks, &name)) {
 						ZEPHIR_OBS_NVAR(&localBlock);
-						zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2269);
+						zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2262);
 						zephir_update_property_zval(this_ptr, ZEND_STRL("currentBlock"), &name);
 						if (Z_TYPE_P(&localBlock) == IS_NULL) {
 							ZEPHIR_INIT_NVAR(&localBlock);
 							array_init(&localBlock);
 						}
-						ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &localBlock);
+						ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &localBlock);
 						zephir_check_call_status();
 					} else {
 						if (Z_TYPE_P(&block) == IS_ARRAY) {
-							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block);
+							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &block);
 							zephir_check_call_status();
 						} else {
 							ZEPHIR_CPY_WRT(&blockCompilation, &block);
@@ -3810,7 +3810,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 					}
 				} else {
 					if (extendsMode) {
-						zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2302);
+						zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2295);
 					} else {
 						zephir_concat_self(&finalCompilation, &block);
 					}
@@ -3832,17 +3832,17 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 					if (Z_TYPE_P(&name) == IS_STRING) {
 						if (zephir_array_isset(&blocks, &name)) {
 							ZEPHIR_OBS_NVAR(&localBlock);
-							zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2269);
+							zephir_array_fetch(&localBlock, &blocks, &name, PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2262);
 							zephir_update_property_zval(this_ptr, ZEND_STRL("currentBlock"), &name);
 							if (Z_TYPE_P(&localBlock) == IS_NULL) {
 								ZEPHIR_INIT_NVAR(&localBlock);
 								array_init(&localBlock);
 							}
-							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &localBlock);
+							ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &localBlock);
 							zephir_check_call_status();
 						} else {
 							if (Z_TYPE_P(&block) == IS_ARRAY) {
-								ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block);
+								ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 503, &block);
 								zephir_check_call_status();
 							} else {
 								ZEPHIR_CPY_WRT(&blockCompilation, &block);
@@ -3855,7 +3855,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource)
 						}
 					} else {
 						if (extendsMode) {
-							zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2302);
+							zephir_array_append(&finalCompilation, &block, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2295);
 						} else {
 							zephir_concat_self(&finalCompilation, &block);
 						}
@@ -3912,7 +3912,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath)
 		ZEPHIR_CALL_METHOD(&viewsDirs, &view, "getviewsdir", NULL, 0);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&viewsDirs) == IS_ARRAY) {
-			zephir_is_iterable(&viewsDirs, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2343);
+			zephir_is_iterable(&viewsDirs, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2336);
 			if (Z_TYPE_P(&viewsDirs) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&viewsDirs), _1$$4)
 				{
@@ -4024,28 +4024,28 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	ZEPHIR_INIT_VAR(&code);
 	ZVAL_NULL(&code);
 	ZEPHIR_OBS_VAR(&type);
-	zephir_array_fetch_string(&type, &filter, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2361);
+	zephir_array_fetch_string(&type, &filter, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2354);
 	if (ZEPHIR_IS_LONG(&type, 265)) {
 		ZEPHIR_OBS_VAR(&name);
-		zephir_array_fetch_string(&name, &filter, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2367);
+		zephir_array_fetch_string(&name, &filter, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2360);
 	} else {
 		if (UNEXPECTED(!ZEPHIR_IS_LONG(&type, 350))) {
 			ZEPHIR_INIT_VAR(&_0$$5);
 			object_init_ex(&_0$$5, phalcon_mvc_view_engine_volt_exception_ce);
-			zephir_array_fetch_string(&_1$$5, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2374);
-			zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2375);
+			zephir_array_fetch_string(&_1$$5, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2367);
+			zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5);
-			ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 506, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 502, &_3$$5);
 			zephir_check_call_status();
-			zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2375);
+			zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368);
 			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZEPHIR_OBS_VAR(&functionName);
-		zephir_array_fetch_string(&functionName, &filter, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2378);
+		zephir_array_fetch_string(&functionName, &filter, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2371);
 		ZEPHIR_OBS_NVAR(&name);
-		zephir_array_fetch_string(&name, &functionName, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2379);
+		zephir_array_fetch_string(&name, &functionName, SL("value"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2372);
 	}
 	ZEPHIR_INIT_VAR(&funcArguments);
 	ZVAL_NULL(&funcArguments);
@@ -4055,9 +4055,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 	if (zephir_array_isset_string_fetch(&funcArguments, &filter, SL("arguments"), 0)) {
 		if (!ZEPHIR_IS_STRING(&name, "default")) {
 			ZEPHIR_OBS_VAR(&file);
-			zephir_array_fetch_string(&file, &filter, SL("file"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2393);
+			zephir_array_fetch_string(&file, &filter, SL("file"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2386);
 			ZEPHIR_OBS_VAR(&line);
-			zephir_array_fetch_string(&line, &filter, SL("line"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2394);
+			zephir_array_fetch_string(&line, &filter, SL("line"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2387);
 			ZEPHIR_INIT_VAR(&_4$$7);
 			zephir_create_array(&_4$$7, 3, 0);
 			ZEPHIR_INIT_VAR(&_5$$7);
@@ -4074,7 +4074,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 			ZEPHIR_UNREF(&funcArguments);
 			zephir_check_call_status();
 		}
-		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments);
+		ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 501, &funcArguments);
 		zephir_check_call_status();
 	} else {
 		ZEPHIR_CPY_WRT(&arguments, &left);
@@ -4089,7 +4089,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 		zephir_array_fast_append(&_7$$9, &funcArguments);
 		ZEPHIR_INIT_VAR(&_8$$9);
 		ZVAL_STRING(&_8$$9, "compileFilter");
-		ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_8$$9, &_7$$9);
+		ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 505, &_8$$9, &_7$$9);
 		zephir_check_call_status();
 		if (Z_TYPE_P(&code) == IS_STRING) {
 			RETURN_CCTOR(&code);
@@ -4116,13 +4116,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 		}
 		ZEPHIR_INIT_VAR(&_10$$11);
 		object_init_ex(&_10$$11, phalcon_mvc_view_engine_volt_exception_ce);
-		zephir_array_fetch_string(&_11$$11, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2468);
-		zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2469);
+		zephir_array_fetch_string(&_11$$11, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2461);
+		zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462);
 		ZEPHIR_INIT_VAR(&_13$$11);
 		ZEPHIR_CONCAT_SVSVSV(&_13$$11, "Invalid definition for user filter '", &name, "' in ", &_11$$11, " on line ", &_12$$11);
-		ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 506, &_13$$11);
+		ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 502, &_13$$11);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2469);
+		zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -4164,12 +4164,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 			RETURN_MM();
 		}
 		if (ZEPHIR_IS_STRING(&name, "join")) {
-			zephir_array_fetch_long(&_14$$24, &funcArguments, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2495);
-			zephir_array_fetch_string(&_15$$24, &_14$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2495);
-			zephir_array_fetch_string(&_16$$24, &_15$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
-			zephir_array_fetch_long(&_17$$24, &funcArguments, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
-			zephir_array_fetch_string(&_18$$24, &_17$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
-			zephir_array_fetch_string(&_19$$24, &_18$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2496);
+			zephir_array_fetch_long(&_14$$24, &funcArguments, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2488);
+			zephir_array_fetch_string(&_15$$24, &_14$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2488);
+			zephir_array_fetch_string(&_16$$24, &_15$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			zephir_array_fetch_long(&_17$$24, &funcArguments, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			zephir_array_fetch_string(&_18$$24, &_17$$24, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
+			zephir_array_fetch_string(&_19$$24, &_18$$24, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2489);
 			ZEPHIR_CONCAT_SVSVS(return_value, "join('", &_16$$24, "', ", &_19$$24, ")");
 			RETURN_MM();
 		}
@@ -4241,13 +4241,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter)
 
 	ZEPHIR_INIT_VAR(&_20);
 	object_init_ex(&_20, phalcon_mvc_view_engine_volt_exception_ce);
-	zephir_array_fetch_string(&_21, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2535);
-	zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2536);
+	zephir_array_fetch_string(&_21, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2528);
+	zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529);
 	ZEPHIR_INIT_VAR(&_23);
 	ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22);
-	ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 506, &_23);
+	ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 502, &_23);
 	zephir_check_call_status();
-	zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2536);
+	zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529);
 	ZEPHIR_MM_RESTORE();
 	return;
 }
@@ -4399,26 +4399,26 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 	ZVAL_NULL(&compilation);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&extensions, &_0);
-	zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2822);
+	zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2815);
 	if (Z_TYPE_P(&statements) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&statements), _2)
 		{
 			ZEPHIR_INIT_NVAR(&statement);
 			ZVAL_COPY(&statement, _2);
 			if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2576);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2569);
 				return;
 			}
 			if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) {
 				ZEPHIR_INIT_NVAR(&_4$$7);
 				object_init_ex(&_4$$7, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
-				zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
+				zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
+				zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
 				ZEPHIR_INIT_NVAR(&_7$$7);
 				ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7);
-				ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 506, &_7$$7, &statement);
+				ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 502, &_7$$7, &statement);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2586);
+				zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579);
 				ZEPHIR_MM_RESTORE();
 				return;
 			}
@@ -4428,7 +4428,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				zephir_array_fast_append(&_9$$8, &statement);
 				ZEPHIR_INIT_NVAR(&_10$$8);
 				ZVAL_STRING(&_10$$8, "compileStatement");
-				ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 509, &_10$$8, &_9$$8);
+				ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 505, &_10$$8, &_9$$8);
 				zephir_check_call_status();
 				if (Z_TYPE_P(&tempCompilation) == IS_STRING) {
 					zephir_concat_self(&compilation, &tempCompilation);
@@ -4436,10 +4436,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 			}
 			ZEPHIR_OBS_NVAR(&type);
-			zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2612);
+			zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2605);
 			do {
 				if (ZEPHIR_IS_LONG(&type, 357)) {
-					zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620);
+					zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2613);
 					zephir_concat_self(&compilation, &_12$$10);
 					break;
 				}
@@ -4509,7 +4509,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				if (ZEPHIR_IS_LONG(&type, 307)) {
 					ZEPHIR_OBS_NVAR(&blockName);
-					zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2667);
+					zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2660);
 					ZEPHIR_OBS_NVAR(&blockStatements);
 					zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0);
 					zephir_read_property(&_32$$19, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY);
@@ -4520,7 +4520,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 							array_init(&blocks);
 						}
 						if (Z_TYPE_P(&compilation) != IS_NULL) {
-							zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2682);
+							zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2675);
 							ZEPHIR_INIT_NVAR(&compilation);
 							ZVAL_NULL(&compilation);
 						}
@@ -4533,7 +4533,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 							} else {
 								ZVAL_BOOL(&_34$$24, 0);
 							}
-							ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 507, &blockStatements, &_34$$24);
+							ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 503, &blockStatements, &_34$$24);
 							zephir_check_call_status();
 							zephir_concat_self(&compilation, &_33$$24);
 						}
@@ -4542,8 +4542,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				if (ZEPHIR_IS_LONG(&type, 310)) {
 					ZEPHIR_OBS_NVAR(&path);
-					zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2707);
-					zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711);
+					zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2700);
+					zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2704);
 					ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_36$$25);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&extended);
@@ -4639,13 +4639,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 				}
 				ZEPHIR_INIT_NVAR(&_56$$37);
 				object_init_ex(&_56$$37, phalcon_mvc_view_engine_volt_exception_ce);
-				zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2813);
-				zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
+				zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2806);
+				zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 				ZEPHIR_INIT_NVAR(&_59$$37);
 				ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37);
-				ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 506, &_59$$37);
+				ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 502, &_59$$37);
 				zephir_check_call_status();
-				zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
+				zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 				ZEPHIR_MM_RESTORE();
 				return;
 			} while(0);
@@ -4663,19 +4663,19 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 			ZEPHIR_CALL_METHOD(&statement, &statements, "current", NULL, 0);
 			zephir_check_call_status();
 				if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) {
-					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2576);
+					ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2569);
 					return;
 				}
 				if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) {
 					ZEPHIR_INIT_NVAR(&_60$$40);
 					object_init_ex(&_60$$40, phalcon_mvc_view_engine_volt_exception_ce);
-					zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
-					zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2584);
+					zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
+					zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577);
 					ZEPHIR_INIT_NVAR(&_63$$40);
 					ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40);
-					ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 506, &_63$$40, &statement);
+					ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 502, &_63$$40, &statement);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2586);
+					zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579);
 					ZEPHIR_MM_RESTORE();
 					return;
 				}
@@ -4685,7 +4685,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					zephir_array_fast_append(&_64$$41, &statement);
 					ZEPHIR_INIT_NVAR(&_65$$41);
 					ZVAL_STRING(&_65$$41, "compileStatement");
-					ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 509, &_65$$41, &_64$$41);
+					ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 505, &_65$$41, &_64$$41);
 					zephir_check_call_status();
 					if (Z_TYPE_P(&tempCompilation) == IS_STRING) {
 						zephir_concat_self(&compilation, &tempCompilation);
@@ -4693,10 +4693,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 				}
 				ZEPHIR_OBS_NVAR(&type);
-				zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2612);
+				zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2605);
 				do {
 					if (ZEPHIR_IS_LONG(&type, 357)) {
-						zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620);
+						zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2613);
 						zephir_concat_self(&compilation, &_66$$43);
 						break;
 					}
@@ -4766,7 +4766,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					if (ZEPHIR_IS_LONG(&type, 307)) {
 						ZEPHIR_OBS_NVAR(&blockName);
-						zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2667);
+						zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2660);
 						ZEPHIR_OBS_NVAR(&blockStatements);
 						zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0);
 						zephir_read_property(&_79$$52, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY);
@@ -4777,7 +4777,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 								array_init(&blocks);
 							}
 							if (Z_TYPE_P(&compilation) != IS_NULL) {
-								zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2682);
+								zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2675);
 								ZEPHIR_INIT_NVAR(&compilation);
 								ZVAL_NULL(&compilation);
 							}
@@ -4790,7 +4790,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 								} else {
 									ZVAL_BOOL(&_81$$57, 0);
 								}
-								ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 507, &blockStatements, &_81$$57);
+								ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 503, &blockStatements, &_81$$57);
 								zephir_check_call_status();
 								zephir_concat_self(&compilation, &_80$$57);
 							}
@@ -4799,8 +4799,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					if (ZEPHIR_IS_LONG(&type, 310)) {
 						ZEPHIR_OBS_NVAR(&path);
-						zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2707);
-						zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711);
+						zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2700);
+						zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2704);
 						ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_82$$58);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&extended);
@@ -4896,13 +4896,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList)
 					}
 					ZEPHIR_INIT_NVAR(&_94$$70);
 					object_init_ex(&_94$$70, phalcon_mvc_view_engine_volt_exception_ce);
-					zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2813);
-					zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
+					zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2806);
+					zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 					ZEPHIR_INIT_NVAR(&_97$$70);
 					ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70);
-					ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 506, &_97$$70);
+					ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 502, &_97$$70);
 					zephir_check_call_status();
-					zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2814);
+					zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807);
 					ZEPHIR_MM_RESTORE();
 					return;
 				} while(0);
@@ -4960,7 +4960,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends)
 	}
 	isStatementList = 1;
 	if (!(zephir_array_isset_string(statements, SL("type")))) {
-		zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2871);
+		zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2864);
 		if (Z_TYPE_P(statements) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(statements), _0$$4)
 			{
@@ -4993,7 +4993,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends)
 		ZEPHIR_INIT_NVAR(&statement);
 	}
 	if (isStatementList) {
-		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 507, statements);
+		ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 503, statements);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -5036,9 +5036,9 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory)
 				RETURN_MM_BOOL((ZEPHIR_IS_STRING_IDENTICAL(&leftValue, "tag")));
 			} else {
 				ZEPHIR_OBS_VAR(&_0$$6);
-				zephir_array_fetch_string(&_0$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2908);
+				zephir_array_fetch_string(&_0$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2901);
 				if (Z_TYPE_P(&_0$$6) == IS_ARRAY) {
-					ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 508, &left);
+					ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 504, &left);
 					zephir_check_call_status();
 					RETURN_MM();
 				}
diff --git a/ext/phalcon/mvc/view/simple.zep.c b/ext/phalcon/mvc/view/simple.zep.c
index 9206a976d6f..dd2d04dcc04 100644
--- a/ext/phalcon/mvc/view/simple.zep.c
+++ b/ext/phalcon/mvc/view/simple.zep.c
@@ -85,7 +85,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_View_Simple)
 	 */
 	zend_declare_property_null(phalcon_mvc_view_simple_ce, SL("options"), ZEND_ACC_PROTECTED);
 	/**
-	 * @var array|null
+	 * @var array
 	 */
 	zend_declare_property_null(phalcon_mvc_view_simple_ce, SL("registeredEngines"), ZEND_ACC_PROTECTED);
 	/**
@@ -103,17 +103,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_View_Simple)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "registeredEngines");
-}
-
 /**
  * Phalcon\Mvc\View\Simple constructor
  *
@@ -297,6 +286,18 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, getParamsToView)
 	RETURN_MEMBER(getThis(), "viewParams");
 }
 
+/**
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "registeredEngines");
+}
+
 /**
  * Returns a parameter previously set in the view
  *
@@ -430,12 +431,12 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, partial)
 	} else {
 		ZEPHIR_CPY_WRT(&mergedParams, params);
 	}
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &partialPath, &mergedParams);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 508, &partialPath, &mergedParams);
 	zephir_check_call_status();
 	if (Z_TYPE_P(params) == IS_ARRAY) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("viewParams"), &viewParams);
 	}
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 	zephir_check_call_status();
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("content"), PH_NOISY_CC | PH_READONLY);
 	zend_print_zval(&_2, 0);
@@ -540,9 +541,9 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, render)
 	ZEPHIR_CPY_WRT(&viewParams, &_1);
 	ZEPHIR_INIT_VAR(&mergedParams);
 	zephir_fast_array_merge(&mergedParams, &viewParams, &params);
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &path, &mergedParams);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 508, &path, &mergedParams);
 	zephir_check_call_status();
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "content");
 }
@@ -794,7 +795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, setViewsDir)
 	}
 
 
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 0, &viewsDir);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdirseparator", NULL, 509, &viewsDir);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDir"), &_0);
 	ZEPHIR_MM_RESTORE();
@@ -850,18 +851,18 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines)
 		array_init(&engines);
 		zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("registeredEngines"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_CPY_WRT(&registeredEngines, &_1$$3);
-		if (Z_TYPE_P(&registeredEngines) != IS_ARRAY) {
+		if (ZEPHIR_IS_EMPTY(&registeredEngines)) {
 			ZEPHIR_INIT_VAR(&_2$$4);
 			object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce);
-			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 494, this_ptr, &di);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 490, this_ptr, &di);
 			zephir_check_call_status();
 			zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE);
 		} else {
 			if (Z_TYPE_P(&di) != IS_OBJECT) {
-				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access the application services", "phalcon/Mvc/View/Simple.zep", 449);
+				ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "A dependency injection container is required to access the application services", "phalcon/Mvc/View/Simple.zep", 457);
 				return;
 			}
-			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View/Simple.zep", 482);
+			zephir_is_iterable(&registeredEngines, 0, "phalcon/Mvc/View/Simple.zep", 490);
 			if (Z_TYPE_P(&registeredEngines) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&registeredEngines), _5$$5, _6$$5, _3$$5)
 				{
@@ -897,7 +898,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines)
 						ZEPHIR_CONCAT_SV(&_13$$12, "Invalid template engine registration for extension: ", &extension);
 						ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 29, &_13$$12);
 						zephir_check_call_status();
-						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/View/Simple.zep", 477);
+						zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/View/Simple.zep", 485);
 						ZEPHIR_MM_RESTORE();
 						return;
 					}
@@ -940,7 +941,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines)
 							ZEPHIR_CONCAT_SV(&_19$$18, "Invalid template engine registration for extension: ", &extension);
 							ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_14, 29, &_19$$18);
 							zephir_check_call_status();
-							zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View/Simple.zep", 477);
+							zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/View/Simple.zep", 485);
 							ZEPHIR_MM_RESTORE();
 							return;
 						}
@@ -1056,7 +1057,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender)
 	zephir_get_strval(&viewsDirPath, &_3);
 	ZEPHIR_CALL_METHOD(&engines, this_ptr, "loadtemplateengines", NULL, 0);
 	zephir_check_call_status();
-	zephir_is_iterable(&engines, 0, "phalcon/Mvc/View/Simple.zep", 573);
+	zephir_is_iterable(&engines, 0, "phalcon/Mvc/View/Simple.zep", 581);
 	if (Z_TYPE_P(&engines) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&engines), _6, _7, _4)
 		{
@@ -1179,7 +1180,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender)
 		ZEPHIR_CONCAT_SVS(&_31$$20, "View '", &viewsDirPath, "' was not found in the views directory");
 		ZEPHIR_CALL_METHOD(NULL, &_30$$20, "__construct", NULL, 29, &_31$$20);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_30$$20, "phalcon/Mvc/View/Simple.zep", 576);
+		zephir_throw_exception_debug(&_30$$20, "phalcon/Mvc/View/Simple.zep", 584);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
@@ -1236,12 +1237,14 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, getDirSeparator)
 
 zend_object *zephir_init_properties_Phalcon_Mvc_View_Simple(zend_class_entry *class_type)
 {
-		zval _0, _2, _1$$3, _3$$4;
+		zval _0, _2, _4, _1$$3, _3$$4, _5$$5;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_3$$4);
+	ZVAL_UNDEF(&_5$$5);
 	
 
 		ZEPHIR_MM_GROW();
@@ -1255,11 +1258,17 @@ zend_object *zephir_init_properties_Phalcon_Mvc_View_Simple(zend_class_entry *cl
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("viewParams"), &_1$$3);
 		}
-		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
+		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("registeredEngines"), 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("options"), &_3$$4);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("registeredEngines"), &_3$$4);
+		}
+		zephir_read_property_ex(&_4, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY);
+		if (Z_TYPE_P(&_4) == IS_NULL) {
+			ZEPHIR_INIT_VAR(&_5$$5);
+			array_init(&_5$$5);
+			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("options"), &_5$$5);
 		}
 		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
diff --git a/ext/phalcon/mvc/view/simple.zep.h b/ext/phalcon/mvc/view/simple.zep.h
index efd1817c1f2..049ef66a200 100644
--- a/ext/phalcon/mvc/view/simple.zep.h
+++ b/ext/phalcon/mvc/view/simple.zep.h
@@ -3,7 +3,6 @@ extern zend_class_entry *phalcon_mvc_view_simple_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Mvc_View_Simple);
 
-PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines);
 PHP_METHOD(Phalcon_Mvc_View_Simple, __construct);
 PHP_METHOD(Phalcon_Mvc_View_Simple, __get);
 PHP_METHOD(Phalcon_Mvc_View_Simple, __set);
@@ -11,6 +10,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, getActiveRenderPath);
 PHP_METHOD(Phalcon_Mvc_View_Simple, getContent);
 PHP_METHOD(Phalcon_Mvc_View_Simple, getEventsManager);
 PHP_METHOD(Phalcon_Mvc_View_Simple, getParamsToView);
+PHP_METHOD(Phalcon_Mvc_View_Simple, getRegisteredEngines);
 PHP_METHOD(Phalcon_Mvc_View_Simple, getVar);
 PHP_METHOD(Phalcon_Mvc_View_Simple, getViewsDir);
 PHP_METHOD(Phalcon_Mvc_View_Simple, partial);
@@ -27,9 +27,6 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, internalRender);
 PHP_METHOD(Phalcon_Mvc_View_Simple, getDirSeparator);
 zend_object *zephir_init_properties_Phalcon_Mvc_View_Simple(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_simple_getregisteredengines, 0, 0, IS_ARRAY, 1)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_simple___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
@@ -60,6 +57,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_simple_getparamstoview, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_view_simple_getregisteredengines, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_simple_getvar, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -133,7 +133,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_view_simple_zephir_init_properties_ph
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_mvc_view_simple_method_entry) {
-	PHP_ME(Phalcon_Mvc_View_Simple, getRegisteredEngines, arginfo_phalcon_mvc_view_simple_getregisteredengines, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, __construct, arginfo_phalcon_mvc_view_simple___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Mvc_View_Simple, __get, arginfo_phalcon_mvc_view_simple___get, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, __set, arginfo_phalcon_mvc_view_simple___set, ZEND_ACC_PUBLIC)
@@ -141,6 +140,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_view_simple_method_entry) {
 	PHP_ME(Phalcon_Mvc_View_Simple, getContent, arginfo_phalcon_mvc_view_simple_getcontent, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getEventsManager, arginfo_phalcon_mvc_view_simple_geteventsmanager, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getParamsToView, arginfo_phalcon_mvc_view_simple_getparamstoview, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Mvc_View_Simple, getRegisteredEngines, arginfo_phalcon_mvc_view_simple_getregisteredengines, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getVar, arginfo_phalcon_mvc_view_simple_getvar, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, getViewsDir, arginfo_phalcon_mvc_view_simple_getviewsdir, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Mvc_View_Simple, partial, arginfo_phalcon_mvc_view_simple_partial, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/paginator/adapter/nativearray.zep.c b/ext/phalcon/paginator/adapter/nativearray.zep.c
index 76c1d313e13..7eac0aad822 100644
--- a/ext/phalcon/paginator/adapter/nativearray.zep.c
+++ b/ext/phalcon/paginator/adapter/nativearray.zep.c
@@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_NativeArray, paginate)
 	}
 	ZVAL_LONG(&_0, (show * ((pageNumber - 1))));
 	ZVAL_LONG(&_4, show);
-	ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 503, &items, &_0, &_4);
+	ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 499, &items, &_0, &_4);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&items, &_5);
 	if (pageNumber < totalPages) {
diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c
index aa8430e1310..27e39339c37 100644
--- a/ext/phalcon/session/adapter/stream.zep.c
+++ b/ext/phalcon/session/adapter/stream.zep.c
@@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, __construct)
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 0, &path);
+	ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdirseparator", NULL, 510, &path);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_6);
 	ZEPHIR_MM_RESTORE();
@@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy)
 	ZEPHIR_CONCAT_VV(&file, &_0, &_1);
 	_2 = (zephir_file_exists(&file) == SUCCESS);
 	if (_2) {
-		ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 0, &file);
+		ZEPHIR_CALL_FUNCTION(&_3, "is_file", NULL, 511, &file);
 		zephir_check_call_status();
 		_2 = zephir_is_true(&_3);
 	}
@@ -246,7 +246,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc)
 			ZVAL_COPY(&file, _4);
 			_6$$3 = 1 == (zephir_file_exists(&file) == SUCCESS);
 			if (_6$$3) {
-				ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 0, &file);
+				ZEPHIR_CALL_FUNCTION(&_7$$3, "is_file", &_8, 511, &file);
 				zephir_check_call_status();
 				_6$$3 = ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3);
 			}
@@ -274,7 +274,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc)
 			zephir_check_call_status();
 				_12$$5 = 1 == (zephir_file_exists(&file) == SUCCESS);
 				if (_12$$5) {
-					ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 0, &file);
+					ZEPHIR_CALL_FUNCTION(&_13$$5, "is_file", &_8, 511, &file);
 					zephir_check_call_status();
 					_12$$5 = ZEPHIR_IS_TRUE_IDENTICAL(&_13$$5);
 				}
diff --git a/ext/phalcon/storage/adapter/abstractadapter.zep.c b/ext/phalcon/storage/adapter/abstractadapter.zep.c
index 440f06b800e..b0b7e9591dd 100644
--- a/ext/phalcon/storage/adapter/abstractadapter.zep.c
+++ b/ext/phalcon/storage/adapter/abstractadapter.zep.c
@@ -91,18 +91,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Adapter_AbstractAdapter)
 	return SUCCESS;
 }
 
-/**
- * Name of the default serializer class
- */
-PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "defaultSerializer");
-}
-
 /**
  * AbstractAdapter constructor.
  *
@@ -280,6 +268,20 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getAdapter)
 	RETURN_MEMBER(getThis(), "adapter");
 }
 
+/**
+ * Name of the default serializer class
+ *
+ * @return string
+ */
+PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "defaultSerializer");
+}
+
 /**
  * Returns all the keys stored
  *
@@ -469,14 +471,14 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getFilteredKeys)
 		ZEPHIR_CPY_WRT(&_1, keys);
 	}
 	ZEPHIR_CPY_WRT(keys, &_1);
-	zephir_is_iterable(keys, 0, "phalcon/Storage/Adapter/AbstractAdapter.zep", 257);
+	zephir_is_iterable(keys, 0, "phalcon/Storage/Adapter/AbstractAdapter.zep", 267);
 	if (Z_TYPE_P(keys) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _2)
 		{
 			ZEPHIR_INIT_NVAR(&key);
 			ZVAL_COPY(&key, _2);
 			if (zephir_start_with(&key, &pattern, NULL)) {
-				zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 253);
+				zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 263);
 			}
 		} ZEND_HASH_FOREACH_END();
 	} else {
@@ -491,7 +493,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getFilteredKeys)
 			ZEPHIR_CALL_METHOD(&key, keys, "current", NULL, 0);
 			zephir_check_call_status();
 				if (zephir_start_with(&key, &pattern, NULL)) {
-					zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 253);
+					zephir_array_append(&results, &key, PH_SEPARATE, "phalcon/Storage/Adapter/AbstractAdapter.zep", 263);
 				}
 			ZEPHIR_CALL_METHOD(NULL, keys, "next", NULL, 0);
 			zephir_check_call_status();
diff --git a/ext/phalcon/storage/adapter/abstractadapter.zep.h b/ext/phalcon/storage/adapter/abstractadapter.zep.h
index a4c81fb9a0a..201a1d67df9 100644
--- a/ext/phalcon/storage/adapter/abstractadapter.zep.h
+++ b/ext/phalcon/storage/adapter/abstractadapter.zep.h
@@ -3,13 +3,13 @@ extern zend_class_entry *phalcon_storage_adapter_abstractadapter_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Storage_Adapter_AbstractAdapter);
 
-PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, __construct);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, clear);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, decrement);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, delete);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, get);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getAdapter);
+PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getKeys);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getPrefix);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, has);
@@ -26,9 +26,6 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, initSerializer);
 PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getArrVal);
 zend_object *zephir_init_properties_Phalcon_Storage_Adapter_AbstractAdapter(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, 0, 0, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Storage\\SerializerFactory, 0)
 #if PHP_VERSION_ID >= 80000
@@ -58,6 +55,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getadapter, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_getkeys, 0, 0, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -125,7 +125,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_adapter_abstractadapter_zephir_in
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_abstractadapter_method_entry) {
-	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer, arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, __construct, arginfo_phalcon_storage_adapter_abstractadapter___construct, ZEND_ACC_PROTECTED|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, clear, arginfo_phalcon_storage_adapter_abstractadapter_clear, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, decrement, arginfo_phalcon_storage_adapter_abstractadapter_decrement, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
@@ -136,6 +135,7 @@ ZEPHIR_INIT_FUNCS(phalcon_storage_adapter_abstractadapter_method_entry) {
 #else
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getAdapter, NULL, ZEND_ACC_PUBLIC)
 #endif
+	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getDefaultSerializer, arginfo_phalcon_storage_adapter_abstractadapter_getdefaultserializer, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getKeys, arginfo_phalcon_storage_adapter_abstractadapter_getkeys, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, getPrefix, arginfo_phalcon_storage_adapter_abstractadapter_getprefix, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Storage_Adapter_AbstractAdapter, has, arginfo_phalcon_storage_adapter_abstractadapter_has, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h
index a8b9cbf0bdd..8104c8a302c 100644
--- a/ext/phalcon/storage/serializer/none.zep.h
+++ b/ext/phalcon/storage/serializer/none.zep.h
@@ -9,7 +9,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize);
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h
index e08b0daf6d9..ce6bc2f91f0 100644
--- a/ext/phalcon/storage/serializer/php.zep.h
+++ b/ext/phalcon/storage/serializer/php.zep.h
@@ -23,7 +23,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
diff --git a/ext/phalcon/support/collection.zep.h b/ext/phalcon/support/collection.zep.h
index 7d53f828a2f..b597fbecd35 100644
--- a/ext/phalcon/support/collection.zep.h
+++ b/ext/phalcon/support/collection.zep.h
@@ -107,7 +107,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c
index dca01103430..4091c0c8758 100644
--- a/ext/phalcon/support/debug.zep.c
+++ b/ext/phalcon/support/debug.zep.c
@@ -386,7 +386,7 @@ PHP_METHOD(Phalcon_Support_Debug, onUncaughtException)
 	ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 0);
 	zephir_check_call_status();
 	if (ZEPHIR_GT_LONG(&obLevel, 0)) {
-		ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491);
+		ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 487);
 		zephir_check_call_status();
 	}
 	zephir_read_static_property_ce(&_0, phalcon_support_debug_ce, SL("isActive"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c
index 01025ee2f39..53aa14010ec 100644
--- a/ext/phalcon/support/debug/dump.zep.c
+++ b/ext/phalcon/support/debug/dump.zep.c
@@ -12,12 +12,12 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
+#include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
-#include "kernel/fcall.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/exception.h"
+#include "kernel/operators.h"
 #include "kernel/array.h"
 #include "kernel/main.h"
 #include "kernel/concat.h"
@@ -70,47 +70,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Support_Debug_Dump)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "detailed");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed)
-{
-	zval *detailed_param = NULL, __$true, __$false;
-	zend_bool detailed;
-	zval *this_ptr = getThis();
-
-	ZVAL_BOOL(&__$true, 1);
-	ZVAL_BOOL(&__$false, 0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_BOOL(detailed)
-	ZEND_PARSE_PARAMETERS_END();
-#endif
-
-
-	zephir_fetch_params_without_memory_grow(1, 0, &detailed_param);
-	detailed = zephir_get_boolval(detailed_param);
-
-
-	if (detailed) {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$true);
-	} else {
-		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$false);
-	}
-	RETURN_THISW();
-}
-
 /**
  * Phalcon\Debug\Dump constructor
  */
@@ -191,6 +150,42 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, all)
 	RETURN_MM();
 }
 
+PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "detailed");
+}
+
+PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed)
+{
+	zval *detailed_param = NULL, __$true, __$false;
+	zend_bool detailed;
+	zval *this_ptr = getThis();
+
+	ZVAL_BOOL(&__$true, 1);
+	ZVAL_BOOL(&__$false, 0);
+#if PHP_VERSION_ID >= 80000
+	bool is_null_true = 1;
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_BOOL(detailed)
+	ZEND_PARSE_PARAMETERS_END();
+#endif
+
+
+	zephir_fetch_params_without_memory_grow(1, 0, &detailed_param);
+	detailed = zephir_get_boolval(detailed_param);
+
+
+	if (detailed) {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$true);
+	} else {
+		zephir_update_property_zval(this_ptr, ZEND_STRL("detailed"), &__$false);
+	}
+}
+
 /**
  * Alias of variable() method
  */
@@ -418,7 +413,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, variables)
 	ZEPHIR_INIT_VAR(&output);
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_get_args(&_0);
-	zephir_is_iterable(&_0, 0, "phalcon/Support/Debug/Dump.zep", 181);
+	zephir_is_iterable(&_0, 0, "phalcon/Support/Debug/Dump.zep", 191);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _3, _4, _1)
 		{
@@ -721,7 +716,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output)
 		ZEPHIR_CALL_FUNCTION(&_2$$4, "strtr", NULL, 5, &_3$$4, &_1$$4);
 		zephir_check_call_status();
 		zephir_concat_self(&output, &_2$$4);
-		zephir_is_iterable(variable, 0, "phalcon/Support/Debug/Dump.zep", 231);
+		zephir_is_iterable(variable, 0, "phalcon/Support/Debug/Dump.zep", 241);
 		if (Z_TYPE_P(variable) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(variable), _6$$4, _7$$4, _4$$4)
 			{
@@ -890,9 +885,9 @@ 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, 429, variable);
+			ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 425, variable);
 			zephir_check_call_status();
-			zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263);
+			zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 273);
 			if (Z_TYPE_P(&_46$$12) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_46$$12), _49$$12, _50$$12, _47$$12)
 				{
@@ -986,7 +981,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output)
 			ZVAL_LONG(&_67$$15, ((1 | 2) | 4));
 			ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 158, &_67$$15);
 			zephir_check_call_status();
-			zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 289);
+			zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 299);
 			if (Z_TYPE_P(&props$$15) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&props$$15), _68$$15)
 				{
@@ -1126,7 +1121,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output)
 			ZEPHIR_CONCAT_VS(&_110$$18, &_109$$18, "[already listed]\n");
 			zephir_concat_self(&output, &_110$$18);
 		} else {
-			zephir_is_iterable(&attr, 0, "phalcon/Support/Debug/Dump.zep", 307);
+			zephir_is_iterable(&attr, 0, "phalcon/Support/Debug/Dump.zep", 317);
 			if (Z_TYPE_P(&attr) == IS_ARRAY) {
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attr), _111$$19)
 				{
@@ -1434,7 +1429,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, encode)
 		ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3);
 		ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 192, &_5$$3);
 		zephir_check_call_status();
-		zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Debug/Dump.zep", 356);
+		zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Debug/Dump.zep", 366);
 		ZEPHIR_MM_RESTORE();
 		return;
 	}
diff --git a/ext/phalcon/support/debug/dump.zep.h b/ext/phalcon/support/debug/dump.zep.h
index 95cebd25aff..10f0753e7b1 100644
--- a/ext/phalcon/support/debug/dump.zep.h
+++ b/ext/phalcon/support/debug/dump.zep.h
@@ -3,10 +3,10 @@ extern zend_class_entry *phalcon_support_debug_dump_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Support_Debug_Dump);
 
-PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed);
-PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed);
 PHP_METHOD(Phalcon_Support_Debug_Dump, __construct);
 PHP_METHOD(Phalcon_Support_Debug_Dump, all);
+PHP_METHOD(Phalcon_Support_Debug_Dump, getDetailed);
+PHP_METHOD(Phalcon_Support_Debug_Dump, setDetailed);
 PHP_METHOD(Phalcon_Support_Debug_Dump, one);
 PHP_METHOD(Phalcon_Support_Debug_Dump, setStyles);
 PHP_METHOD(Phalcon_Support_Debug_Dump, toJson);
@@ -17,13 +17,6 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output);
 PHP_METHOD(Phalcon_Support_Debug_Dump, encode);
 zend_object *zephir_init_properties_Phalcon_Support_Debug_Dump(zend_class_entry *class_type);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_getdetailed, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump_setdetailed, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, detailed, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump___construct, 0, 0, 0)
 #if PHP_VERSION_ID >= 80000
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, styles, IS_ARRAY, 0, "[]")
@@ -36,6 +29,14 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_all, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_getdetailed, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_setdetailed, 0, 1, IS_VOID, 0)
+
+	ZEND_ARG_TYPE_INFO(0, detailed, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_debug_dump_one, 0, 1, IS_STRING, 0)
 	ZEND_ARG_INFO(0, variable)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
@@ -81,10 +82,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_debug_dump_zephir_init_properties
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_support_debug_dump_method_entry) {
-	PHP_ME(Phalcon_Support_Debug_Dump, getDetailed, arginfo_phalcon_support_debug_dump_getdetailed, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Support_Debug_Dump, setDetailed, arginfo_phalcon_support_debug_dump_setdetailed, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, __construct, arginfo_phalcon_support_debug_dump___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Phalcon_Support_Debug_Dump, all, arginfo_phalcon_support_debug_dump_all, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Support_Debug_Dump, getDetailed, arginfo_phalcon_support_debug_dump_getdetailed, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Support_Debug_Dump, setDetailed, arginfo_phalcon_support_debug_dump_setdetailed, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, one, arginfo_phalcon_support_debug_dump_one, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, setStyles, arginfo_phalcon_support_debug_dump_setstyles, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Support_Debug_Dump, toJson, arginfo_phalcon_support_debug_dump_tojson, ZEND_ACC_PUBLIC)
diff --git a/ext/phalcon/support/helper/arr/first.zep.c b/ext/phalcon/support/helper/arr/first.zep.c
index 21bc2e5e7d8..16408c00a5b 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, 479, &filtered);
+	ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 475, &filtered);
 	ZEPHIR_UNREF(&filtered);
 	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 20715d10a30..822842fd300 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, 503, &collection, &_0, &_1);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 499, &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 f0aeb8bcc0a..164d25f98af 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, 503, &collection, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 499, &collection, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c
index 3313d769df5..f84fe933fba 100644
--- a/ext/phalcon/support/helper/str/concat.zep.c
+++ b/ext/phalcon/support/helper/str/concat.zep.c
@@ -81,15 +81,15 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke)
 		return;
 	}
 	ZEPHIR_MAKE_REF(&arguments);
-	ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 479, &arguments);
+	ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 475, &arguments);
 	ZEPHIR_UNREF(&arguments);
 	zephir_check_call_status();
 	ZVAL_LONG(&_0, 1);
-	ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 503, &arguments, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 499, &arguments, &_0);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&arguments, &_1);
 	ZEPHIR_MAKE_REF(&arguments);
-	ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 479, &arguments);
+	ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 475, &arguments);
 	ZEPHIR_UNREF(&arguments);
 	zephir_check_call_status();
 	ZEPHIR_MAKE_REF(&arguments);
diff --git a/ext/phalcon/support/registry.zep.h b/ext/phalcon/support/registry.zep.h
index 36411810765..0f24b23d6b7 100644
--- a/ext/phalcon/support/registry.zep.h
+++ b/ext/phalcon/support/registry.zep.h
@@ -91,7 +91,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c
index bd7761ccb44..b6c38def560 100644
--- a/ext/phalcon/support/version.zep.c
+++ b/ext/phalcon/support/version.zep.c
@@ -120,10 +120,10 @@ PHP_METHOD(Phalcon_Support_Version, getVersion)
 	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(return_value, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZVAL_LONG(&_0, 3);
+	ZVAL_LONG(&_0, 4);
 	zephir_array_fast_append(return_value, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZVAL_LONG(&_0, 4);
+	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(return_value, &_0);
 	RETURN_MM();
 }
diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c
index 7c2abd3808b..96456f65228 100644
--- a/ext/phalcon/tag.zep.c
+++ b/ext/phalcon/tag.zep.c
@@ -826,7 +826,7 @@ PHP_METHOD(Phalcon_Tag, getDI)
 
 	ZEPHIR_OBS_VAR(&di);
 	zephir_read_static_property_ce(&di, phalcon_tag_ce, SL("container"), PH_NOISY_CC);
-	if (Z_TYPE_P(&di) != IS_OBJECT) {
+	if (Z_TYPE_P(&di) == IS_NULL) {
 		ZEPHIR_CALL_CE_STATIC(&di, phalcon_di_di_ce, "getdefault", &_0, 0);
 		zephir_check_call_status();
 	}
@@ -856,7 +856,7 @@ PHP_METHOD(Phalcon_Tag, getEscaperService)
 	if (Z_TYPE_P(&escaper) != IS_OBJECT) {
 		ZEPHIR_CALL_SELF(&container, "getdi", NULL, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_tag_exception_ce, "A dependency injection container is required to access the 'escaper' service", "phalcon/Tag.zep", 403);
 			return;
 		}
@@ -1088,7 +1088,7 @@ PHP_METHOD(Phalcon_Tag, getUrlService)
 	if (Z_TYPE_P(&url) != IS_OBJECT) {
 		ZEPHIR_CALL_SELF(&container, "getdi", NULL, 0);
 		zephir_check_call_status();
-		if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) {
+		if (Z_TYPE_P(&container) == IS_NULL) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_tag_exception_ce, "A dependency injection container is required to access the 'url' service", "phalcon/Tag.zep", 498);
 			return;
 		}
@@ -1852,7 +1852,7 @@ PHP_METHOD(Phalcon_Tag, preload)
 		zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href);
 		ZEPHIR_INIT_VAR(&_8$$5);
 		ZVAL_STRING(&_8$$5, "preload");
-		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 501, &_8$$5, &_5$$5, &attributes);
+		ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 497, &_8$$5, &_5$$5, &attributes);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_8$$5);
 		object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce);
@@ -1864,7 +1864,7 @@ PHP_METHOD(Phalcon_Tag, preload)
 		ZEPHIR_INIT_VAR(&_10$$5);
 		zephir_create_array(&_10$$5, 1, 0);
 		zephir_array_fast_append(&_10$$5, &link);
-		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 502, &_10$$5);
+		ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 498, &_10$$5);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&header);
 		ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5);
diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.h b/ext/phalcon/translate/adapter/abstractadapter.zep.h
index 089b550c641..7814b8790a8 100644
--- a/ext/phalcon/translate/adapter/abstractadapter.zep.h
+++ b/ext/phalcon/translate/adapter/abstractadapter.zep.h
@@ -37,7 +37,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_NULL, 0)
 #endif
 	ZEND_ARG_INFO(0, translateKey)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c
index e01cd135dd4..0dfc34ae75a 100644
--- a/ext/phalcon/translate/adapter/gettext.zep.c
+++ b/ext/phalcon/translate/adapter/gettext.zep.c
@@ -12,12 +12,12 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/object.h"
 #include "kernel/memory.h"
 #include "kernel/fcall.h"
 #include "kernel/operators.h"
 #include "kernel/exception.h"
 #include "ext/spl/spl_exceptions.h"
+#include "kernel/object.h"
 #include "kernel/concat.h"
 #include "kernel/array.h"
 
@@ -77,50 +77,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Translate_Adapter_Gettext)
 	return SUCCESS;
 }
 
-/**
- */
-PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getCategory)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "category");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDefaultDomain)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "defaultDomain");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDirectory)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "directory");
-}
-
-/**
- */
-PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getLocale)
-{
-	zval *this_ptr = getThis();
-
-
-
-	RETURN_MEMBER(getThis(), "locale");
-}
-
 /**
  * Gettext constructor.
  *
@@ -219,6 +175,54 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, exists)
 	RETURN_MM();
 }
 
+/**
+ * @return int
+ */
+PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getCategory)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "category");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDefaultDomain)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "defaultDomain");
+}
+
+/**
+ * @return string|array
+ */
+PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDirectory)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "directory");
+}
+
+/**
+ * @return string
+ */
+PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getLocale)
+{
+	zval *this_ptr = getThis();
+
+
+
+	RETURN_MEMBER(getThis(), "locale");
+}
+
 /**
  * Check whether is defined a translation key in the internal array
  *
@@ -536,7 +540,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory)
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("directory"), directory);
 	if (Z_TYPE_P(directory) == IS_ARRAY) {
-		zephir_is_iterable(directory, 0, "phalcon/Translate/Adapter/Gettext.zep", 217);
+		zephir_is_iterable(directory, 0, "phalcon/Translate/Adapter/Gettext.zep", 249);
 		if (Z_TYPE_P(directory) == IS_ARRAY) {
 			ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(directory), _2$$4, _3$$4, _0$$4)
 			{
@@ -762,11 +766,11 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions)
 
 
 	if (UNEXPECTED(!(zephir_array_isset_string(&options, SL("locale"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'locale' is required", "phalcon/Translate/Adapter/Gettext.zep", 289);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'locale' is required", "phalcon/Translate/Adapter/Gettext.zep", 321);
 		return;
 	}
 	if (UNEXPECTED(!(zephir_array_isset_string(&options, SL("directory"))))) {
-		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'directory' is required", "phalcon/Translate/Adapter/Gettext.zep", 293);
+		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'directory' is required", "phalcon/Translate/Adapter/Gettext.zep", 325);
 		return;
 	}
 	ZEPHIR_INIT_VAR(&_0);
@@ -774,17 +778,17 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions)
 	zephir_check_call_status();
 	zephir_fast_array_merge(&_0, &_1, &options);
 	ZEPHIR_CPY_WRT(&options, &_0);
-	zephir_array_fetch_string(&_2, &options, SL("category"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 301);
-	zephir_array_fetch_string(&_3, &options, SL("locale"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 301);
+	zephir_array_fetch_string(&_2, &options, SL("category"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 333);
+	zephir_array_fetch_string(&_3, &options, SL("locale"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 333);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setlocale", NULL, 0, &_2, &_3);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_4, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 302);
+	zephir_array_fetch_string(&_4, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 334);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdefaultdomain", NULL, 0, &_4);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_5, &options, SL("directory"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 303);
+	zephir_array_fetch_string(&_5, &options, SL("directory"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 335);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdirectory", NULL, 0, &_5);
 	zephir_check_call_status();
-	zephir_array_fetch_string(&_6, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 304);
+	zephir_array_fetch_string(&_6, &options, SL("defaultDomain"), PH_NOISY | PH_READONLY, "phalcon/Translate/Adapter/Gettext.zep", 336);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "setdomain", NULL, 0, &_6);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
diff --git a/ext/phalcon/translate/adapter/gettext.zep.h b/ext/phalcon/translate/adapter/gettext.zep.h
index f9103d9b8c6..8b9ef3ae6e7 100644
--- a/ext/phalcon/translate/adapter/gettext.zep.h
+++ b/ext/phalcon/translate/adapter/gettext.zep.h
@@ -3,12 +3,12 @@ extern zend_class_entry *phalcon_translate_adapter_gettext_ce;
 
 ZEPHIR_INIT_CLASS(Phalcon_Translate_Adapter_Gettext);
 
+PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct);
+PHP_METHOD(Phalcon_Translate_Adapter_Gettext, exists);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getCategory);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDefaultDomain);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getDirectory);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getLocale);
-PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct);
-PHP_METHOD(Phalcon_Translate_Adapter_Gettext, exists);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, has);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query);
@@ -21,25 +21,25 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, getOptionsDefault);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions);
 PHP_METHOD(Phalcon_Translate_Adapter_Gettext, phpFunctionExists);
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getcategory, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext___construct, 0, 0, 2)
+	ZEND_ARG_OBJ_INFO(0, interpolator, Phalcon\\Translate\\InterpolatorFactory, 0)
+	ZEND_ARG_ARRAY_INFO(0, options, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdefaultdomain, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_exists, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdirectory, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getcategory, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getlocale, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdefaultdomain, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext___construct, 0, 0, 2)
-	ZEND_ARG_OBJ_INFO(0, interpolator, Phalcon\\Translate\\InterpolatorFactory, 0)
-	ZEND_ARG_ARRAY_INFO(0, options, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getdirectory, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_exists, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_getlocale, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettext_has, 0, 1, _IS_BOOL, 0)
@@ -106,6 +106,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_gettex
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) {
+	PHP_ME(Phalcon_Translate_Adapter_Gettext, __construct, arginfo_phalcon_translate_adapter_gettext___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(Phalcon_Translate_Adapter_Gettext, exists, arginfo_phalcon_translate_adapter_gettext_exists, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getCategory, arginfo_phalcon_translate_adapter_gettext_getcategory, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getDefaultDomain, arginfo_phalcon_translate_adapter_gettext_getdefaultdomain, ZEND_ACC_PUBLIC)
 #if PHP_VERSION_ID >= 80000
@@ -114,8 +116,6 @@ ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) {
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getDirectory, NULL, ZEND_ACC_PUBLIC)
 #endif
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, getLocale, arginfo_phalcon_translate_adapter_gettext_getlocale, ZEND_ACC_PUBLIC)
-	PHP_ME(Phalcon_Translate_Adapter_Gettext, __construct, arginfo_phalcon_translate_adapter_gettext___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(Phalcon_Translate_Adapter_Gettext, exists, arginfo_phalcon_translate_adapter_gettext_exists, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, has, arginfo_phalcon_translate_adapter_gettext_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, nquery, arginfo_phalcon_translate_adapter_gettext_nquery, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Translate_Adapter_Gettext, query, arginfo_phalcon_translate_adapter_gettext_query, ZEND_ACC_PUBLIC)
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
index 29f432b79c8..9aff78e9f6c 100644
--- a/ext/php_phalcon.h
+++ b/ext/php_phalcon.h
@@ -11,10 +11,10 @@
 #include "kernel/globals.h"
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "5.0.0RC4"
+#define PHP_PHALCON_VERSION     "5.0.0"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.3-5099f34"
+#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

From 5b3df779a72d398709a4d142b665785d34294d66 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 17:35:52 -0400
Subject: [PATCH 73/76] [#.0.x] - upgrading to v5.0.0 stable

---
 .github/workflows/main.yml  |  2 +-
 CHANGELOG-5.0.md            |  2 +-
 config.json                 |  2 +-
 package.xml                 | 48 ++++++++++++++++++-------------------
 phalcon/Support/Version.zep |  2 +-
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dcd7d31fc01..79029757456 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.0.0RC4
+  PHALCON_VERSION: 5.0.0
   ZEPHIR_PARSER_VERSION: 1.5.1
   ZEPHIR_VERSION: 0.16.3
 
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 56869732609..8a2f71dcde3 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -1,4 +1,4 @@
-# [5.0.0](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0) (xxxx-xx-xx)
+# [5.0.0](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0) (2022-09-22)
 
 ## Changed
 - Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072) 
diff --git a/config.json b/config.json
index 5b23917083f..589309e01da 100644
--- a/config.json
+++ b/config.json
@@ -3,7 +3,7 @@
   "name": "phalcon",
   "description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.",
   "author": "Phalcon Team and contributors",
-  "version": "5.0.0RC4",
+  "version": "5.0.0",
   "verbose": false,
   "stubs": {
     "path": "ide\/%version%\/%namespace%\/",
diff --git a/package.xml b/package.xml
index 7da7a605baf..0fcade04ab1 100644
--- a/package.xml
+++ b/package.xml
@@ -22,41 +22,39 @@
     <email>nikos@phalcon.io</email>
     <active>yes</active>
   </lead>
-  <date>2022-08-08</date>
+  <date>2022-09-22</date>
   <time>17:00:00</time>
   <version>
-    <release>5.0.0RC4</release>
-    <api>5.0.0RC4</api>
+    <release>5.0.0</release>
+    <api>5.0.0</api>
   </version>
   <stability>
-    <release>beta</release>
-    <api>beta</api>
+    <release>stable</release>
+    <api>stable</api>
   </stability>
   <license uri="https://license.phalcon.io">BSD 3-Clause License</license>
   <notes>
     Full changelog can be found at: https://github.com/phalcon/cphalcon/blob/master/CHANGELOG-5.0.md
 
+    ## Changed
+    - Changed `Phalcon\Logger\Adapter\Stream::process` to open the log file, check for locks, write contents and close the stream [#16072](https://github.com/phalcon/cphalcon/issues/16072)
+    - Changed getters and setters from shorthand format to full methods [#16102](https://github.com/phalcon/cphalcon/issues/16102)
+    - Changed return types to `array` in `Phalcon\Annotations\Reflection` class methods [#16106](https://github.com/phalcon/cphalcon/issues/16106)
+    - Changed `Phalcon\Html\Escaper::attributes()` to also accept an array of attributes [#16108](https://github.com/phalcon/cphalcon/issues/16108)
+
     ## Fixed
-    - Reverted to single quotes when volt code generates PHP code.
-    - Any `tag` helpers only accept parameters with double quotes
-    - Renamed `Phalcon\Tag::form()` to `Phalcon\Tag::formLegacy` (helper `form_legacy`) [#16019](https://github.com/phalcon/cphalcon/issues/16019)
-    - Fixed
-    - `Phalcon\Cli\Router::getMatchedRoute()`
-    - `Phalcon\Cli\RouterInterface::getMatchedRoute()`
-    - `Phalcon\Mvc\Router::getMatchedRoute()`
-    - `Phalcon\Mvc\RouterInterface::getMatchedRoute()` to return `RouterInterface` or `null` [#16030](https://github.com/phalcon/cphalcon/issues/16030)
-    - Fixed
-    - `Phalcon/Storage/Serializer/Base64::unserialize()`
-    - `Phalcon/Storage/Serializer/Igbinary::unserialize()`
-    - `Phalcon/Storage/Serializer/Igbinary::serialize()`
-    - `Phalcon/Storage/Serializer/Php::unserialize()` to reset isSuccess value [#16040](https://github.com/phalcon/cphalcon/issues/16040)
-    - Fixed `Phalcon\Paginator\Adapter\Model::paginate()` fix group parameter breaking total items [#16042](https://github.com/phalcon/cphalcon/issues/16042)
-    - Fixed `Phalcon\Mvc\Model::doLowUpdate()` prevent RawValue getting overwritten [#16037](https://github.com/phalcon/cphalcon/issues/16037)
-    - Refactored `Phalcon\Image\*`
-    - Reorganized code in the image adapters
-    - Simplified various areas, speeding up processing
-    - Removed `getInternalImImage()` (same as `getImage()`) for `Phalcon\Image\Adapter\Imagick`
-    - Added better support for webm images [#15977](https://github.com/phalcon/cphalcon/issues/15977)
+    - Fixed and improved return type of `object` and `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
+    - Fixed `Phalcon\Filter\Validation\Validator\Digit` to use only strings for `ctype_*` calls [#16064](https://github.com/phalcon/cphalcon/issues/16064)
+    - Fixed `Phalcon\Flash\AbstractFlash::outputMessage` to return the message (implicitFlush) [#16063](https://github.com/phalcon/cphalcon/issues/16063)
+    - Fixed `Phalcon\Filter\Validation\Validator\Numericality` to correctly detect illegal characters within string numbers [#16070](https://github.com/phalcon/cphalcon/issues/16070)
+    - Fixed segmentation fault on Reflection of `Phalcon\Mvc\Model` class [#16080](https://github.com/phalcon/cphalcon/issues/16080)
+    - Fixed segmentation fault on Reflection [#16096](https://github.com/phalcon/cphalcon/issues/16096)
+
+    ## Added
+    - Added `Phalcon\Encryption\Security\JWT\Token::validate()` to validate a token's claims [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+    - Added `Phalcon\Encryption\Security\JWT\Token::verify()` to verify a token's signature [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+    - Added `Phalcon\Encryption\Security\JWT\Validator::getErrors()` to return any errors with the validation as an array [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+
 
   </notes>
   <contents>
diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep
index cf350e030ad..c45d18628af 100644
--- a/phalcon/Support/Version.zep
+++ b/phalcon/Support/Version.zep
@@ -77,7 +77,7 @@ class Version
      */
     protected function getVersion() -> array
     {
-        return [5, 0, 0, 3, 4];
+        return [5, 0, 0, 4, 0];
     }
 
     /**

From a61c4c18d3ebc73848fd28d6f6363623691a82c0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 18:37:50 -0400
Subject: [PATCH 74/76] [#.0.x] - fixed getSpecial() for stable version

---
 phalcon/Support/Version.zep                | 5 ++++-
 tests/unit/Support/Version/GetPartCest.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep
index c45d18628af..b8e92ade186 100644
--- a/phalcon/Support/Version.zep
+++ b/phalcon/Support/Version.zep
@@ -85,7 +85,7 @@ class Version
      */
     protected final function getSpecial(int special) -> string
     {
-        string suffix = "";
+        var suffix;
 
         switch special {
             case 1:
@@ -97,6 +97,9 @@ class Version
             case 3:
                 let suffix = "RC";
                 break;
+            default:
+                let suffix = "";
+                break;
         }
 
         return suffix;
diff --git a/tests/unit/Support/Version/GetPartCest.php b/tests/unit/Support/Version/GetPartCest.php
index 2f4e7ae3ae1..10e43a0afa4 100644
--- a/tests/unit/Support/Version/GetPartCest.php
+++ b/tests/unit/Support/Version/GetPartCest.php
@@ -57,11 +57,11 @@ public function supportVersionGetPart(UnitTester $I)
         $actual   = $version->getPart(Version::VERSION_MINOR);
         $I->assertSame($expected, $actual);
 
-        $expected = $this->numberToSpecial($id[5]);
+        $expected = $this->numberToSpecial((string) $id[5]);
         $actual   = $version->getPart(Version::VERSION_SPECIAL);
         $I->assertSame($expected, $actual);
 
-        $special  = $this->numberToSpecial($id[5]);
+        $special  = $this->numberToSpecial((string) $id[6]);
         $expected = (string) (($special) ? $id[6] : 0);
         $actual   = $version->getPart(Version::VERSION_SPECIAL_NUMBER);
         $I->assertSame($expected, $actual);

From c8e12bbf9a6d98deed2b374b69f1983dc4049e9d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 18:37:58 -0400
Subject: [PATCH 75/76] [#.0.x] - regenerating ext

---
 ext/phalcon/annotations/collection.zep.h      |  2 +-
 ext/phalcon/di/di.zep.h                       |  2 +-
 ext/phalcon/forms/form.zep.h                  |  2 +-
 ext/phalcon/messages/messages.zep.h           |  2 +-
 ext/phalcon/mvc/micro.zep.h                   |  2 +-
 ext/phalcon/mvc/model/resultset.zep.h         |  2 +-
 ext/phalcon/mvc/model/resultset/complex.zep.h |  2 +-
 ext/phalcon/mvc/model/row.zep.h               |  2 +-
 ext/phalcon/storage/serializer/none.zep.h     |  2 +-
 ext/phalcon/storage/serializer/php.zep.h      |  2 +-
 ext/phalcon/support/collection.zep.h          |  2 +-
 ext/phalcon/support/registry.zep.h            |  2 +-
 ext/phalcon/support/version.zep.c             | 35 ++++++++++---------
 .../translate/adapter/abstractadapter.zep.h   |  2 +-
 ext/php_phalcon.h                             |  2 +-
 15 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/ext/phalcon/annotations/collection.zep.h b/ext/phalcon/annotations/collection.zep.h
index 82c2ec4e30e..3e1ae8da6d0 100644
--- a/ext/phalcon/annotations/collection.zep.h
+++ b/ext/phalcon/annotations/collection.zep.h
@@ -29,7 +29,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/di/di.zep.h b/ext/phalcon/di/di.zep.h
index 40be02f13f3..51faf51b452 100644
--- a/ext/phalcon/di/di.zep.h
+++ b/ext/phalcon/di/di.zep.h
@@ -103,7 +103,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/forms/form.zep.h b/ext/phalcon/forms/form.zep.h
index a4161087847..b7fc1e55206 100644
--- a/ext/phalcon/forms/form.zep.h
+++ b/ext/phalcon/forms/form.zep.h
@@ -79,7 +79,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/messages/messages.zep.h b/ext/phalcon/messages/messages.zep.h
index 63991220055..4c24cc42012 100644
--- a/ext/phalcon/messages/messages.zep.h
+++ b/ext/phalcon/messages/messages.zep.h
@@ -61,7 +61,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/micro.zep.h b/ext/phalcon/mvc/micro.zep.h
index e236cf95e50..c5d46102210 100644
--- a/ext/phalcon/mvc/micro.zep.h
+++ b/ext/phalcon/mvc/micro.zep.h
@@ -144,7 +144,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/model/resultset.zep.h b/ext/phalcon/mvc/model/resultset.zep.h
index 25e514c9c8e..cf912c1c505 100644
--- a/ext/phalcon/mvc/model/resultset.zep.h
+++ b/ext/phalcon/mvc/model/resultset.zep.h
@@ -78,7 +78,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.h b/ext/phalcon/mvc/model/resultset/complex.zep.h
index 6954f9507e5..7c88947f648 100644
--- a/ext/phalcon/mvc/model/resultset/complex.zep.h
+++ b/ext/phalcon/mvc/model/resultset/complex.zep.h
@@ -20,7 +20,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/mvc/model/row.zep.h b/ext/phalcon/mvc/model/row.zep.h
index 226a0668038..ae5b4249926 100644
--- a/ext/phalcon/mvc/model/row.zep.h
+++ b/ext/phalcon/mvc/model/row.zep.h
@@ -19,7 +19,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h
index 8104c8a302c..a8b9cbf0bdd 100644
--- a/ext/phalcon/storage/serializer/none.zep.h
+++ b/ext/phalcon/storage/serializer/none.zep.h
@@ -9,7 +9,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize);
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h
index ce6bc2f91f0..e08b0daf6d9 100644
--- a/ext/phalcon/storage/serializer/php.zep.h
+++ b/ext/phalcon/storage/serializer/php.zep.h
@@ -23,7 +23,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1)
 #endif
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
diff --git a/ext/phalcon/support/collection.zep.h b/ext/phalcon/support/collection.zep.h
index b597fbecd35..7d53f828a2f 100644
--- a/ext/phalcon/support/collection.zep.h
+++ b/ext/phalcon/support/collection.zep.h
@@ -107,7 +107,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/support/registry.zep.h b/ext/phalcon/support/registry.zep.h
index 0f24b23d6b7..36411810765 100644
--- a/ext/phalcon/support/registry.zep.h
+++ b/ext/phalcon/support/registry.zep.h
@@ -91,7 +91,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c
index b6c38def560..529d6e33c20 100644
--- a/ext/phalcon/support/version.zep.c
+++ b/ext/phalcon/support/version.zep.c
@@ -133,9 +133,8 @@ PHP_METHOD(Phalcon_Support_Version, getVersion)
  */
 PHP_METHOD(Phalcon_Support_Version, getSpecial)
 {
-	zval suffix;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *special_param = NULL;
+	zval *special_param = NULL, suffix;
 	zend_long special;
 	zval *this_ptr = getThis();
 
@@ -153,10 +152,9 @@ PHP_METHOD(Phalcon_Support_Version, getSpecial)
 	special = zephir_get_intval(special_param);
 
 
-	ZEPHIR_INIT_VAR(&suffix);
 	do {
 		if (special == 1) {
-			ZEPHIR_INIT_NVAR(&suffix);
+			ZEPHIR_INIT_VAR(&suffix);
 			ZVAL_STRING(&suffix, "alpha");
 			break;
 		}
@@ -170,9 +168,12 @@ PHP_METHOD(Phalcon_Support_Version, getSpecial)
 			ZVAL_STRING(&suffix, "RC");
 			break;
 		}
+		ZEPHIR_INIT_NVAR(&suffix);
+		ZVAL_STRING(&suffix, "");
+		break;
 	} while(0);
 
-	RETURN_CTOR(&suffix);
+	RETURN_CCTOR(&suffix);
 }
 
 /**
@@ -206,15 +207,15 @@ PHP_METHOD(Phalcon_Support_Version, get)
 	ZEPHIR_CALL_METHOD(&version, this_ptr, "getversion", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&major);
-	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 119);
+	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 122);
 	ZEPHIR_OBS_VAR(&medium);
-	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 120);
+	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 123);
 	ZEPHIR_OBS_VAR(&minor);
-	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 121);
+	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 124);
 	ZEPHIR_OBS_VAR(&special);
-	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 122);
+	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 125);
 	ZEPHIR_OBS_VAR(&specialNumber);
-	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 123);
+	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 126);
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_VSVSV(&_0, &major, ".", &medium, ".", &minor);
 	zephir_get_strval(&result, &_0);
@@ -259,15 +260,15 @@ PHP_METHOD(Phalcon_Support_Version, getId)
 	ZEPHIR_CALL_METHOD(&version, this_ptr, "getversion", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&major);
-	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 157);
+	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 160);
 	ZEPHIR_OBS_VAR(&medium);
-	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 158);
+	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 161);
 	ZEPHIR_OBS_VAR(&minor);
-	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 159);
+	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 162);
 	ZEPHIR_OBS_VAR(&special);
-	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 160);
+	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 163);
 	ZEPHIR_OBS_VAR(&specialNumber);
-	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 161);
+	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 164);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "%02s");
 	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 113, &_0, &medium);
@@ -318,12 +319,12 @@ PHP_METHOD(Phalcon_Support_Version, getPart)
 	do {
 		if (part == 0 || part == 1 || part == 2 || part == 4) {
 			ZEPHIR_OBS_VAR(&_0$$3);
-			zephir_array_fetch_long(&_0$$3, &version, part, PH_NOISY, "phalcon/Support/Version.zep", 189);
+			zephir_array_fetch_long(&_0$$3, &version, part, PH_NOISY, "phalcon/Support/Version.zep", 192);
 			zephir_cast_to_string(&_1$$3, &_0$$3);
 			RETURN_CTOR(&_1$$3);
 		}
 		if (part == 3) {
-			zephir_array_fetch_long(&_2$$4, &version, 3, PH_NOISY | PH_READONLY, "phalcon/Support/Version.zep", 192);
+			zephir_array_fetch_long(&_2$$4, &version, 3, PH_NOISY | PH_READONLY, "phalcon/Support/Version.zep", 195);
 			ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getspecial", NULL, 0, &_2$$4);
 			zephir_check_call_status();
 			RETURN_MM();
diff --git a/ext/phalcon/translate/adapter/abstractadapter.zep.h b/ext/phalcon/translate/adapter/abstractadapter.zep.h
index 7814b8790a8..089b550c641 100644
--- a/ext/phalcon/translate/adapter/abstractadapter.zep.h
+++ b/ext/phalcon/translate/adapter/abstractadapter.zep.h
@@ -37,7 +37,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, translateKey)
 ZEND_END_ARG_INFO()
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
index 9aff78e9f6c..b66bf525eef 100644
--- a/ext/php_phalcon.h
+++ b/ext/php_phalcon.h
@@ -14,7 +14,7 @@
 #define PHP_PHALCON_VERSION     "5.0.0"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
+#define PHP_PHALCON_ZEPVERSION  "0.16.3-5099f34"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db { 

From 1f59b6317658d4450031c8f163d98929812a8d6f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 18:38:07 -0400
Subject: [PATCH 76/76] [#.0.x] - regenerating optimized files

---
 build/phalcon/phalcon.zep.c | 35 ++++++++++++++++++-----------------
 build/phalcon/phalcon.zep.h | 26 +++++++++++++-------------
 build/phalcon/php_phalcon.h |  2 +-
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
index 04ad5b1582a..3127080f232 100644
--- a/build/phalcon/phalcon.zep.c
+++ b/build/phalcon/phalcon.zep.c
@@ -92682,9 +92682,8 @@ static PHP_METHOD(Phalcon_Support_Version, getVersion)
 
 static PHP_METHOD(Phalcon_Support_Version, getSpecial)
 {
-	zval suffix;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *special_param = NULL;
+	zval *special_param = NULL, suffix;
 	zend_long special;
 	zval *this_ptr = getThis();
 
@@ -92702,10 +92701,9 @@ static PHP_METHOD(Phalcon_Support_Version, getSpecial)
 	special = zephir_get_intval(special_param);
 
 
-	ZEPHIR_INIT_VAR(&suffix);
 	do {
 		if (special == 1) {
-			ZEPHIR_INIT_NVAR(&suffix);
+			ZEPHIR_INIT_VAR(&suffix);
 			ZVAL_STRING(&suffix, "alpha");
 			break;
 		}
@@ -92719,9 +92717,12 @@ static PHP_METHOD(Phalcon_Support_Version, getSpecial)
 			ZVAL_STRING(&suffix, "RC");
 			break;
 		}
+		ZEPHIR_INIT_NVAR(&suffix);
+		ZVAL_STRING(&suffix, "");
+		break;
 	} while(0);
 
-	RETURN_CTOR(&suffix);
+	RETURN_CCTOR(&suffix);
 }
 
 static PHP_METHOD(Phalcon_Support_Version, get)
@@ -92748,15 +92749,15 @@ static PHP_METHOD(Phalcon_Support_Version, get)
 	ZEPHIR_CALL_METHOD(&version, this_ptr, "getversion", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&major);
-	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 119);
+	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 122);
 	ZEPHIR_OBS_VAR(&medium);
-	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 120);
+	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 123);
 	ZEPHIR_OBS_VAR(&minor);
-	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 121);
+	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 124);
 	ZEPHIR_OBS_VAR(&special);
-	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 122);
+	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 125);
 	ZEPHIR_OBS_VAR(&specialNumber);
-	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 123);
+	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 126);
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_VSVSV(&_0, &major, ".", &medium, ".", &minor);
 	zephir_get_strval(&result, &_0);
@@ -92794,15 +92795,15 @@ static PHP_METHOD(Phalcon_Support_Version, getId)
 	ZEPHIR_CALL_METHOD(&version, this_ptr, "getversion", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_OBS_VAR(&major);
-	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 157);
+	zephir_array_fetch_long(&major, &version, 0, PH_NOISY, "phalcon/Support/Version.zep", 160);
 	ZEPHIR_OBS_VAR(&medium);
-	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 158);
+	zephir_array_fetch_long(&medium, &version, 1, PH_NOISY, "phalcon/Support/Version.zep", 161);
 	ZEPHIR_OBS_VAR(&minor);
-	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 159);
+	zephir_array_fetch_long(&minor, &version, 2, PH_NOISY, "phalcon/Support/Version.zep", 162);
 	ZEPHIR_OBS_VAR(&special);
-	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 160);
+	zephir_array_fetch_long(&special, &version, 3, PH_NOISY, "phalcon/Support/Version.zep", 163);
 	ZEPHIR_OBS_VAR(&specialNumber);
-	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 161);
+	zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 164);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "%02s");
 	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 113, &_0, &medium);
@@ -92845,12 +92846,12 @@ static PHP_METHOD(Phalcon_Support_Version, getPart)
 	do {
 		if (part == 0 || part == 1 || part == 2 || part == 4) {
 			ZEPHIR_OBS_VAR(&_0$$3);
-			zephir_array_fetch_long(&_0$$3, &version, part, PH_NOISY, "phalcon/Support/Version.zep", 189);
+			zephir_array_fetch_long(&_0$$3, &version, part, PH_NOISY, "phalcon/Support/Version.zep", 192);
 			zephir_cast_to_string(&_1$$3, &_0$$3);
 			RETURN_CTOR(&_1$$3);
 		}
 		if (part == 3) {
-			zephir_array_fetch_long(&_2$$4, &version, 3, PH_NOISY | PH_READONLY, "phalcon/Support/Version.zep", 192);
+			zephir_array_fetch_long(&_2$$4, &version, 3, PH_NOISY | PH_READONLY, "phalcon/Support/Version.zep", 195);
 			ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getspecial", NULL, 0, &_2$$4);
 			zephir_check_call_status();
 			RETURN_MM();
diff --git a/build/phalcon/phalcon.zep.h b/build/phalcon/phalcon.zep.h
index 9624dfde9f1..57eef7c04b9 100644
--- a/build/phalcon/phalcon.zep.h
+++ b/build/phalcon/phalcon.zep.h
@@ -1383,7 +1383,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_collection_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
@@ -1516,7 +1516,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize);
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
@@ -5405,7 +5405,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_abstractadapter_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, translateKey)
 ZEND_END_ARG_INFO()
@@ -6357,7 +6357,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_di_di_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
@@ -7572,7 +7572,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
@@ -13518,7 +13518,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_annotations_collection_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
@@ -20931,7 +20931,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_forms_form_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
@@ -24238,7 +24238,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_messages_messages_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
@@ -24579,7 +24579,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
@@ -27732,7 +27732,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0)
 #endif
 ZEND_END_ARG_INFO()
 
@@ -27840,7 +27840,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_row_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
@@ -30468,7 +30468,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1)
 #endif
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 #if PHP_VERSION_ID >= 80000
@@ -32011,7 +32011,7 @@ ZEND_END_ARG_INFO()
 #if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_MIXED, 0)
 #else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 1, IS_NULL, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_support_registry_offsetget, 0, 0, 1)
 #endif
 	ZEND_ARG_INFO(0, element)
 ZEND_END_ARG_INFO()
diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h
index 22f4d2df3cf..4ae6a155b98 100644
--- a/build/phalcon/php_phalcon.h
+++ b/build/phalcon/php_phalcon.h
@@ -106,7 +106,7 @@ typedef zend_function zephir_fcall_cache_entry;
 #define PHP_PHALCON_VERSION     "5.0.0"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
-#define PHP_PHALCON_ZEPVERSION  "0.16.2-3e961ab"
+#define PHP_PHALCON_ZEPVERSION  "0.16.3-5099f34"
 #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance."
 
 typedef struct _zephir_struct_db {