From 040bc8d9f47acf20acda79a59788a9795b916e48 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 11 Sep 2021 11:06:44 +0100
Subject: [PATCH 1/4] Update stubs of Phalcon v5.0.0-alpha.3

---
 src/Acl/Adapter/AbstractAdapter.php           |  1 +
 src/Acl/Adapter/AdapterInterface.php          |  3 +++
 src/Acl/Adapter/Memory.php                    |  9 +++++++
 src/Annotations/Adapter/AbstractAdapter.php   |  5 ++--
 src/Annotations/Adapter/AdapterInterface.php  |  2 +-
 src/Annotations/Adapter/Apcu.php              |  2 ++
 src/Annotations/Adapter/Memory.php            |  2 ++
 src/Annotations/Adapter/Stream.php            |  4 +++
 src/Annotations/AnnotationsFactory.php        |  1 +
 src/Annotations/Collection.php                |  3 +++
 src/Annotations/Reader.php                    |  2 ++
 src/Application/AbstractApplication.php       |  1 +
 src/Assets/Asset/Css.php                      |  2 ++
 src/Assets/Asset/Js.php                       |  2 ++
 src/Assets/Collection.php                     |  7 ++++++
 src/Assets/Filters/Cssmin.php                 |  2 ++
 src/Assets/Filters/Jsmin.php                  |  2 ++
 src/Assets/Filters/None.php                   |  2 ++
 src/Assets/Inline/Css.php                     |  2 ++
 src/Assets/Inline/Js.php                      |  2 ++
 src/Assets/Manager.php                        |  6 +++++
 src/Cache.php                                 |  2 ++
 src/Cache/Adapter/Apcu.php                    |  1 +
 src/Cache/Adapter/Libmemcached.php            |  1 +
 src/Cache/Adapter/Memory.php                  |  1 +
 src/Cache/Adapter/Redis.php                   |  1 +
 src/Cache/Adapter/Stream.php                  |  1 +
 src/Cache/CacheFactory.php                    |  6 +++++
 src/Cli/Console.php                           |  4 +++
 src/Cli/Dispatcher.php                        |  5 ++++
 src/Cli/Router.php                            |  5 +++-
 src/Cli/Task.php                              |  1 +
 src/Collection.php                            |  8 ++++++
 src/Collection/Exception.php                  |  2 ++
 src/Config.php                                |  2 ++
 src/Config/Adapter/Grouped.php                |  4 +++
 src/Config/Adapter/Ini.php                    |  1 +
 src/Config/Adapter/Json.php                   |  1 +
 src/Config/Adapter/Yaml.php                   |  1 +
 src/Config/ConfigFactory.php                  |  3 +++
 src/Config/ConfigInterface.php                |  2 ++
 src/Container.php                             |  1 +
 src/Crypt.php                                 |  2 ++
 src/DataMapper/Pdo/Connection.php             |  2 ++
 src/DataMapper/Pdo/Connection/Decorated.php   |  1 +
 src/DataMapper/Pdo/Profiler/Profiler.php      |  3 +++
 src/DataMapper/Query/AbstractConditions.php   |  2 ++
 src/DataMapper/Query/Select.php               |  3 +++
 src/Db/AbstractDb.php                         |  2 ++
 src/Db/Adapter/AbstractAdapter.php            |  7 ++++++
 src/Db/Adapter/AdapterInterface.php           |  7 ++++--
 src/Db/Adapter/Pdo/AbstractPdo.php            |  6 ++++-
 src/Db/Adapter/Pdo/Mysql.php                  | 10 ++++++++
 src/Db/Adapter/Pdo/Postgresql.php             |  8 ++++++
 src/Db/Adapter/Pdo/Sqlite.php                 |  9 +++++++
 src/Db/Adapter/PdoFactory.php                 |  1 +
 src/Db/Dialect/Mysql.php                      |  6 +++++
 src/Db/Dialect/Postgresql.php                 |  6 +++++
 src/Db/Dialect/Sqlite.php                     |  6 +++++
 src/Db/Result/Pdo.php                         |  3 ++-
 src/Di.php                                    |  8 ++++++
 src/Di/DiInterface.php                        |  2 ++
 src/Di/FactoryDefault.php                     |  2 ++
 src/Di/FactoryDefault/Cli.php                 |  2 ++
 src/Di/Injectable.php                         |  1 +
 src/Di/Service.php                            |  4 +++
 src/Di/Service/Builder.php                    |  3 +++
 src/Dispatcher/AbstractDispatcher.php         | 10 ++++++--
 src/Escaper.php                               | 12 ++++++---
 src/Events/Manager.php                        |  3 +++
 src/Factory/AbstractFactory.php               |  3 +++
 src/Filter.php                                |  4 +++
 src/Filter/FilterFactory.php                  |  2 ++
 src/Flash/AbstractFlash.php                   |  2 ++
 src/Flash/Exception.php                       |  2 +-
 src/Flash/Session.php                         |  1 +
 src/Forms/Element/AbstractElement.php         |  5 ++++
 src/Forms/Element/Check.php                   |  2 ++
 src/Forms/Element/Date.php                    |  2 ++
 src/Forms/Element/ElementInterface.php        |  2 ++
 src/Forms/Element/Email.php                   |  2 ++
 src/Forms/Element/File.php                    |  2 ++
 src/Forms/Element/Hidden.php                  |  2 ++
 src/Forms/Element/Numeric.php                 |  2 ++
 src/Forms/Element/Password.php                |  2 ++
 src/Forms/Element/Radio.php                   |  2 ++
 src/Forms/Element/Select.php                  |  2 ++
 src/Forms/Element/Submit.php                  |  2 ++
 src/Forms/Element/Text.php                    |  2 ++
 src/Forms/Element/TextArea.php                |  2 ++
 src/Forms/Form.php                            |  6 +++++
 src/Helper/Arr.php                            |  2 ++
 src/Helper/Json.php                           |  2 ++
 src/Helper/Str.php                            |  2 ++
 src/Html/Attributes.php                       |  2 ++
 src/Html/Breadcrumbs.php                      |  2 ++
 src/Html/Helper/Form.php                      |  2 +-
 src/Html/Helper/Input/Checkbox.php            |  1 +
 src/Html/Helper/Input/Select.php              |  2 +-
 src/Html/Helper/Input/Textarea.php            |  1 +
 src/Html/Link/EvolvableLink.php               |  2 +-
 src/Html/TagFactory.php                       |  1 +
 src/Http/Cookie.php                           |  7 ++++++
 src/Http/Message/AbstractCommon.php           |  2 ++
 src/Http/Message/AbstractRequest.php          |  2 ++
 .../Exception/InvalidArgumentException.php    |  2 ++
 src/Http/Message/Request.php                  |  2 ++
 src/Http/Message/RequestFactory.php           |  2 +-
 src/Http/Message/Response.php                 | 11 ++++++++
 src/Http/Message/ResponseFactory.php          |  2 +-
 src/Http/Message/ServerRequest.php            | 19 ++++++++++++++
 src/Http/Message/ServerRequestFactory.php     |  4 ++-
 src/Http/Message/Stream.php                   |  3 +++
 src/Http/Message/StreamFactory.php            |  1 +
 src/Http/Message/UploadedFile.php             |  3 +++
 src/Http/Message/UploadedFileFactory.php      |  2 +-
 src/Http/Message/Uri.php                      |  2 ++
 src/Http/Request.php                          | 10 +++++++-
 src/Http/Request/File.php                     |  2 ++
 src/Http/RequestInterface.php                 |  5 +++-
 src/Http/Response.php                         | 14 +++++++++--
 src/Http/Response/Cookies.php                 |  2 ++
 src/Http/Response/Headers.php                 |  2 +-
 src/Http/ResponseInterface.php                |  1 +
 src/Image/Adapter/AbstractAdapter.php         |  1 +
 src/Image/Adapter/Gd.php                      |  3 +++
 src/Image/Adapter/Imagick.php                 |  3 +++
 src/Image/ImageFactory.php                    |  2 ++
 src/Loader.php                                |  2 ++
 src/Logger.php                                |  3 +++
 src/Logger/Adapter/AbstractAdapter.php        |  3 +++
 src/Logger/Adapter/AdapterInterface.php       |  1 +
 src/Logger/Adapter/Noop.php                   |  2 ++
 src/Logger/Adapter/Stream.php                 |  6 +++++
 src/Logger/Adapter/Syslog.php                 |  8 ++++++
 src/Logger/Formatter/AbstractFormatter.php    |  5 ++++
 src/Logger/Formatter/FormatterInterface.php   |  2 ++
 src/Logger/Formatter/Json.php                 |  4 +++
 src/Logger/Formatter/Line.php                 |  4 +++
 src/Logger/LoggerFactory.php                  |  3 +++
 src/Messages/Message.php                      |  2 ++
 src/Messages/Messages.php                     |  5 ++++
 src/Mvc/Application.php                       |  7 ++++++
 src/Mvc/Dispatcher.php                        |  5 ++++
 src/Mvc/Micro.php                             | 13 +++++++++-
 src/Mvc/Micro/LazyLoader.php                  |  2 ++
 src/Mvc/Micro/MiddlewareInterface.php         |  2 ++
 src/Mvc/Model.php                             | 25 ++++++++++++++++++-
 src/Mvc/Model/Behavior.php                    |  2 ++
 src/Mvc/Model/Behavior/SoftDelete.php         |  2 ++
 src/Mvc/Model/Behavior/Timestampable.php      |  3 +++
 src/Mvc/Model/BehaviorInterface.php           |  2 ++
 src/Mvc/Model/Binder.php                      |  5 ++++
 src/Mvc/Model/Criteria.php                    |  3 +++
 src/Mvc/Model/CriteriaInterface.php           |  2 ++
 src/Mvc/Model/Manager.php                     |  5 +++-
 src/Mvc/Model/ManagerInterface.php            |  2 +-
 src/Mvc/Model/MetaData.php                    |  3 +++
 src/Mvc/Model/MetaData/Apcu.php               |  3 +++
 src/Mvc/Model/MetaData/Libmemcached.php       |  3 +++
 src/Mvc/Model/MetaData/Memory.php             |  1 +
 src/Mvc/Model/MetaData/Redis.php              |  2 ++
 .../Model/MetaData/Strategy/Annotations.php   |  6 +++++
 .../Model/MetaData/Strategy/Introspection.php |  7 ++++++
 .../MetaData/Strategy/StrategyInterface.php   |  3 +++
 src/Mvc/Model/MetaData/Stream.php             |  1 +
 src/Mvc/Model/MetaDataInterface.php           |  1 +
 src/Mvc/Model/Query.php                       | 13 +++++++++-
 src/Mvc/Model/Query/Builder.php               |  5 ++++
 src/Mvc/Model/Query/Status.php                |  1 +
 src/Mvc/Model/Query/StatusInterface.php       |  1 +
 src/Mvc/Model/Resultset.php                   | 11 ++++++++
 src/Mvc/Model/Resultset/Complex.php           |  9 +++++++
 src/Mvc/Model/Resultset/Simple.php            |  5 ++++
 src/Mvc/Model/ResultsetInterface.php          |  2 ++
 src/Mvc/Model/Row.php                         |  3 +++
 src/Mvc/Model/Transaction.php                 |  4 ++-
 src/Mvc/Model/Transaction/Manager.php         |  3 +++
 src/Mvc/Model/TransactionInterface.php        |  3 +++
 src/Mvc/ModelInterface.php                    |  5 +++-
 src/Mvc/ModuleDefinitionInterface.php         |  2 ++
 src/Mvc/Router.php                            |  5 ++++
 src/Mvc/Router/Annotations.php                |  2 ++
 src/Mvc/RouterInterface.php                   |  1 +
 src/Mvc/View.php                              |  7 ++++++
 src/Mvc/View/Engine/Volt.php                  |  3 +++
 src/Mvc/View/Engine/Volt/Compiler.php         |  2 ++
 src/Mvc/View/Engine/Volt/Exception.php        |  2 ++
 src/Mvc/View/Simple.php                       |  7 ++++++
 src/Mvc/ViewBaseInterface.php                 |  2 ++
 src/Paginator/Adapter/AbstractAdapter.php     |  6 +++--
 src/Paginator/Adapter/Model.php               |  4 +++
 src/Paginator/Adapter/NativeArray.php         |  1 +
 src/Paginator/Adapter/QueryBuilder.php        |  2 ++
 src/Paginator/PaginatorFactory.php            |  3 ++-
 src/Paginator/Repository.php                  |  3 +++
 src/Security.php                              |  2 ++
 src/Security/JWT/Builder.php                  |  6 +++++
 .../UnsupportedAlgorithmException.php         |  1 +
 .../JWT/Exceptions/ValidatorException.php     |  1 +
 src/Security/JWT/Token/Parser.php             |  5 ++++
 src/Security/JWT/Validator.php                |  1 +
 src/Session/Adapter/AbstractAdapter.php       |  4 +--
 src/Session/Adapter/Libmemcached.php          |  3 +++
 src/Session/Adapter/Noop.php                  |  5 ++--
 src/Session/Adapter/Redis.php                 |  3 +++
 src/Session/Adapter/Stream.php                |  8 ++++--
 src/Session/Bag.php                           |  2 ++
 src/Session/Manager.php                       |  5 +++-
 src/Session/ManagerInterface.php              |  1 +
 src/Storage/Adapter/AbstractAdapter.php       |  7 +++++-
 src/Storage/Adapter/AdapterInterface.php      |  2 ++
 src/Storage/Adapter/Apcu.php                  |  6 +++++
 src/Storage/Adapter/Libmemcached.php          |  3 +++
 src/Storage/Adapter/Memory.php                |  4 +++
 src/Storage/Adapter/Redis.php                 |  3 +++
 src/Storage/Adapter/Stream.php                |  7 ++++++
 src/Storage/Serializer/AbstractSerializer.php |  2 ++
 src/Storage/Serializer/Base64.php             |  2 ++
 src/Storage/Serializer/Json.php               |  4 +++
 src/Storage/Serializer/None.php               |  2 ++
 src/Storage/Serializer/Php.php                |  3 +++
 .../Serializer/SerializerInterface.php        |  2 ++
 src/Support/Debug.php                         |  6 +++++
 src/Support/Debug/Dump.php                    |  7 ++++++
 src/Tag.php                                   |  6 +++++
 src/Tag/Select.php                            |  4 +++
 src/Text.php                                  |  2 ++
 src/Translate/Adapter/AbstractAdapter.php     |  2 ++
 src/Translate/Adapter/Csv.php                 |  4 +++
 src/Translate/Adapter/Gettext.php             |  4 +++
 src/Translate/Adapter/NativeArray.php         |  4 +++
 .../Interpolator/AssociativeArray.php         |  2 ++
 src/Translate/TranslateFactory.php            |  2 ++
 src/Url.php                                   |  3 +++
 src/Validation.php                            |  4 +++
 src/Validation/AbstractValidator.php          |  2 ++
 src/Validation/AbstractValidatorComposite.php |  2 ++
 src/Validation/ValidationInterface.php        |  2 ++
 src/Validation/Validator/Alnum.php            |  1 +
 src/Validation/Validator/Alpha.php            |  2 ++
 src/Validation/Validator/Between.php          |  2 ++
 src/Validation/Validator/Callback.php         |  3 +++
 src/Validation/Validator/Confirmation.php     |  3 +++
 src/Validation/Validator/CreditCard.php       |  2 ++
 src/Validation/Validator/Date.php             |  3 +++
 src/Validation/Validator/Digit.php            |  2 ++
 src/Validation/Validator/Email.php            |  2 ++
 src/Validation/Validator/ExclusionIn.php      |  3 +++
 src/Validation/Validator/File.php             | 10 ++++++++
 .../Validator/File/AbstractFile.php           |  1 +
 src/Validation/Validator/File/MimeType.php    |  2 ++
 .../Validator/File/Resolution/Equal.php       |  2 ++
 .../Validator/File/Resolution/Max.php         |  2 ++
 .../Validator/File/Resolution/Min.php         |  2 ++
 src/Validation/Validator/File/Size/Equal.php  |  2 ++
 src/Validation/Validator/File/Size/Max.php    |  2 ++
 src/Validation/Validator/File/Size/Min.php    |  2 ++
 src/Validation/Validator/Identical.php        |  2 ++
 src/Validation/Validator/InclusionIn.php      |  3 +++
 src/Validation/Validator/Ip.php               |  2 ++
 src/Validation/Validator/Numericality.php     |  2 ++
 src/Validation/Validator/PresenceOf.php       |  2 ++
 src/Validation/Validator/Regex.php            |  2 ++
 src/Validation/Validator/StringLength.php     |  5 ++++
 src/Validation/Validator/StringLength/Max.php |  3 +++
 src/Validation/Validator/StringLength/Min.php |  3 +++
 src/Validation/Validator/Uniqueness.php       |  5 ++++
 src/Validation/Validator/Url.php              |  2 ++
 .../ValidatorCompositeInterface.php           |  2 ++
 src/Validation/ValidatorFactory.php           |  1 +
 src/Validation/ValidatorInterface.php         |  2 ++
 272 files changed, 891 insertions(+), 45 deletions(-)

diff --git a/src/Acl/Adapter/AbstractAdapter.php b/src/Acl/Adapter/AbstractAdapter.php
index e3eeeedd..0de37d3c 100644
--- a/src/Acl/Adapter/AbstractAdapter.php
+++ b/src/Acl/Adapter/AbstractAdapter.php
@@ -11,6 +11,7 @@
 
 use Phalcon\Acl\Enum;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Events\EventsAwareInterface;
 
 /**
  * Adapter for Phalcon\Acl adapters
diff --git a/src/Acl/Adapter/AdapterInterface.php b/src/Acl/Adapter/AdapterInterface.php
index 15e35855..9da3c56b 100644
--- a/src/Acl/Adapter/AdapterInterface.php
+++ b/src/Acl/Adapter/AdapterInterface.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Acl\Adapter;
 
+use Phalcon\Acl\ComponentInterface;
+use Phalcon\Acl\RoleInterface;
+
 /**
  * Interface for Phalcon\Acl adapters
  */
diff --git a/src/Acl/Adapter/Memory.php b/src/Acl/Adapter/Memory.php
index 5be2a10f..ebe02bdc 100644
--- a/src/Acl/Adapter/Memory.php
+++ b/src/Acl/Adapter/Memory.php
@@ -10,6 +10,15 @@
 namespace Phalcon\Acl\Adapter;
 
 use Phalcon\Acl\Enum;
+use Phalcon\Acl\Role;
+use Phalcon\Acl\RoleInterface;
+use Phalcon\Acl\Component;
+use Phalcon\Acl\Exception;
+use Phalcon\Events\Manager as EventsManager;
+use Phalcon\Acl\RoleAware;
+use Phalcon\Acl\ComponentAware;
+use Phalcon\Acl\ComponentInterface;
+use ReflectionFunction;
 
 /**
  * Manages ACL lists in memory
diff --git a/src/Annotations/Adapter/AbstractAdapter.php b/src/Annotations/Adapter/AbstractAdapter.php
index 52306733..685c8446 100644
--- a/src/Annotations/Adapter/AbstractAdapter.php
+++ b/src/Annotations/Adapter/AbstractAdapter.php
@@ -9,10 +9,11 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
-use Phalcon\Annotations\Collection;
 use Phalcon\Annotations\Reader;
-use Phalcon\Annotations\ReaderInterface;
+use Phalcon\Annotations\Exception;
+use Phalcon\Annotations\Collection;
 use Phalcon\Annotations\Reflection;
+use Phalcon\Annotations\ReaderInterface;
 
 /**
  * This is the base class for Phalcon\Annotations adapters
diff --git a/src/Annotations/Adapter/AdapterInterface.php b/src/Annotations/Adapter/AdapterInterface.php
index 6f851a21..60587208 100644
--- a/src/Annotations/Adapter/AdapterInterface.php
+++ b/src/Annotations/Adapter/AdapterInterface.php
@@ -9,9 +9,9 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Reflection;
 use Phalcon\Annotations\Collection;
 use Phalcon\Annotations\ReaderInterface;
-use Phalcon\Annotations\Reflection;
 
 /**
  * This interface must be implemented by adapters in Phalcon\Annotations
diff --git a/src/Annotations/Adapter/Apcu.php b/src/Annotations/Adapter/Apcu.php
index 0834f9d8..d8e3bb81 100644
--- a/src/Annotations/Adapter/Apcu.php
+++ b/src/Annotations/Adapter/Apcu.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Reflection;
+
 /**
  * Stores the parsed annotations in APCu. This adapter is suitable for production
  *
diff --git a/src/Annotations/Adapter/Memory.php b/src/Annotations/Adapter/Memory.php
index da87d80f..ad79be79 100644
--- a/src/Annotations/Adapter/Memory.php
+++ b/src/Annotations/Adapter/Memory.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Reflection;
+
 /**
  * Stores the parsed annotations in memory. This adapter is the suitable
  * development/testing
diff --git a/src/Annotations/Adapter/Stream.php b/src/Annotations/Adapter/Stream.php
index 3d4ec6b9..68b1384e 100644
--- a/src/Annotations/Adapter/Stream.php
+++ b/src/Annotations/Adapter/Stream.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Annotations\Adapter;
 
+use Phalcon\Annotations\Reflection;
+use Phalcon\Annotations\Exception;
+use RuntimeException;
+
 /**
  * Stores the parsed annotations in files. This adapter is suitable for production
  *
diff --git a/src/Annotations/AnnotationsFactory.php b/src/Annotations/AnnotationsFactory.php
index d59549d6..50f670ed 100644
--- a/src/Annotations/AnnotationsFactory.php
+++ b/src/Annotations/AnnotationsFactory.php
@@ -11,6 +11,7 @@
 
 use Phalcon\Annotations\Adapter\AdapterInterface;
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 
 /**
  * Factory to create annotations components
diff --git a/src/Annotations/Collection.php b/src/Annotations/Collection.php
index 510f836e..fa533b15 100644
--- a/src/Annotations/Collection.php
+++ b/src/Annotations/Collection.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Annotations;
 
+use Countable;
+use Iterator;
+
 /**
  * Represents a collection of annotations. This class allows to traverse a group
  * of annotations easily
diff --git a/src/Annotations/Reader.php b/src/Annotations/Reader.php
index ddccab04..21eeb9d4 100644
--- a/src/Annotations/Reader.php
+++ b/src/Annotations/Reader.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Annotations;
 
+use ReflectionClass;
+
 /**
  * Parses docblocks returning an array with the found annotations
  */
diff --git a/src/Application/AbstractApplication.php b/src/Application/AbstractApplication.php
index aeb78742..d5f55412 100644
--- a/src/Application/AbstractApplication.php
+++ b/src/Application/AbstractApplication.php
@@ -11,6 +11,7 @@
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\Injectable;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 
 /**
diff --git a/src/Assets/Asset/Css.php b/src/Assets/Asset/Css.php
index 7e066b1a..e668f837 100644
--- a/src/Assets/Asset/Css.php
+++ b/src/Assets/Asset/Css.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Asset;
 
+use Phalcon\Assets\Asset as AssetBase;
+
 /**
  * Represents CSS assets
  */
diff --git a/src/Assets/Asset/Js.php b/src/Assets/Asset/Js.php
index 2dacee46..93ff165b 100644
--- a/src/Assets/Asset/Js.php
+++ b/src/Assets/Asset/Js.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Asset;
 
+use Phalcon\Assets\Asset as AssetBase;
+
 /**
  * Represents JavaScript assets
  */
diff --git a/src/Assets/Collection.php b/src/Assets/Collection.php
index 11e5bacc..9d831d09 100644
--- a/src/Assets/Collection.php
+++ b/src/Assets/Collection.php
@@ -9,6 +9,13 @@
  */
 namespace Phalcon\Assets;
 
+use Countable;
+use Iterator;
+use Phalcon\Assets\Asset\Css as AssetCss;
+use Phalcon\Assets\Asset\Js as AssetJs;
+use Phalcon\Assets\Inline\Js as InlineJs;
+use Phalcon\Assets\Inline\Css as InlineCss;
+
 /**
  * Represents a collection of assets
  */
diff --git a/src/Assets/Filters/Cssmin.php b/src/Assets/Filters/Cssmin.php
index 774e9cba..78eedece 100644
--- a/src/Assets/Filters/Cssmin.php
+++ b/src/Assets/Filters/Cssmin.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Filters;
 
+use Phalcon\Assets\FilterInterface;
+
 /**
  * Minify the CSS - removes comments removes newlines and line feeds keeping
  * removes last semicolon from last property
diff --git a/src/Assets/Filters/Jsmin.php b/src/Assets/Filters/Jsmin.php
index e0701838..fedadb6e 100644
--- a/src/Assets/Filters/Jsmin.php
+++ b/src/Assets/Filters/Jsmin.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Filters;
 
+use Phalcon\Assets\FilterInterface;
+
 /**
  * Deletes the characters which are insignificant to JavaScript. Comments will
  * be removed. Tabs will be replaced with spaces. Carriage returns will be
diff --git a/src/Assets/Filters/None.php b/src/Assets/Filters/None.php
index a5e19df9..ba7c59c9 100644
--- a/src/Assets/Filters/None.php
+++ b/src/Assets/Filters/None.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Filters;
 
+use Phalcon\Assets\FilterInterface;
+
 /**
  * Returns the content without make any modification to the original source
  */
diff --git a/src/Assets/Inline/Css.php b/src/Assets/Inline/Css.php
index 2353cd4e..4021e7aa 100644
--- a/src/Assets/Inline/Css.php
+++ b/src/Assets/Inline/Css.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Inline;
 
+use Phalcon\Assets\Inline as InlineBase;
+
 /**
  * Represents an inlined CSS
  */
diff --git a/src/Assets/Inline/Js.php b/src/Assets/Inline/Js.php
index 1ec6fd4e..a35a1b41 100644
--- a/src/Assets/Inline/Js.php
+++ b/src/Assets/Inline/Js.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Assets\Inline;
 
+use Phalcon\Assets\Inline as InlineBase;
+
 /**
  * Represents an inline JavaScript
  */
diff --git a/src/Assets/Manager.php b/src/Assets/Manager.php
index f56a6aa5..e358ebf9 100644
--- a/src/Assets/Manager.php
+++ b/src/Assets/Manager.php
@@ -9,6 +9,12 @@
  */
 namespace Phalcon\Assets;
 
+use Phalcon\Tag;
+use Phalcon\Assets\Asset\Js as AssetJs;
+use Phalcon\Assets\Asset\Css as AssetCss;
+use Phalcon\Assets\Inline\Css as InlineCss;
+use Phalcon\Assets\Inline\Js as InlineJs;
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
 
 /**
diff --git a/src/Cache.php b/src/Cache.php
index 8bd70919..d0776e5c 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -10,8 +10,10 @@
 namespace Phalcon;
 
 use Phalcon\Cache\Adapter\AdapterInterface;
+use Phalcon\Cache\Exception\Exception;
 use Phalcon\Cache\Exception\InvalidArgumentException;
 use Psr\SimpleCache\CacheInterface;
+use Traversable;
 
 /**
  * This component offers caching capabilities for your application.
diff --git a/src/Cache/Adapter/Apcu.php b/src/Cache/Adapter/Apcu.php
index 01481ad0..191e2ec9 100644
--- a/src/Cache/Adapter/Apcu.php
+++ b/src/Cache/Adapter/Apcu.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Cache\Adapter;
 
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Apcu as StorageApcu;
 
 /**
  * Apcu adapter
diff --git a/src/Cache/Adapter/Libmemcached.php b/src/Cache/Adapter/Libmemcached.php
index 43526134..a00deb4a 100644
--- a/src/Cache/Adapter/Libmemcached.php
+++ b/src/Cache/Adapter/Libmemcached.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Cache\Adapter;
 
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Libmemcached as StorageLibmemcached;
 
 /**
  * Libmemcached adapter
diff --git a/src/Cache/Adapter/Memory.php b/src/Cache/Adapter/Memory.php
index 4cbe2d5e..41619081 100644
--- a/src/Cache/Adapter/Memory.php
+++ b/src/Cache/Adapter/Memory.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Cache\Adapter;
 
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Memory as StorageMemory;
 
 /**
  * Memory adapter
diff --git a/src/Cache/Adapter/Redis.php b/src/Cache/Adapter/Redis.php
index c3c8ce7a..f9551cec 100644
--- a/src/Cache/Adapter/Redis.php
+++ b/src/Cache/Adapter/Redis.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Cache\Adapter;
 
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Redis as StorageRedis;
 
 /**
  * Redis adapter
diff --git a/src/Cache/Adapter/Stream.php b/src/Cache/Adapter/Stream.php
index 7002ae87..376e7a73 100644
--- a/src/Cache/Adapter/Stream.php
+++ b/src/Cache/Adapter/Stream.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Cache\Adapter;
 
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Stream as StorageStream;
 
 /**
  * Stream adapter
diff --git a/src/Cache/CacheFactory.php b/src/Cache/CacheFactory.php
index 2991470d..ccbf641a 100644
--- a/src/Cache/CacheFactory.php
+++ b/src/Cache/CacheFactory.php
@@ -9,7 +9,13 @@
  */
 namespace Phalcon\Cache;
 
+use Phalcon\Cache\Adapter\AdapterInterface;
+use Phalcon\Cache;
 use Psr\SimpleCache\CacheInterface;
+use Phalcon\Cache\Exception\Exception;
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
+use Phalcon\Helper\Arr;
 
 /**
  * Creates a new Cache class
diff --git a/src/Cli/Console.php b/src/Cli/Console.php
index 89cff154..5a7d55a6 100644
--- a/src/Cli/Console.php
+++ b/src/Cli/Console.php
@@ -10,6 +10,10 @@
 namespace Phalcon\Cli;
 
 use Phalcon\Application\AbstractApplication;
+use Phalcon\Cli\Router\Route;
+use Phalcon\Cli\Console\Exception;
+use Phalcon\Di\DiInterface;
+use Phalcon\Events\ManagerInterface;
 
 /**
  * This component allows to create CLI applications using Phalcon
diff --git a/src/Cli/Dispatcher.php b/src/Cli/Dispatcher.php
index 8db05566..af8f3aa8 100644
--- a/src/Cli/Dispatcher.php
+++ b/src/Cli/Dispatcher.php
@@ -9,6 +9,11 @@
  */
 namespace Phalcon\Cli;
 
+use Phalcon\Cli\Dispatcher\Exception;
+use Phalcon\Dispatcher\AbstractDispatcher as CliDispatcher;
+use Phalcon\Events\ManagerInterface;
+use Phalcon\Filter\FilterInterface;
+
 /**
  * Dispatching is the process of taking the command-line arguments, extracting
  * the module name, task name, action name, and optional parameters contained in
diff --git a/src/Cli/Router.php b/src/Cli/Router.php
index 7af3790b..03f208e6 100644
--- a/src/Cli/Router.php
+++ b/src/Cli/Router.php
@@ -9,8 +9,11 @@
  */
 namespace Phalcon\Cli;
 
-use Phalcon\Cli\Router\RouteInterface;
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Cli\Router\Route;
+use Phalcon\Cli\Router\Exception;
+use Phalcon\Cli\Router\RouteInterface;
 
 /**
  * Phalcon\Cli\Router is the standard framework router. Routing is the process
diff --git a/src/Cli/Task.php b/src/Cli/Task.php
index 11e0369b..ad88ba23 100644
--- a/src/Cli/Task.php
+++ b/src/Cli/Task.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Cli;
 
 use Phalcon\Di\Injectable;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 
 /**
diff --git a/src/Collection.php b/src/Collection.php
index eab41a5c..65269ac7 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -9,6 +9,14 @@
  */
 namespace Phalcon;
 
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use JsonSerializable;
+use Phalcon\Collection\CollectionInterface;
+use Phalcon\Helper\Json;
+use Serializable;
 use Traversable;
 
 /**
diff --git a/src/Collection/Exception.php b/src/Collection/Exception.php
index 5b84c7ed..badabd18 100644
--- a/src/Collection/Exception.php
+++ b/src/Collection/Exception.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Collection;
 
+use Throwable;
+
 /**
  * Exceptions for the Collection object
  */
diff --git a/src/Config.php b/src/Config.php
index 05fb7938..e92a3b9f 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon;
 
+use Phalcon\Collection;
 use Phalcon\Config\ConfigInterface;
+use Phalcon\Config\Exception;
 
 /**
  * `Phalcon\Config` is designed to simplify the access to, and the use of,
diff --git a/src/Config/Adapter/Grouped.php b/src/Config/Adapter/Grouped.php
index 23fb326f..be7fafbb 100644
--- a/src/Config/Adapter/Grouped.php
+++ b/src/Config/Adapter/Grouped.php
@@ -10,6 +10,10 @@
 namespace Phalcon\Config\Adapter;
 
 use Phalcon\Config;
+use Phalcon\Config\ConfigFactory;
+use Phalcon\Config\ConfigInterface;
+use Phalcon\Config\Exception;
+use Phalcon\Factory\Exception as FactoryException;
 
 /**
  * Reads multiple files (or arrays) and merges them all together.
diff --git a/src/Config/Adapter/Ini.php b/src/Config/Adapter/Ini.php
index 0aa25da0..746d60d6 100644
--- a/src/Config/Adapter/Ini.php
+++ b/src/Config/Adapter/Ini.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Config\Adapter;
 
 use Phalcon\Config;
+use Phalcon\Config\Exception;
 
 /**
  * Reads ini files and converts them to Phalcon\Config objects.
diff --git a/src/Config/Adapter/Json.php b/src/Config/Adapter/Json.php
index 4c4b1e3f..f3595078 100644
--- a/src/Config/Adapter/Json.php
+++ b/src/Config/Adapter/Json.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Config\Adapter;
 
 use Phalcon\Config;
+use Phalcon\Helper\Json as JsonHelper;
 
 /**
  * Reads JSON files and converts them to Phalcon\Config objects.
diff --git a/src/Config/Adapter/Yaml.php b/src/Config/Adapter/Yaml.php
index b4713fba..07961a2c 100644
--- a/src/Config/Adapter/Yaml.php
+++ b/src/Config/Adapter/Yaml.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Config\Adapter;
 
 use Phalcon\Config;
+use Phalcon\Config\Exception;
 
 /**
  * Reads YAML files and converts them to Phalcon\Config objects.
diff --git a/src/Config/ConfigFactory.php b/src/Config/ConfigFactory.php
index 01f9a0d5..737cdc0b 100644
--- a/src/Config/ConfigFactory.php
+++ b/src/Config/ConfigFactory.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Config;
 
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 
 /**
  * Loads Config Adapter class using 'adapter' option, if no extension is
diff --git a/src/Config/ConfigInterface.php b/src/Config/ConfigInterface.php
index 82ea4de1..82812979 100644
--- a/src/Config/ConfigInterface.php
+++ b/src/Config/ConfigInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Config;
 
+use Phalcon\Collection\CollectionInterface;
+
 /**
  * Phalcon\Config\ConfigInterface
  *
diff --git a/src/Container.php b/src/Container.php
index fe533a3c..1ecadfe3 100644
--- a/src/Container.php
+++ b/src/Container.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon;
 
+use Psr\Container\ContainerInterface;
 use Phalcon\Di\DiInterface;
 
 /**
diff --git a/src/Crypt.php b/src/Crypt.php
index 5ff78964..0ac5e1da 100644
--- a/src/Crypt.php
+++ b/src/Crypt.php
@@ -10,6 +10,8 @@
 namespace Phalcon;
 
 use Phalcon\Crypt\CryptInterface;
+use Phalcon\Crypt\Exception;
+use Phalcon\Crypt\Mismatch;
 
 /**
  * Provides encryption capabilities to Phalcon applications.
diff --git a/src/DataMapper/Pdo/Connection.php b/src/DataMapper/Pdo/Connection.php
index ce22f087..1d5ef802 100644
--- a/src/DataMapper/Pdo/Connection.php
+++ b/src/DataMapper/Pdo/Connection.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\DataMapper\Pdo;
 
+use InvalidArgumentException;
 use Phalcon\DataMapper\Pdo\Connection\AbstractConnection;
+use Phalcon\DataMapper\Pdo\Profiler\Profiler;
 use Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface;
 
 /**
diff --git a/src/DataMapper/Pdo/Connection/Decorated.php b/src/DataMapper/Pdo/Connection/Decorated.php
index 5556dac0..6b0b2fe7 100644
--- a/src/DataMapper/Pdo/Connection/Decorated.php
+++ b/src/DataMapper/Pdo/Connection/Decorated.php
@@ -10,6 +10,7 @@
 namespace Phalcon\DataMapper\Pdo\Connection;
 
 use Phalcon\DataMapper\Pdo\Exception\CannotDisconnect;
+use Phalcon\DataMapper\Pdo\Profiler\Profiler;
 use Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface;
 
 /**
diff --git a/src/DataMapper/Pdo/Profiler/Profiler.php b/src/DataMapper/Pdo/Profiler/Profiler.php
index cb81f890..ecbfccc8 100644
--- a/src/DataMapper/Pdo/Profiler/Profiler.php
+++ b/src/DataMapper/Pdo/Profiler/Profiler.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\DataMapper\Pdo\Profiler;
 
+use Phalcon\DataMapper\Pdo\Exception\Exception;
+use Phalcon\Helper\Json;
 use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
 
 /**
  * Sends query profiles to a logger.
diff --git a/src/DataMapper/Query/AbstractConditions.php b/src/DataMapper/Query/AbstractConditions.php
index b2be43f1..7e7d74c3 100644
--- a/src/DataMapper/Query/AbstractConditions.php
+++ b/src/DataMapper/Query/AbstractConditions.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\DataMapper\Query;
 
+use Phalcon\Helper\Arr;
+
 /**
  * Class AbstractConditions
  */
diff --git a/src/DataMapper/Query/Select.php b/src/DataMapper/Query/Select.php
index 41cac29e..2c803466 100644
--- a/src/DataMapper/Query/Select.php
+++ b/src/DataMapper/Query/Select.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\DataMapper\Query;
 
+use BadMethodCallException;
+use Phalcon\Helper\Arr;
+
 /**
  * Class Select
  *
diff --git a/src/Db/AbstractDb.php b/src/Db/AbstractDb.php
index 7e985097..bb4b849a 100644
--- a/src/Db/AbstractDb.php
+++ b/src/Db/AbstractDb.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Db;
 
+use \PDO as Pdo;
+
 /**
  * Phalcon\Db and its related classes provide a simple SQL database interface
  * for Phalcon Framework. The Phalcon\Db is the basic class you use to connect
diff --git a/src/Db/Adapter/AbstractAdapter.php b/src/Db/Adapter/AbstractAdapter.php
index 92a9bec1..f7fe4600 100644
--- a/src/Db/Adapter/AbstractAdapter.php
+++ b/src/Db/Adapter/AbstractAdapter.php
@@ -10,8 +10,15 @@
 namespace Phalcon\Db\Adapter;
 
 use Phalcon\Db\DialectInterface;
+use Phalcon\Db\ColumnInterface;
 use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Index;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
 use Phalcon\Db\RawValue;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 
 /**
diff --git a/src/Db/Adapter/AdapterInterface.php b/src/Db/Adapter/AdapterInterface.php
index d1caea10..ef7d9ead 100644
--- a/src/Db/Adapter/AdapterInterface.php
+++ b/src/Db/Adapter/AdapterInterface.php
@@ -10,8 +10,11 @@
 namespace Phalcon\Db\Adapter;
 
 use Phalcon\Db\DialectInterface;
-use Phalcon\Db\RawValue;
 use Phalcon\Db\ResultInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\RawValue;
+use Phalcon\Db\ReferenceInterface;
 
 /**
  * Interface for Phalcon\Db adapters
@@ -531,7 +534,7 @@ public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\
      * @param string $sqlStatement
      * @param array $bindParams
      * @param array $bindTypes
-     * @return bool|ResultInterface
+     * @return 0|ResultInterface
      */
     public function query(string $sqlStatement, array $bindParams = [], array $bindTypes = []);
 
diff --git a/src/Db/Adapter/Pdo/AbstractPdo.php b/src/Db/Adapter/Pdo/AbstractPdo.php
index bf80fdab..4f75a290 100644
--- a/src/Db/Adapter/Pdo/AbstractPdo.php
+++ b/src/Db/Adapter/Pdo/AbstractPdo.php
@@ -10,7 +10,11 @@
 namespace Phalcon\Db\Adapter\Pdo;
 
 use Phalcon\Db\Adapter\AbstractAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Result\Pdo as ResultPdo;
 use Phalcon\Db\ResultInterface;
+use Phalcon\Events\ManagerInterface;
 
 /**
  * Phalcon\Db\Adapter\Pdo is the Phalcon\Db that internally uses PDO to connect
@@ -364,7 +368,7 @@ public function prepare(string $sqlStatement): \PDOStatement
      * @param string $sqlStatement
      * @param array $bindParams
      * @param array $bindTypes
-     * @return bool|ResultInterface
+     * @return 0|ResultInterface
      */
     public function query(string $sqlStatement, array $bindParams = [], array $bindTypes = [])
     {
diff --git a/src/Db/Adapter/Pdo/Mysql.php b/src/Db/Adapter/Pdo/Mysql.php
index 107f51ad..e1780f44 100644
--- a/src/Db/Adapter/Pdo/Mysql.php
+++ b/src/Db/Adapter/Pdo/Mysql.php
@@ -9,6 +9,16 @@
  */
 namespace Phalcon\Db\Adapter\Pdo;
 
+use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Index;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
+
 /**
  * Specific functions for the MySQL database system
  *
diff --git a/src/Db/Adapter/Pdo/Postgresql.php b/src/Db/Adapter/Pdo/Postgresql.php
index 930be65a..64a72896 100644
--- a/src/Db/Adapter/Pdo/Postgresql.php
+++ b/src/Db/Adapter/Pdo/Postgresql.php
@@ -9,7 +9,15 @@
  */
 namespace Phalcon\Db\Adapter\Pdo;
 
+use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
 use Phalcon\Db\RawValue;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
+use Throwable;
 
 /**
  * Specific functions for the PostgreSQL database system
diff --git a/src/Db/Adapter/Pdo/Sqlite.php b/src/Db/Adapter/Pdo/Sqlite.php
index 65220882..4b4f6d75 100644
--- a/src/Db/Adapter/Pdo/Sqlite.php
+++ b/src/Db/Adapter/Pdo/Sqlite.php
@@ -9,7 +9,16 @@
  */
 namespace Phalcon\Db\Adapter\Pdo;
 
+use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Index;
+use Phalcon\Db\IndexInterface;
 use Phalcon\Db\RawValue;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
 
 /**
  * Specific functions for the SQLite database system
diff --git a/src/Db/Adapter/PdoFactory.php b/src/Db/Adapter/PdoFactory.php
index eadc67ff..0d4167ac 100644
--- a/src/Db/Adapter/PdoFactory.php
+++ b/src/Db/Adapter/PdoFactory.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Db\Adapter;
 
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/src/Db/Dialect/Mysql.php b/src/Db/Dialect/Mysql.php
index eeef5199..91c6265c 100644
--- a/src/Db/Dialect/Mysql.php
+++ b/src/Db/Dialect/Mysql.php
@@ -10,6 +10,12 @@
 namespace Phalcon\Db\Dialect;
 
 use Phalcon\Db\Dialect;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\ReferenceInterface;
+use Phalcon\Db\DialectInterface;
 
 /**
  * Generates database specific SQL for the MySQL RDBMS
diff --git a/src/Db/Dialect/Postgresql.php b/src/Db/Dialect/Postgresql.php
index 4e57d5f8..25783793 100644
--- a/src/Db/Dialect/Postgresql.php
+++ b/src/Db/Dialect/Postgresql.php
@@ -10,6 +10,12 @@
 namespace Phalcon\Db\Dialect;
 
 use Phalcon\Db\Dialect;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\ReferenceInterface;
+use Phalcon\Db\DialectInterface;
 
 /**
  * Generates database specific SQL for the PostgreSQL RDBMS
diff --git a/src/Db/Dialect/Sqlite.php b/src/Db/Dialect/Sqlite.php
index 3b2a56cc..c4e4393f 100644
--- a/src/Db/Dialect/Sqlite.php
+++ b/src/Db/Dialect/Sqlite.php
@@ -9,7 +9,13 @@
  */
 namespace Phalcon\Db\Dialect;
 
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\IndexInterface;
 use Phalcon\Db\Dialect;
+use Phalcon\Db\DialectInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\ReferenceInterface;
 
 /**
  * Generates database specific SQL for the SQLite RDBMS
diff --git a/src/Db/Result/Pdo.php b/src/Db/Result/Pdo.php
index 860aa319..5fcd4cdb 100644
--- a/src/Db/Result/Pdo.php
+++ b/src/Db/Result/Pdo.php
@@ -9,8 +9,9 @@
  */
 namespace Phalcon\Db\Result;
 
-use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Db\Enum;
+use Phalcon\Db\ResultInterface;
+use Phalcon\Db\Adapter\AdapterInterface;
 
 /**
  * Encapsulates the resultset internals
diff --git a/src/Di.php b/src/Di.php
index cda593b1..43b5a597 100644
--- a/src/Di.php
+++ b/src/Di.php
@@ -9,9 +9,17 @@
  */
 namespace Phalcon;
 
+use Phalcon\Di\Service;
 use Phalcon\Di\DiInterface;
+use Phalcon\Di\Exception;
+use Phalcon\Di\Exception\ServiceResolutionException;
+use Phalcon\Config\Adapter\Php;
+use Phalcon\Config\Adapter\Yaml;
+use Phalcon\Config\ConfigInterface;
 use Phalcon\Di\ServiceInterface;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Di\ServiceProviderInterface;
 
 /**
  * Phalcon\Di is a component that implements Dependency Injection/Service
diff --git a/src/Di/DiInterface.php b/src/Di/DiInterface.php
index 1483068d..9ebde3b1 100644
--- a/src/Di/DiInterface.php
+++ b/src/Di/DiInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Di;
 
+use ArrayAccess;
+
 /**
  * Interface for Phalcon\Di
  */
diff --git a/src/Di/FactoryDefault.php b/src/Di/FactoryDefault.php
index 6d8546f6..4f151e00 100644
--- a/src/Di/FactoryDefault.php
+++ b/src/Di/FactoryDefault.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Di;
 
+use Phalcon\Filter\FilterFactory;
+
 /**
  * This is a variant of the standard Phalcon\Di. By default it automatically
  * registers all the services provided by the framework. Thanks to this, the
diff --git a/src/Di/FactoryDefault/Cli.php b/src/Di/FactoryDefault/Cli.php
index d2d3c9be..c3dddddd 100644
--- a/src/Di/FactoryDefault/Cli.php
+++ b/src/Di/FactoryDefault/Cli.php
@@ -10,6 +10,8 @@
 namespace Phalcon\Di\FactoryDefault;
 
 use Phalcon\Di\FactoryDefault;
+use Phalcon\Di\Service;
+use Phalcon\Filter\FilterFactory;
 
 /**
  * Phalcon\Di\FactoryDefault\Cli
diff --git a/src/Di/Injectable.php b/src/Di/Injectable.php
index 616e4240..fec0f45a 100644
--- a/src/Di/Injectable.php
+++ b/src/Di/Injectable.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Di;
 
+use Phalcon\Di;
 use Phalcon\Session\BagInterface;
 
 /**
diff --git a/src/Di/Service.php b/src/Di/Service.php
index c324dd75..4e192765 100644
--- a/src/Di/Service.php
+++ b/src/Di/Service.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Di;
 
+use Closure;
+use Phalcon\Di\Exception\ServiceResolutionException;
+use Phalcon\Di\Service\Builder;
+
 /**
  * Represents individually a service in the services container
  *
diff --git a/src/Di/Service/Builder.php b/src/Di/Service/Builder.php
index b8a5a1f3..36e6d6d7 100644
--- a/src/Di/Service/Builder.php
+++ b/src/Di/Service/Builder.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Di\Service;
 
+use Phalcon\Di\DiInterface;
+use Phalcon\Di\Exception;
+
 /**
  * Phalcon\Di\Service\Builder
  *
diff --git a/src/Dispatcher/AbstractDispatcher.php b/src/Dispatcher/AbstractDispatcher.php
index f1a172d1..ec84205f 100644
--- a/src/Dispatcher/AbstractDispatcher.php
+++ b/src/Dispatcher/AbstractDispatcher.php
@@ -9,8 +9,14 @@
  */
 namespace Phalcon\Dispatcher;
 
+use Exception;
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Dispatcher\Exception as PhalconException;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Filter\FilterInterface;
+use Phalcon\Mvc\Model\Binder;
 use Phalcon\Mvc\Model\BinderInterface;
 
 /**
@@ -354,10 +360,10 @@ public function setDefaultAction(string $actionName): void
     /**
      * Sets the default namespace
      *
-     * @param string $namespaceName
+     * @param string $defaultNamespace
      * @return void
      */
-    public function setDefaultNamespace(string $namespaceName): void
+    public function setDefaultNamespace(string $defaultNamespace): void
     {
     }
 
diff --git a/src/Escaper.php b/src/Escaper.php
index f7b06430..65da4b3f 100644
--- a/src/Escaper.php
+++ b/src/Escaper.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon;
 
+use Phalcon\Di\DiInterface;
+use Phalcon\Escaper\EscaperInterface;
+use Phalcon\Escaper\Exception;
+
 /**
  * Phalcon\Escaper
  *
@@ -112,10 +116,10 @@ public function escapeHtml(string $text = null): string
     /**
      * Escapes a HTML attribute string
      *
-     * @param string $attribute
+     * @param string $text
      * @return string
      */
-    public function escapeHtmlAttr(string $attribute = null): string
+    public function escapeHtmlAttr(string $text = null): string
     {
     }
 
@@ -227,10 +231,10 @@ public function setFlags(int $flags): Escaper
      * $escaper->setHtmlQuoteType(ENT_XHTML);
      * ```
      *
-     * @param int $flags
+     * @param int $quoteType
      * @return void
      */
-    public function setHtmlQuoteType(int $flags): void
+    public function setHtmlQuoteType(int $quoteType): void
     {
     }
 
diff --git a/src/Events/Manager.php b/src/Events/Manager.php
index 881cc9d4..f3d7cba2 100644
--- a/src/Events/Manager.php
+++ b/src/Events/Manager.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Events;
 
+use Closure;
+use SplPriorityQueue;
+
 /**
  * Phalcon\Events\Manager
  *
diff --git a/src/Factory/AbstractFactory.php b/src/Factory/AbstractFactory.php
index f4ef9bc0..2d1b9d3a 100644
--- a/src/Factory/AbstractFactory.php
+++ b/src/Factory/AbstractFactory.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Factory;
 
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Filter.php b/src/Filter.php
index a5705cc2..24b919f3 100644
--- a/src/Filter.php
+++ b/src/Filter.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon;
 
+use Closure;
+use Phalcon\Filter\Exception;
+use Phalcon\Filter\FilterInterface;
+
 /**
  * Lazy loads, stores and exposes sanitizer objects
  */
diff --git a/src/Filter/FilterFactory.php b/src/Filter/FilterFactory.php
index b2b9ffd5..744dc14a 100644
--- a/src/Filter/FilterFactory.php
+++ b/src/Filter/FilterFactory.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Filter;
 
+use Phalcon\Filter;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Flash/AbstractFlash.php b/src/Flash/AbstractFlash.php
index 843c4bd9..ec090ecc 100644
--- a/src/Flash/AbstractFlash.php
+++ b/src/Flash/AbstractFlash.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Flash;
 
+use Phalcon\Di;
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Escaper\EscaperInterface;
 use Phalcon\Session\ManagerInterface as SessionInterface;
diff --git a/src/Flash/Exception.php b/src/Flash/Exception.php
index f2ddec13..dcc7c175 100644
--- a/src/Flash/Exception.php
+++ b/src/Flash/Exception.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Flash;
 
 /**
- * Exceptions thrown in Phalcon\Flash calsses will use this class
+ * Exceptions thrown in Phalcon\Flash classes will use this class
  */
 class Exception extends \Phalcon\Exception
 {
diff --git a/src/Flash/Session.php b/src/Flash/Session.php
index 35a3036c..b90c855e 100644
--- a/src/Flash/Session.php
+++ b/src/Flash/Session.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Flash;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Session\ManagerInterface;
 
 /**
diff --git a/src/Forms/Element/AbstractElement.php b/src/Forms/Element/AbstractElement.php
index 4fdca846..4c96c038 100644
--- a/src/Forms/Element/AbstractElement.php
+++ b/src/Forms/Element/AbstractElement.php
@@ -9,8 +9,13 @@
  */
 namespace Phalcon\Forms\Element;
 
+use InvalidArgumentException;
 use Phalcon\Forms\Form;
+use Phalcon\Forms\Exception;
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Messages\Messages;
+use Phalcon\Tag;
+use Phalcon\Validation\ValidatorInterface;
 
 /**
  * This is a base class for form elements
diff --git a/src/Forms/Element/Check.php b/src/Forms/Element/Check.php
index 9142911e..6027443d 100644
--- a/src/Forms/Element/Check.php
+++ b/src/Forms/Element/Check.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Check
  *
diff --git a/src/Forms/Element/Date.php b/src/Forms/Element/Date.php
index f01dede3..003e0daa 100644
--- a/src/Forms/Element/Date.php
+++ b/src/Forms/Element/Date.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Component INPUT[type=date] for forms
  */
diff --git a/src/Forms/Element/ElementInterface.php b/src/Forms/Element/ElementInterface.php
index 60473d50..336d248a 100644
--- a/src/Forms/Element/ElementInterface.php
+++ b/src/Forms/Element/ElementInterface.php
@@ -10,7 +10,9 @@
 namespace Phalcon\Forms\Element;
 
 use Phalcon\Forms\Form;
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Messages\Messages;
+use Phalcon\Validation\ValidatorInterface;
 
 /**
  * Interface for Phalcon\Forms\Element classes
diff --git a/src/Forms/Element/Email.php b/src/Forms/Element/Email.php
index a3d57ead..04aae24d 100644
--- a/src/Forms/Element/Email.php
+++ b/src/Forms/Element/Email.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Email
  *
diff --git a/src/Forms/Element/File.php b/src/Forms/Element/File.php
index 9e5151b9..2a68cb13 100644
--- a/src/Forms/Element/File.php
+++ b/src/Forms/Element/File.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Component INPUT[type=file] for forms
  */
diff --git a/src/Forms/Element/Hidden.php b/src/Forms/Element/Hidden.php
index 8f8c7ec5..e5df751c 100644
--- a/src/Forms/Element/Hidden.php
+++ b/src/Forms/Element/Hidden.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Hidden
  *
diff --git a/src/Forms/Element/Numeric.php b/src/Forms/Element/Numeric.php
index f3969abd..3acdc4f8 100644
--- a/src/Forms/Element/Numeric.php
+++ b/src/Forms/Element/Numeric.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Numeric
  *
diff --git a/src/Forms/Element/Password.php b/src/Forms/Element/Password.php
index d208a2fe..54ff458a 100644
--- a/src/Forms/Element/Password.php
+++ b/src/Forms/Element/Password.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Password
  *
diff --git a/src/Forms/Element/Radio.php b/src/Forms/Element/Radio.php
index a538f718..13274081 100644
--- a/src/Forms/Element/Radio.php
+++ b/src/Forms/Element/Radio.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Radio
  *
diff --git a/src/Forms/Element/Select.php b/src/Forms/Element/Select.php
index 8a0e1ffd..8669bdee 100644
--- a/src/Forms/Element/Select.php
+++ b/src/Forms/Element/Select.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag\Select as SelectTag;
+
 /**
  * Phalcon\Forms\Element\Select
  *
diff --git a/src/Forms/Element/Submit.php b/src/Forms/Element/Submit.php
index 95444354..bfe0214e 100644
--- a/src/Forms/Element/Submit.php
+++ b/src/Forms/Element/Submit.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Component INPUT[type=submit] for forms
  */
diff --git a/src/Forms/Element/Text.php b/src/Forms/Element/Text.php
index 03bb1f93..b8b2fc9c 100644
--- a/src/Forms/Element/Text.php
+++ b/src/Forms/Element/Text.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Phalcon\Forms\Element\Text
  *
diff --git a/src/Forms/Element/TextArea.php b/src/Forms/Element/TextArea.php
index f8679dbd..48d7af7d 100644
--- a/src/Forms/Element/TextArea.php
+++ b/src/Forms/Element/TextArea.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Forms\Element;
 
+use Phalcon\Tag;
+
 /**
  * Component TEXTAREA for forms
  */
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 732f53dc..eebe05cd 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -9,11 +9,17 @@
  */
 namespace Phalcon\Forms;
 
+use Countable;
+use Iterator;
 use Phalcon\Di\Injectable;
+use Phalcon\Di\DiInterface;
+use Phalcon\Filter\FilterInterface;
 use Phalcon\Forms\Element\ElementInterface;
 use Phalcon\Html\Attributes;
 use Phalcon\Html\Attributes\AttributesInterface;
 use Phalcon\Messages\Messages;
+use Phalcon\Tag;
+use Phalcon\Validation;
 use Phalcon\Validation\ValidationInterface;
 
 /**
diff --git a/src/Helper/Arr.php b/src/Helper/Arr.php
index 0d0c3445..6ff6f84f 100644
--- a/src/Helper/Arr.php
+++ b/src/Helper/Arr.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Helper;
 
+use stdClass;
+
 /**
  * This class offers quick array functions throughout the framework
  */
diff --git a/src/Helper/Json.php b/src/Helper/Json.php
index 3ee32285..caab0ece 100644
--- a/src/Helper/Json.php
+++ b/src/Helper/Json.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Helper;
 
+use InvalidArgumentException;
+
 /**
  * This class offers a wrapper for JSON methods to serialize and unserialize
  */
diff --git a/src/Helper/Str.php b/src/Helper/Str.php
index 6dc027d3..d23f4d18 100644
--- a/src/Helper/Str.php
+++ b/src/Helper/Str.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Helper;
 
+use RuntimeException;
+
 /**
  * This class offers quick string functions throughout the framework
  */
diff --git a/src/Html/Attributes.php b/src/Html/Attributes.php
index d431bbcc..3f4148c6 100644
--- a/src/Html/Attributes.php
+++ b/src/Html/Attributes.php
@@ -10,6 +10,8 @@
 namespace Phalcon\Html;
 
 use Phalcon\Collection;
+use Phalcon\Html\Attributes\RenderInterface;
+use Phalcon\Tag;
 
 /**
  * This class helps to work with HTML Attributes
diff --git a/src/Html/Breadcrumbs.php b/src/Html/Breadcrumbs.php
index 706593c8..a435ea17 100644
--- a/src/Html/Breadcrumbs.php
+++ b/src/Html/Breadcrumbs.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Html;
 
+use Phalcon\Di\DiInterface;
+
 /**
  * Phalcon\Html\Breadcrumbs
  *
diff --git a/src/Html/Helper/Form.php b/src/Html/Helper/Form.php
index 852e65e4..64481fab 100644
--- a/src/Html/Helper/Form.php
+++ b/src/Html/Helper/Form.php
@@ -18,7 +18,7 @@ class Form extends \Phalcon\Html\Helper\AbstractHelper
 {
 
     /**
-     * Produce a <form> tag.
+     * Produce a `<form>` tag.
      *
      * @param array $attributes
      *
diff --git a/src/Html/Helper/Input/Checkbox.php b/src/Html/Helper/Input/Checkbox.php
index c319dace..8744c81d 100644
--- a/src/Html/Helper/Input/Checkbox.php
+++ b/src/Html/Helper/Input/Checkbox.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Html\Helper\Input;
 
 use Phalcon\Escaper\EscaperInterface;
+use Phalcon\Helper\Arr;
 
 /**
  * Class Checkbox
diff --git a/src/Html/Helper/Input/Select.php b/src/Html/Helper/Input/Select.php
index 6b65b7a2..0f370d28 100644
--- a/src/Html/Helper/Input/Select.php
+++ b/src/Html/Helper/Input/Select.php
@@ -51,7 +51,7 @@ public function add(string $text, string $value = null, array $attributes = [],
     }
 
     /**
-     * Add an element to the list
+     * Add a placeholder to the element
      *
      * @param string $text
      * @param string $value
diff --git a/src/Html/Helper/Input/Textarea.php b/src/Html/Helper/Input/Textarea.php
index a79e97b6..bca2fbd2 100644
--- a/src/Html/Helper/Input/Textarea.php
+++ b/src/Html/Helper/Input/Textarea.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Html\Helper\Input;
 
+use Phalcon\Helper\Arr;
 use Phalcon\Html\Exception;
 
 /**
diff --git a/src/Html/Link/EvolvableLink.php b/src/Html/Link/EvolvableLink.php
index 36576364..b68afc46 100644
--- a/src/Html/Link/EvolvableLink.php
+++ b/src/Html/Link/EvolvableLink.php
@@ -88,7 +88,7 @@ public function withoutAttribute($attribute)
     /**
      * Returns an instance with the specified relationship excluded.
      *
-     * If the specified rel is already not present, this method MUST return
+     * If the specified rel is not present, this method MUST return
      * normally without errors.
      *
      * @param string $rel *   The relationship value to exclude.
diff --git a/src/Html/TagFactory.php b/src/Html/TagFactory.php
index 41c3e20a..9fabc3ba 100644
--- a/src/Html/TagFactory.php
+++ b/src/Html/TagFactory.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Html;
 
+use Phalcon\Escaper;
 use Phalcon\Escaper\EscaperInterface;
 use Phalcon\Factory\AbstractFactory;
 
diff --git a/src/Http/Cookie.php b/src/Http/Cookie.php
index ddbf8bbc..e7198f7f 100644
--- a/src/Http/Cookie.php
+++ b/src/Http/Cookie.php
@@ -9,9 +9,16 @@
  */
 namespace Phalcon\Http;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Crypt\CryptInterface;
+use Phalcon\Crypt\Mismatch;
 use Phalcon\Filter\FilterInterface;
+use Phalcon\Helper\Arr;
+use Phalcon\Http\Response\Exception;
 use Phalcon\Http\Cookie\CookieInterface;
+use Phalcon\Http\Cookie\Exception as CookieException;
+use Phalcon\Session\ManagerInterface as SessionManagerInterface;
 
 /**
  * Provide OO wrappers to manage a HTTP cookie.
diff --git a/src/Http/Message/AbstractCommon.php b/src/Http/Message/AbstractCommon.php
index 86123f61..d6734b13 100644
--- a/src/Http/Message/AbstractCommon.php
+++ b/src/Http/Message/AbstractCommon.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Http\Message\Exception\InvalidArgumentException;
+
 /**
  * Common methods
  */
diff --git a/src/Http/Message/AbstractRequest.php b/src/Http/Message/AbstractRequest.php
index c5808555..fe6b7630 100644
--- a/src/Http/Message/AbstractRequest.php
+++ b/src/Http/Message/AbstractRequest.php
@@ -44,6 +44,7 @@ abstract class AbstractRequest extends \Phalcon\Http\Message\AbstractMessage
 
 
     /**
+     *
      * Retrieves the HTTP method of the request.
      *
      * @return string
@@ -53,6 +54,7 @@ public function getMethod(): string
     }
 
     /**
+     *
      * Retrieves the URI instance.
      *
      * This method MUST return a UriInterface instance.
diff --git a/src/Http/Message/Exception/InvalidArgumentException.php b/src/Http/Message/Exception/InvalidArgumentException.php
index 14de3be7..9ceabc76 100644
--- a/src/Http/Message/Exception/InvalidArgumentException.php
+++ b/src/Http/Message/Exception/InvalidArgumentException.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Http\Message\Exception;
 
+use Throwable;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Http/Message/Request.php b/src/Http/Message/Request.php
index ed6eac3a..6a7d0774 100644
--- a/src/Http/Message/Request.php
+++ b/src/Http/Message/Request.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Http\Message\Stream\Input;
+use Phalcon\Http\Message\AbstractRequest;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
diff --git a/src/Http/Message/RequestFactory.php b/src/Http/Message/RequestFactory.php
index b7bd65e4..10fa956d 100644
--- a/src/Http/Message/RequestFactory.php
+++ b/src/Http/Message/RequestFactory.php
@@ -9,8 +9,8 @@
  */
 namespace Phalcon\Http\Message;
 
-use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\UriInterface;
 
 /**
diff --git a/src/Http/Message/Response.php b/src/Http/Message/Response.php
index f33d0e78..fc497a7f 100644
--- a/src/Http/Message/Response.php
+++ b/src/Http/Message/Response.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Helper\Number;
+use Phalcon\Http\Message\AbstractMessage;
+use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -45,13 +48,19 @@ final class Response extends AbstractMessage implements \Psr\Http\Message\Respon
 
 
     /**
+     *
      * Gets the response reason phrase associated with the status code.
      *
      * Because a reason phrase is not a required element in a response
+     *
      * status line, the reason phrase value MAY be empty. Implementations MAY
+     *
      * choose to return the default RFC 7231 recommended reason phrase (or
+     *
      * those
+     *
      * listed in the IANA HTTP Status Code Registry) for the response's
+     *
      * status code.
      *
      * @return string
@@ -61,9 +70,11 @@ public function getReasonPhrase(): string
     }
 
     /**
+     *
      * Gets the response status code.
      *
      * The status code is a 3-digit integer result code of the server's attempt
+     *
      * to understand and satisfy the request.
      *
      * @return int
diff --git a/src/Http/Message/ResponseFactory.php b/src/Http/Message/ResponseFactory.php
index 7491c31a..44d9504c 100644
--- a/src/Http/Message/ResponseFactory.php
+++ b/src/Http/Message/ResponseFactory.php
@@ -9,8 +9,8 @@
  */
 namespace Phalcon\Http\Message;
 
-use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
 
 /**
  * PSR-17 ResponseFactory
diff --git a/src/Http/Message/ServerRequest.php b/src/Http/Message/ServerRequest.php
index d84e0e99..5adcb4a5 100644
--- a/src/Http/Message/ServerRequest.php
+++ b/src/Http/Message/ServerRequest.php
@@ -12,6 +12,7 @@
 use Phalcon\Collection;
 use Phalcon\Collection\CollectionInterface;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
+use Phalcon\Http\Message\Stream\Input;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
@@ -95,11 +96,13 @@ final class ServerRequest extends \Phalcon\Http\Message\AbstractRequest implemen
 
 
     /**
+     *
      * Retrieve cookies.
      *
      * Retrieves cookies sent by the client to the server.
      *
      * The data MUST be compatible with the structure of the $_COOKIE
+     *
      * superglobal.
      *
      * @return array
@@ -109,15 +112,21 @@ public function getCookieParams(): array
     }
 
     /**
+     *
      * Retrieve any parameters provided in the request body.
      *
      * If the request Content-Type is either application/x-www-form-urlencoded
+     *
      * or multipart/form-data, and the request method is POST, this method MUST
+     *
      * return the contents of $_POST.
      *
      * Otherwise, this method may return any results of deserializing
+     *
      * the request body content; as parsing returns structured content, the
+     *
      * potential types MUST be arrays or objects only. A null value indicates
+     *
      * the absence of body content.
      *
      * @return mixed
@@ -127,13 +136,17 @@ public function getParsedBody()
     }
 
     /**
+     *
      * Retrieve query string arguments.
      *
      * Retrieves the deserialized query string arguments, if any.
      *
      * Note: the query params might not be in sync with the URI or server
+     *
      * params. If you need to ensure you are only getting the original
+     *
      * values, you may need to parse the query string from
+     *
      * `getUri()->getQuery()` or from the `QUERY_STRING` server param.
      *
      * @return array
@@ -143,10 +156,13 @@ public function getQueryParams(): array
     }
 
     /**
+     *
      * Retrieve server parameters.
      *
      * Retrieves data related to the incoming request environment,
+     *
      * typically derived from PHP's $_SERVER superglobal. The data IS NOT
+     *
      * REQUIRED to originate from $_SERVER.
      *
      * @return array
@@ -156,12 +172,15 @@ public function getServerParams(): array
     }
 
     /**
+     *
      * Retrieve normalized file upload data.
      *
      * This method returns upload metadata in a normalized tree, with each leaf
+     *
      * an instance of Psr\Http\Message\UploadedFileInterface.
      *
      * These values MAY be prepared from $_FILES or the message body during
+     *
      * instantiation, or MAY be injected via withUploadedFiles().
      *
      * @return array
diff --git a/src/Http/Message/ServerRequestFactory.php b/src/Http/Message/ServerRequestFactory.php
index bfe9d935..6118a202 100644
--- a/src/Http/Message/ServerRequestFactory.php
+++ b/src/Http/Message/ServerRequestFactory.php
@@ -9,12 +9,14 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Collection;
 use Phalcon\Collection\CollectionInterface;
+use Phalcon\Helper\Arr;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\UploadedFileInterface;
 
 /**
  * PSR-17 ServerRequestFactory
diff --git a/src/Http/Message/Stream.php b/src/Http/Message/Stream.php
index 16e6b507..25fbdab0 100644
--- a/src/Http/Message/Stream.php
+++ b/src/Http/Message/Stream.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Helper\Arr;
+use Exception;
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
 
 /**
  * PSR-7 Stream
diff --git a/src/Http/Message/StreamFactory.php b/src/Http/Message/StreamFactory.php
index f8401d0d..9a1c4b9f 100644
--- a/src/Http/Message/StreamFactory.php
+++ b/src/Http/Message/StreamFactory.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\StreamInterface;
 
diff --git a/src/Http/Message/UploadedFile.php b/src/Http/Message/UploadedFile.php
index 0f32dcac..344cc800 100644
--- a/src/Http/Message/UploadedFile.php
+++ b/src/Http/Message/UploadedFile.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Helper\Number;
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Str;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
diff --git a/src/Http/Message/UploadedFileFactory.php b/src/Http/Message/UploadedFileFactory.php
index e01d2ad4..a8c31f4e 100644
--- a/src/Http/Message/UploadedFileFactory.php
+++ b/src/Http/Message/UploadedFileFactory.php
@@ -10,8 +10,8 @@
 namespace Phalcon\Http\Message;
 
 use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileFactoryInterface;
 use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
 
 /**
  * PSR-17 UploadedFileFactory
diff --git a/src/Http/Message/Uri.php b/src/Http/Message/Uri.php
index ee465196..656eec1f 100644
--- a/src/Http/Message/Uri.php
+++ b/src/Http/Message/Uri.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Http\Message;
 
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Str;
 use Phalcon\Http\Message\Exception\InvalidArgumentException;
 use Psr\Http\Message\UriInterface;
 
diff --git a/src/Http/Request.php b/src/Http/Request.php
index 8df8ad66..9e6d9af2 100644
--- a/src/Http/Request.php
+++ b/src/Http/Request.php
@@ -9,8 +9,16 @@
  */
 namespace Phalcon\Http;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Events\ManagerInterface;
 use Phalcon\Filter\FilterInterface;
+use Phalcon\Helper\Json;
+use Phalcon\Http\Request\File;
+use Phalcon\Http\Request\FileInterface;
+use Phalcon\Http\Request\Exception;
+use UnexpectedValueException;
+use stdClass;
 
 /**
  * Encapsulates request information for easy and secure access from application
@@ -337,7 +345,7 @@ public function getHTTPReferer(): string
      * Gets decoded JSON HTTP raw request body
      *
      * @param bool $associative
-     * @return array|bool|\stdClass
+     * @return 0|1|\stdClass
      */
     public function getJsonRawBody(bool $associative = false)
     {
diff --git a/src/Http/Request/File.php b/src/Http/Request/File.php
index 370b45c5..a3a948a1 100644
--- a/src/Http/Request/File.php
+++ b/src/Http/Request/File.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Http\Request;
 
+use Phalcon\Helper\Arr;
+
 /**
  * Phalcon\Http\Request\File
  *
diff --git a/src/Http/RequestInterface.php b/src/Http/RequestInterface.php
index 44d54fd1..216d448b 100644
--- a/src/Http/RequestInterface.php
+++ b/src/Http/RequestInterface.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Http;
 
+use Phalcon\Http\Request\FileInterface;
+use stdClass;
+
 /**
  * Interface for Phalcon\Http\Request
  */
@@ -184,7 +187,7 @@ public function getHTTPReferer(): string;
      * Gets decoded JSON HTTP raw request body
      *
      * @param bool $associative
-     * @return array|bool|\stdClass
+     * @return 0|1|stdClass
      */
     public function getJsonRawBody(bool $associative = false);
 
diff --git a/src/Http/Response.php b/src/Http/Response.php
index a5faf918..6f63c8c9 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -9,11 +9,21 @@
  */
 namespace Phalcon\Http;
 
+use DateTime;
+use DateTimeZone;
+use Phalcon\Di;
 use Phalcon\Di\DiInterface;
-use Phalcon\Events\ManagerInterface;
+use Phalcon\Helper\Fs;
+use Phalcon\Helper\Json;
+use Phalcon\Http\Response\Exception;
+use Phalcon\Http\Response\HeadersInterface;
 use Phalcon\Http\Response\CookiesInterface;
+use Phalcon\Url\UrlInterface;
+use Phalcon\Mvc\ViewInterface;
 use Phalcon\Http\Response\Headers;
-use Phalcon\Http\Response\HeadersInterface;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Events\EventsAwareInterface;
+use Phalcon\Events\ManagerInterface;
 
 /**
  * Part of the HTTP cycle is return responses to the clients.
diff --git a/src/Http/Response/Cookies.php b/src/Http/Response/Cookies.php
index 1a8fb021..bc3c6b71 100644
--- a/src/Http/Response/Cookies.php
+++ b/src/Http/Response/Cookies.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Http\Response;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Http\Cookie\Exception;
 use Phalcon\Http\Cookie\CookieInterface;
 
 /**
diff --git a/src/Http/Response/Headers.php b/src/Http/Response/Headers.php
index b4dbfc17..a2ff98a1 100644
--- a/src/Http/Response/Headers.php
+++ b/src/Http/Response/Headers.php
@@ -57,7 +57,7 @@ public function isSent(): bool
     }
 
     /**
-     * Removes a header to be sent at the end of the request
+     * Removes a header by its name
      *
      * @param string $header
      * @return HeadersInterface
diff --git a/src/Http/ResponseInterface.php b/src/Http/ResponseInterface.php
index 07e1e700..85742855 100644
--- a/src/Http/ResponseInterface.php
+++ b/src/Http/ResponseInterface.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Http;
 
+use DateTime;
 use Phalcon\Http\Response\HeadersInterface;
 
 /**
diff --git a/src/Image/Adapter/AbstractAdapter.php b/src/Image/Adapter/AbstractAdapter.php
index 859c10d9..ef5f4e31 100644
--- a/src/Image/Adapter/AbstractAdapter.php
+++ b/src/Image/Adapter/AbstractAdapter.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Image\Adapter;
 
 use Phalcon\Image\Enum;
+use Phalcon\Image\Exception;
 
 /**
  * Phalcon\Image\Adapter
diff --git a/src/Image/Adapter/Gd.php b/src/Image/Adapter/Gd.php
index 772b0590..40653946 100644
--- a/src/Image/Adapter/Gd.php
+++ b/src/Image/Adapter/Gd.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Image\Adapter;
 
+use Phalcon\Image\Enum;
+use Phalcon\Image\Exception;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Image/Adapter/Imagick.php b/src/Image/Adapter/Imagick.php
index 6b4e31db..8b2b7b03 100644
--- a/src/Image/Adapter/Imagick.php
+++ b/src/Image/Adapter/Imagick.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Image\Adapter;
 
+use Phalcon\Image\Enum;
+use Phalcon\Image\Exception;
+
 /**
  * Phalcon\Image\Adapter\Imagick
  *
diff --git a/src/Image/ImageFactory.php b/src/Image/ImageFactory.php
index bcbd6d45..7d51f4ff 100644
--- a/src/Image/ImageFactory.php
+++ b/src/Image/ImageFactory.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Image;
 
+use Phalcon\Config;
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 use Phalcon\Image\Adapter\AdapterInterface;
 
 /**
diff --git a/src/Loader.php b/src/Loader.php
index 1031fe99..1902929c 100644
--- a/src/Loader.php
+++ b/src/Loader.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon;
 
+use Phalcon\Loader\Exception;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Events\EventsAwareInterface;
 
 /**
  * This component helps to load your project classes automatically based on some
diff --git a/src/Logger.php b/src/Logger.php
index 6cf6a417..f0742155 100644
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -9,8 +9,11 @@
  */
 namespace Phalcon;
 
+use DateTimeImmutable;
 use DateTimeZone;
+use Psr\Log\LoggerInterface;
 use Phalcon\Logger\Adapter\AdapterInterface;
+use Phalcon\Logger\Item;
 use Phalcon\Logger\Exception;
 
 /**
diff --git a/src/Logger/Adapter/AbstractAdapter.php b/src/Logger/Adapter/AbstractAdapter.php
index bea8f69f..e67a8fd9 100644
--- a/src/Logger/Adapter/AbstractAdapter.php
+++ b/src/Logger/Adapter/AbstractAdapter.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Logger\Adapter;
 
+use Phalcon\Logger;
+use Phalcon\Logger\Exception;
 use Phalcon\Logger\Formatter\FormatterInterface;
+use Phalcon\Logger\Item;
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/src/Logger/Adapter/AdapterInterface.php b/src/Logger/Adapter/AdapterInterface.php
index daa19c2c..9aa81592 100644
--- a/src/Logger/Adapter/AdapterInterface.php
+++ b/src/Logger/Adapter/AdapterInterface.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Logger\Adapter;
 
 use Phalcon\Logger\Formatter\FormatterInterface;
+use Phalcon\Logger\Item;
 
 /**
  * Phalcon\Logger\AdapterInterface
diff --git a/src/Logger/Adapter/Noop.php b/src/Logger/Adapter/Noop.php
index 7344fdca..9a8a7687 100644
--- a/src/Logger/Adapter/Noop.php
+++ b/src/Logger/Adapter/Noop.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Logger\Adapter;
 
+use Phalcon\Logger\Item;
+
 /**
  * Phalcon\Logger\Adapter\Noop
  *
diff --git a/src/Logger/Adapter/Stream.php b/src/Logger/Adapter/Stream.php
index 7f5bc0b1..1b451f22 100644
--- a/src/Logger/Adapter/Stream.php
+++ b/src/Logger/Adapter/Stream.php
@@ -9,6 +9,12 @@
  */
 namespace Phalcon\Logger\Adapter;
 
+use Phalcon\Logger\Adapter;
+use Phalcon\Logger\Exception;
+use Phalcon\Logger\Formatter\FormatterInterface;
+use Phalcon\Logger\Item;
+use UnexpectedValueException;
+
 /**
  * Phalcon\Logger\Adapter\Stream
  *
diff --git a/src/Logger/Adapter/Syslog.php b/src/Logger/Adapter/Syslog.php
index 82533d06..13eeaac7 100644
--- a/src/Logger/Adapter/Syslog.php
+++ b/src/Logger/Adapter/Syslog.php
@@ -9,6 +9,14 @@
  */
 namespace Phalcon\Logger\Adapter;
 
+use LogicException;
+use Phalcon\Helper\Arr;
+use Phalcon\Logger;
+use Phalcon\Logger\Adapter;
+use Phalcon\Logger\Exception;
+use Phalcon\Logger\Formatter\FormatterInterface;
+use Phalcon\Logger\Item;
+
 /**
  * Phalcon\Logger\Adapter\Syslog
  *
diff --git a/src/Logger/Formatter/AbstractFormatter.php b/src/Logger/Formatter/AbstractFormatter.php
index d3b92172..4d7c6943 100644
--- a/src/Logger/Formatter/AbstractFormatter.php
+++ b/src/Logger/Formatter/AbstractFormatter.php
@@ -9,6 +9,11 @@
  */
 namespace Phalcon\Logger\Formatter;
 
+use DateTimeImmutable;
+use DateTimeZone;
+use Phalcon\Logger;
+use Phalcon\Logger\Item;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Logger/Formatter/FormatterInterface.php b/src/Logger/Formatter/FormatterInterface.php
index e51a353d..84ee5d55 100644
--- a/src/Logger/Formatter/FormatterInterface.php
+++ b/src/Logger/Formatter/FormatterInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Logger\Formatter;
 
+use Phalcon\Logger\Item;
+
 /**
  * Phalcon\Logger\FormatterInterface
  *
diff --git a/src/Logger/Formatter/Json.php b/src/Logger/Formatter/Json.php
index 19527618..ff0ff547 100644
--- a/src/Logger/Formatter/Json.php
+++ b/src/Logger/Formatter/Json.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Logger\Formatter;
 
+use Phalcon\Helper\Json as JsonHelper;
+use Phalcon\Logger\Item;
+use Phalcon\Support\Helper\Str\Interpolate;
+
 /**
  * Phalcon\Logger\Formatter\Json
  *
diff --git a/src/Logger/Formatter/Line.php b/src/Logger/Formatter/Line.php
index b012cfa9..14b3df05 100644
--- a/src/Logger/Formatter/Line.php
+++ b/src/Logger/Formatter/Line.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Logger\Formatter;
 
+use DateTime;
+use Phalcon\Logger\Item;
+use Phalcon\Support\Helper\Str\Interpolate;
+
 /**
  * Phalcon\Logger\Formatter\Line
  *
diff --git a/src/Logger/LoggerFactory.php b/src/Logger/LoggerFactory.php
index 385acda0..21de5ed3 100644
--- a/src/Logger/LoggerFactory.php
+++ b/src/Logger/LoggerFactory.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Logger;
 
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
+use Phalcon\Helper\Arr;
 use Phalcon\Logger;
 
 /**
diff --git a/src/Messages/Message.php b/src/Messages/Message.php
index 20ca3c3d..cb358ba3 100644
--- a/src/Messages/Message.php
+++ b/src/Messages/Message.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Messages;
 
+use JsonSerializable;
+
 /**
  * Phalcon\Messages\Message
  *
diff --git a/src/Messages/Messages.php b/src/Messages/Messages.php
index b68c1e63..61deda05 100644
--- a/src/Messages/Messages.php
+++ b/src/Messages/Messages.php
@@ -9,6 +9,11 @@
  */
 namespace Phalcon\Messages;
 
+use ArrayAccess;
+use Countable;
+use Iterator;
+use JsonSerializable;
+
 /**
  * Represents a collection of messages
  */
diff --git a/src/Mvc/Application.php b/src/Mvc/Application.php
index d236a155..7f55f0c9 100644
--- a/src/Mvc/Application.php
+++ b/src/Mvc/Application.php
@@ -9,7 +9,14 @@
  */
 namespace Phalcon\Mvc;
 
+use Closure;
 use Phalcon\Application\AbstractApplication;
+use Phalcon\Di\DiInterface;
+use Phalcon\Http\ResponseInterface;
+use Phalcon\Events\ManagerInterface;
+use Phalcon\Mvc\Application\Exception;
+use Phalcon\Mvc\Router\RouteInterface;
+use Phalcon\Mvc\ModuleDefinitionInterface;
 
 /**
  * Phalcon\Mvc\Application
diff --git a/src/Mvc/Dispatcher.php b/src/Mvc/Dispatcher.php
index fa238287..7ed396e4 100644
--- a/src/Mvc/Dispatcher.php
+++ b/src/Mvc/Dispatcher.php
@@ -9,6 +9,11 @@
  */
 namespace Phalcon\Mvc;
 
+use Phalcon\Mvc\Dispatcher\Exception;
+use Phalcon\Events\ManagerInterface;
+use Phalcon\Http\ResponseInterface;
+use Phalcon\Dispatcher\AbstractDispatcher as BaseDispatcher;
+
 /**
  * Dispatching is the process of taking the request object, extracting the
  * module name, controller name, action name, and optional parameters contained
diff --git a/src/Mvc/Micro.php b/src/Mvc/Micro.php
index 9578ce51..e2e388a0 100644
--- a/src/Mvc/Micro.php
+++ b/src/Mvc/Micro.php
@@ -9,12 +9,23 @@
  */
 namespace Phalcon\Mvc;
 
+use ArrayAccess;
+use Closure;
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\Injectable;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Mvc\Micro\Exception;
 use Phalcon\Di\ServiceInterface;
-use Phalcon\Events\ManagerInterface;
+use Phalcon\Mvc\Micro\Collection;
+use Phalcon\Mvc\Micro\LazyLoader;
+use Phalcon\Http\ResponseInterface;
 use Phalcon\Mvc\Model\BinderInterface;
 use Phalcon\Mvc\Router\RouteInterface;
+use Phalcon\Events\EventsAwareInterface;
+use Phalcon\Events\ManagerInterface;
+use Phalcon\Mvc\Micro\MiddlewareInterface;
+use Phalcon\Mvc\Micro\CollectionInterface;
+use Throwable;
 
 /**
  * Phalcon\Mvc\Micro
diff --git a/src/Mvc/Micro/LazyLoader.php b/src/Mvc/Micro/LazyLoader.php
index c9460cfe..0fff7bdc 100644
--- a/src/Mvc/Micro/LazyLoader.php
+++ b/src/Mvc/Micro/LazyLoader.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\Micro;
 
+use Phalcon\Mvc\Model\BinderInterface;
+
 /**
  * Phalcon\Mvc\Micro\LazyLoader
  *
diff --git a/src/Mvc/Micro/MiddlewareInterface.php b/src/Mvc/Micro/MiddlewareInterface.php
index ab24356d..3b5de100 100644
--- a/src/Mvc/Micro/MiddlewareInterface.php
+++ b/src/Mvc/Micro/MiddlewareInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\Micro;
 
+use Phalcon\Mvc\Micro;
+
 /**
  * Allows to implement Phalcon\Mvc\Micro middleware in classes
  */
diff --git a/src/Mvc/Model.php b/src/Mvc/Model.php
index b18ab3b0..24bbe285 100644
--- a/src/Mvc/Model.php
+++ b/src/Mvc/Model.php
@@ -9,16 +9,39 @@
  */
 namespace Phalcon\Mvc;
 
+use JsonSerializable;
 use Phalcon\Db\Adapter\AdapterInterface;
+use Phalcon\Db\Column;
+use Phalcon\Db\DialectInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\RawValue;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Di;
+use Phalcon\Di\DiInterface;
 use Phalcon\Events\ManagerInterface as EventsManagerInterface;
+use Phalcon\Helper\Arr;
+use Phalcon\Messages\Message;
+use Phalcon\Messages\MessageInterface;
+use Phalcon\Mvc\Model\BehaviorInterface;
+use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\CriteriaInterface;
+use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\ManagerInterface;
 use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\Query;
-use Phalcon\Mvc\Model\Relation;
+use Phalcon\Mvc\Model\Query\Builder;
+use Phalcon\Mvc\Model\Query\BuilderInterface;
+use Phalcon\Mvc\Model\QueryInterface;
+use Phalcon\Mvc\Model\ResultInterface;
+use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
+use Phalcon\Mvc\Model\Relation;
+use Phalcon\Mvc\Model\RelationInterface;
 use Phalcon\Mvc\Model\TransactionInterface;
+use Phalcon\Mvc\Model\ValidationFailed;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Validation\ValidationInterface;
+use Serializable;
 
 /**
  * Phalcon\Mvc\Model
diff --git a/src/Mvc/Model/Behavior.php b/src/Mvc/Model/Behavior.php
index 9afe06de..089a5597 100644
--- a/src/Mvc/Model/Behavior.php
+++ b/src/Mvc/Model/Behavior.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Mvc\ModelInterface;
+
 /**
  * Phalcon\Mvc\Model\Behavior
  *
diff --git a/src/Mvc/Model/Behavior/SoftDelete.php b/src/Mvc/Model/Behavior/SoftDelete.php
index 85b47a4d..9b9ee263 100644
--- a/src/Mvc/Model/Behavior/SoftDelete.php
+++ b/src/Mvc/Model/Behavior/SoftDelete.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Mvc\Model\Behavior;
 
+use Phalcon\Mvc\ModelInterface;
 use Phalcon\Mvc\Model\Behavior;
+use Phalcon\Mvc\Model\Exception;
 
 /**
  * Phalcon\Mvc\Model\Behavior\SoftDelete
diff --git a/src/Mvc/Model/Behavior/Timestampable.php b/src/Mvc/Model/Behavior/Timestampable.php
index 0863099b..455eaba4 100644
--- a/src/Mvc/Model/Behavior/Timestampable.php
+++ b/src/Mvc/Model/Behavior/Timestampable.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Mvc\Model\Behavior;
 
+use Closure;
+use Phalcon\Mvc\ModelInterface;
 use Phalcon\Mvc\Model\Behavior;
+use Phalcon\Mvc\Model\Exception;
 
 /**
  * Phalcon\Mvc\Model\Behavior\Timestampable
diff --git a/src/Mvc/Model/BehaviorInterface.php b/src/Mvc/Model/BehaviorInterface.php
index 30423559..483a62a1 100644
--- a/src/Mvc/Model/BehaviorInterface.php
+++ b/src/Mvc/Model/BehaviorInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Mvc\ModelInterface;
+
 /**
  * Phalcon\Mvc\Model\BehaviorInterface
  *
diff --git a/src/Mvc/Model/Binder.php b/src/Mvc/Model/Binder.php
index 109aff8a..2644edc5 100644
--- a/src/Mvc/Model/Binder.php
+++ b/src/Mvc/Model/Binder.php
@@ -9,7 +9,12 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Closure;
+use Phalcon\Mvc\Controller\BindModelInterface;
+use Phalcon\Mvc\Model\Binder\BindableInterface;
 use Phalcon\Cache\Adapter\AdapterInterface;
+use ReflectionFunction;
+use ReflectionMethod;
 
 /**
  * Phalcon\Mvc\Model\Binder
diff --git a/src/Mvc/Model/Criteria.php b/src/Mvc/Model/Criteria.php
index 119530eb..03150d1c 100644
--- a/src/Mvc/Model/Criteria.php
+++ b/src/Mvc/Model/Criteria.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Di;
+use Phalcon\Db\Column;
 use Phalcon\Di\DiInterface;
+use Phalcon\Di\InjectionAwareInterface;
 use Phalcon\Mvc\Model\Query\BuilderInterface;
 
 /**
diff --git a/src/Mvc/Model/CriteriaInterface.php b/src/Mvc/Model/CriteriaInterface.php
index d4d62d17..49a235e4 100644
--- a/src/Mvc/Model/CriteriaInterface.php
+++ b/src/Mvc/Model/CriteriaInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Di\DiInterface;
+
 /**
  * Phalcon\Mvc\Model\CriteriaInterface
  *
diff --git a/src/Mvc/Model/Manager.php b/src/Mvc/Model/Manager.php
index 268264b3..3e949f8e 100644
--- a/src/Mvc/Model/Manager.php
+++ b/src/Mvc/Model/Manager.php
@@ -11,10 +11,13 @@
 
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Di\DiInterface;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface as EventsManagerInterface;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Mvc\Model\Query\BuilderInterface;
 use Phalcon\Mvc\Model\Query\StatusInterface;
-use Phalcon\Mvc\ModelInterface;
 
 /**
  * Phalcon\Mvc\Model\Manager
diff --git a/src/Mvc/Model/ManagerInterface.php b/src/Mvc/Model/ManagerInterface.php
index 298df165..c091c5ea 100644
--- a/src/Mvc/Model/ManagerInterface.php
+++ b/src/Mvc/Model/ManagerInterface.php
@@ -10,9 +10,9 @@
 namespace Phalcon\Mvc\Model;
 
 use Phalcon\Db\Adapter\AdapterInterface;
+use Phalcon\Mvc\ModelInterface;
 use Phalcon\Mvc\Model\Query\BuilderInterface;
 use Phalcon\Mvc\Model\Query\StatusInterface;
-use Phalcon\Mvc\ModelInterface;
 
 /**
  * Phalcon\Mvc\Model\ManagerInterface
diff --git a/src/Mvc/Model/MetaData.php b/src/Mvc/Model/MetaData.php
index f6f6ba94..02d10a78 100644
--- a/src/Mvc/Model/MetaData.php
+++ b/src/Mvc/Model/MetaData.php
@@ -11,7 +11,10 @@
 
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
 use Phalcon\Di\DiInterface;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Mvc\Model\MetaData\Strategy\Introspection;
 use Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface;
+use Phalcon\Mvc\ModelInterface;
 
 /**
  * Phalcon\Mvc\Model\MetaData
diff --git a/src/Mvc/Model/MetaData/Apcu.php b/src/Mvc/Model/MetaData/Apcu.php
index 0280a7f7..27cb4644 100644
--- a/src/Mvc/Model/MetaData/Apcu.php
+++ b/src/Mvc/Model/MetaData/Apcu.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Mvc\Model\MetaData;
 
+use Phalcon\Helper\Arr;
 use Phalcon\Mvc\Model\MetaData;
+use Phalcon\Mvc\Model\Exception;
+use Phalcon\Cache\AdapterFactory;
 
 /**
  * Phalcon\Mvc\Model\MetaData\Apcu
diff --git a/src/Mvc/Model/MetaData/Libmemcached.php b/src/Mvc/Model/MetaData/Libmemcached.php
index 724e4ee1..7e259547 100644
--- a/src/Mvc/Model/MetaData/Libmemcached.php
+++ b/src/Mvc/Model/MetaData/Libmemcached.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Mvc\Model\MetaData;
 
+use Phalcon\Helper\Arr;
+use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\MetaData;
+use Phalcon\Cache\AdapterFactory;
 
 /**
  * Phalcon\Mvc\Model\MetaData\Libmemcached
diff --git a/src/Mvc/Model/MetaData/Memory.php b/src/Mvc/Model/MetaData/Memory.php
index 35a10c40..aa7d16f8 100644
--- a/src/Mvc/Model/MetaData/Memory.php
+++ b/src/Mvc/Model/MetaData/Memory.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
+use Phalcon\Mvc\Model\Exception;
 
 /**
  * Phalcon\Mvc\Model\MetaData\Memory
diff --git a/src/Mvc/Model/MetaData/Redis.php b/src/Mvc/Model/MetaData/Redis.php
index eefa8af0..ec1bfe5f 100644
--- a/src/Mvc/Model/MetaData/Redis.php
+++ b/src/Mvc/Model/MetaData/Redis.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Mvc\Model\MetaData;
 
+use Phalcon\Helper\Arr;
 use Phalcon\Mvc\Model\MetaData;
+use Phalcon\Cache\AdapterFactory;
 
 /**
  * Phalcon\Mvc\Model\MetaData\Redis
diff --git a/src/Mvc/Model/MetaData/Strategy/Annotations.php b/src/Mvc/Model/MetaData/Strategy/Annotations.php
index 9fdd2e38..116e86f8 100644
--- a/src/Mvc/Model/MetaData/Strategy/Annotations.php
+++ b/src/Mvc/Model/MetaData/Strategy/Annotations.php
@@ -9,6 +9,12 @@
  */
 namespace Phalcon\Mvc\Model\MetaData\Strategy;
 
+use Phalcon\Di\DiInterface;
+use Phalcon\Db\Column;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\MetaData;
+use Phalcon\Mvc\Model\Exception;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Mvc/Model/MetaData/Strategy/Introspection.php b/src/Mvc/Model/MetaData/Strategy/Introspection.php
index 0e875ac1..5f07f3c3 100644
--- a/src/Mvc/Model/MetaData/Strategy/Introspection.php
+++ b/src/Mvc/Model/MetaData/Strategy/Introspection.php
@@ -9,6 +9,13 @@
  */
 namespace Phalcon\Mvc\Model\MetaData\Strategy;
 
+use Phalcon\Di\DiInterface;
+use Phalcon\Db\Adapter\AdapterInterface;
+use Phalcon\Db\Column;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\Exception;
+use Phalcon\Mvc\Model\MetaData;
+
 /**
  * Phalcon\Mvc\Model\MetaData\Strategy\Introspection
  *
diff --git a/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php b/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php
index f2cf8b19..37c512ec 100644
--- a/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php
+++ b/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Mvc\Model\MetaData\Strategy;
 
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Di\DiInterface;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Mvc/Model/MetaData/Stream.php b/src/Mvc/Model/MetaData/Stream.php
index 1feae5e8..cf910476 100644
--- a/src/Mvc/Model/MetaData/Stream.php
+++ b/src/Mvc/Model/MetaData/Stream.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
+use Phalcon\Mvc\Model\Exception;
 
 /**
  * Phalcon\Mvc\Model\MetaData\Stream
diff --git a/src/Mvc/Model/MetaDataInterface.php b/src/Mvc/Model/MetaDataInterface.php
index 51f83a65..bd7a8a35 100644
--- a/src/Mvc/Model/MetaDataInterface.php
+++ b/src/Mvc/Model/MetaDataInterface.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Mvc\ModelInterface;
 use Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface;
 
 /**
diff --git a/src/Mvc/Model/Query.php b/src/Mvc/Model/Query.php
index 9b761043..f5820c54 100644
--- a/src/Mvc/Model/Query.php
+++ b/src/Mvc/Model/Query.php
@@ -9,10 +9,21 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Db\Column;
+use Phalcon\Db\RawValue;
+use Phalcon\Db\ResultInterface;
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Di\DiInterface;
-use Phalcon\Mvc\Model\Query\StatusInterface;
+use Phalcon\Helper\Arr;
 use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\Query\Status;
+use Phalcon\Mvc\Model\Resultset\Complex;
+use Phalcon\Mvc\Model\Query\StatusInterface;
+use Phalcon\Mvc\Model\ResultsetInterface;
+use Phalcon\Mvc\Model\Resultset\Simple;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Db\DialectInterface;
+use Phalcon\Mvc\Model\Query\Lang;
 use Psr\SimpleCache\CacheInterface;
 
 /**
diff --git a/src/Mvc/Model/Query/Builder.php b/src/Mvc/Model/Query/Builder.php
index 20249718..66a98a95 100644
--- a/src/Mvc/Model/Query/Builder.php
+++ b/src/Mvc/Model/Query/Builder.php
@@ -9,7 +9,12 @@
  */
 namespace Phalcon\Mvc\Model\Query;
 
+use Phalcon\Di;
+use Phalcon\Db\Column;
 use Phalcon\Di\DiInterface;
+use Phalcon\Helper\Arr;
+use Phalcon\Mvc\Model\Exception;
+use Phalcon\Di\InjectionAwareInterface;
 use Phalcon\Mvc\Model\QueryInterface;
 
 /**
diff --git a/src/Mvc/Model/Query/Status.php b/src/Mvc/Model/Query/Status.php
index 938f3cd6..b5a0a53f 100644
--- a/src/Mvc/Model/Query/Status.php
+++ b/src/Mvc/Model/Query/Status.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Mvc\Model\Query;
 
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Mvc\ModelInterface;
 
 /**
diff --git a/src/Mvc/Model/Query/StatusInterface.php b/src/Mvc/Model/Query/StatusInterface.php
index b70cbae2..c899514a 100644
--- a/src/Mvc/Model/Query/StatusInterface.php
+++ b/src/Mvc/Model/Query/StatusInterface.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Mvc\Model\Query;
 
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Mvc\ModelInterface;
 
 /**
diff --git a/src/Mvc/Model/Resultset.php b/src/Mvc/Model/Resultset.php
index 4095e562..1301fd95 100644
--- a/src/Mvc/Model/Resultset.php
+++ b/src/Mvc/Model/Resultset.php
@@ -9,8 +9,19 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use ArrayAccess;
+use Closure;
+use Countable;
+use Iterator;
+use JsonSerializable;
+use Phalcon\Db\Enum;
+use Phalcon\Messages\MessageInterface;
+use Phalcon\Mvc\Model;
 use Phalcon\Mvc\ModelInterface;
+use Phalcon\Storage\Serializer\SerializerInterface;
 use Psr\SimpleCache\CacheInterface;
+use SeekableIterator;
+use Serializable;
 
 /**
  * Phalcon\Mvc\Model\Resultset
diff --git a/src/Mvc/Model/Resultset/Complex.php b/src/Mvc/Model/Resultset/Complex.php
index 78e89d64..f66674a6 100644
--- a/src/Mvc/Model/Resultset/Complex.php
+++ b/src/Mvc/Model/Resultset/Complex.php
@@ -9,9 +9,18 @@
  */
 namespace Phalcon\Mvc\Model\Resultset;
 
+use Phalcon\Di;
+use Phalcon\Di\DiInterface;
 use Phalcon\Db\ResultInterface;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+use Phalcon\Mvc\Model\Row;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Storage\Serializer\SerializerInterface;
 use Psr\SimpleCache\CacheInterface;
+use stdClass;
 
 /**
  * Phalcon\Mvc\Model\Resultset\Complex
diff --git a/src/Mvc/Model/Resultset/Simple.php b/src/Mvc/Model/Resultset/Simple.php
index 9344cba7..09889bfe 100644
--- a/src/Mvc/Model/Resultset/Simple.php
+++ b/src/Mvc/Model/Resultset/Simple.php
@@ -9,9 +9,14 @@
  */
 namespace Phalcon\Mvc\Model\Resultset;
 
+use Phalcon\Di;
+use Phalcon\Di\DiInterface;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\Row;
 use Phalcon\Mvc\ModelInterface;
+use Phalcon\Storage\Serializer\SerializerInterface;
 use Psr\SimpleCache\CacheInterface;
 
 /**
diff --git a/src/Mvc/Model/ResultsetInterface.php b/src/Mvc/Model/ResultsetInterface.php
index 1ec61669..0a44eb4f 100644
--- a/src/Mvc/Model/ResultsetInterface.php
+++ b/src/Mvc/Model/ResultsetInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Closure;
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Mvc\ModelInterface;
 use Psr\SimpleCache\CacheInterface;
 
diff --git a/src/Mvc/Model/Row.php b/src/Mvc/Model/Row.php
index a6ec34c3..33c4f443 100644
--- a/src/Mvc/Model/Row.php
+++ b/src/Mvc/Model/Row.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use ArrayAccess;
+use JsonSerializable;
+use Phalcon\Mvc\EntityInterface;
 use Phalcon\Mvc\ModelInterface;
 
 /**
diff --git a/src/Mvc/Model/Transaction.php b/src/Mvc/Model/Transaction.php
index 7206cc76..7d17ab5d 100644
--- a/src/Mvc/Model/Transaction.php
+++ b/src/Mvc/Model/Transaction.php
@@ -11,8 +11,10 @@
 
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Di\DiInterface;
-use Phalcon\Mvc\Model\Transaction\ManagerInterface;
 use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\Transaction\Failed as TxFailed;
+use Phalcon\Mvc\Model\Transaction\ManagerInterface;
+use Phalcon\Mvc\Model\TransactionInterface;
 
 /**
  * Phalcon\Mvc\Model\Transaction
diff --git a/src/Mvc/Model/Transaction/Manager.php b/src/Mvc/Model/Transaction/Manager.php
index b98801a4..7116f628 100644
--- a/src/Mvc/Model/Transaction/Manager.php
+++ b/src/Mvc/Model/Transaction/Manager.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Mvc\Model\Transaction;
 
+use Phalcon\Di;
 use Phalcon\Di\DiInterface;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Mvc\Model\Transaction;
 use Phalcon\Mvc\Model\TransactionInterface;
 
 /**
diff --git a/src/Mvc/Model/TransactionInterface.php b/src/Mvc/Model/TransactionInterface.php
index 19b23ad9..ed99347e 100644
--- a/src/Mvc/Model/TransactionInterface.php
+++ b/src/Mvc/Model/TransactionInterface.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Mvc\Model;
 
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\Transaction\ManagerInterface;
+
 /**
  * Phalcon\Mvc\Model\TransactionInterface
  *
diff --git a/src/Mvc/ModelInterface.php b/src/Mvc/ModelInterface.php
index 50b25337..9f9b043f 100644
--- a/src/Mvc/ModelInterface.php
+++ b/src/Mvc/ModelInterface.php
@@ -10,9 +10,12 @@
 namespace Phalcon\Mvc;
 
 use Phalcon\Db\Adapter\AdapterInterface;
+use Phalcon\Di\DiInterface;
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Mvc\Model\CriteriaInterface;
 use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\ResultsetInterface;
+use Phalcon\Mvc\Model\TransactionInterface;
 
 /**
  * Phalcon\Mvc\ModelInterface
@@ -282,7 +285,7 @@ public function setConnectionService(string $connectionService): void;
      * constants
      *
      * @param int $dirtyState
-     * @return bool|ModelInterface
+     * @return 0|ModelInterface
      */
     public function setDirtyState(int $dirtyState);
 
diff --git a/src/Mvc/ModuleDefinitionInterface.php b/src/Mvc/ModuleDefinitionInterface.php
index ac195410..514135f4 100644
--- a/src/Mvc/ModuleDefinitionInterface.php
+++ b/src/Mvc/ModuleDefinitionInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc;
 
+use Phalcon\Di\DiInterface;
+
 /**
  * Phalcon\Mvc\ModuleDefinitionInterface
  *
diff --git a/src/Mvc/Router.php b/src/Mvc/Router.php
index e49eb958..bdf4b977 100644
--- a/src/Mvc/Router.php
+++ b/src/Mvc/Router.php
@@ -9,9 +9,14 @@
  */
 namespace Phalcon\Mvc;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Http\RequestInterface;
+use Phalcon\Mvc\Router\Exception;
 use Phalcon\Mvc\Router\GroupInterface;
+use Phalcon\Mvc\Router\Route;
 use Phalcon\Mvc\Router\RouteInterface;
 
 /**
diff --git a/src/Mvc/Router/Annotations.php b/src/Mvc/Router/Annotations.php
index d3e39133..8eaf9361 100644
--- a/src/Mvc/Router/Annotations.php
+++ b/src/Mvc/Router/Annotations.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Mvc\Router;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\Router;
+use Phalcon\Annotations\Annotation;
 
 /**
  * Phalcon\Mvc\Router\Annotations
diff --git a/src/Mvc/RouterInterface.php b/src/Mvc/RouterInterface.php
index 938590c4..fccd5977 100644
--- a/src/Mvc/RouterInterface.php
+++ b/src/Mvc/RouterInterface.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Mvc;
 
 use Phalcon\Mvc\Router\RouteInterface;
+use Phalcon\Mvc\Router\GroupInterface;
 
 /**
  * Interface for Phalcon\Mvc\Router
diff --git a/src/Mvc/View.php b/src/Mvc/View.php
index 35479a5f..a0513ef1 100644
--- a/src/Mvc/View.php
+++ b/src/Mvc/View.php
@@ -9,8 +9,15 @@
  */
 namespace Phalcon\Mvc;
 
+use Closure;
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\Injectable;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Str;
+use Phalcon\Mvc\View\Exception;
+use Phalcon\Events\EventsAwareInterface;
+use Phalcon\Mvc\View\Engine\Php as PhpEngine;
 
 /**
  * Phalcon\Mvc\View
diff --git a/src/Mvc/View/Engine/Volt.php b/src/Mvc/View/Engine/Volt.php
index 7e031bcc..8d5916ad 100644
--- a/src/Mvc/View/Engine/Volt.php
+++ b/src/Mvc/View/Engine/Volt.php
@@ -9,8 +9,11 @@
  */
 namespace Phalcon\Mvc\View\Engine;
 
+use Phalcon\Di\DiInterface;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Mvc\View\Engine\Volt\Compiler;
+use Phalcon\Mvc\View\Exception;
 
 /**
  * Designer friendly and fast template engine for PHP written in Zephir/C
diff --git a/src/Mvc/View/Engine/Volt/Compiler.php b/src/Mvc/View/Engine/Volt/Compiler.php
index 86c590e7..b1447b68 100644
--- a/src/Mvc/View/Engine/Volt/Compiler.php
+++ b/src/Mvc/View/Engine/Volt/Compiler.php
@@ -9,8 +9,10 @@
  */
 namespace Phalcon\Mvc\View\Engine\Volt;
 
+use Closure;
 use Phalcon\Di\DiInterface;
 use Phalcon\Mvc\ViewBaseInterface;
+use Phalcon\Di\InjectionAwareInterface;
 
 /**
  * This class reads and compiles Volt templates into PHP plain code
diff --git a/src/Mvc/View/Engine/Volt/Exception.php b/src/Mvc/View/Engine/Volt/Exception.php
index 8783b6f1..934f9336 100644
--- a/src/Mvc/View/Engine/Volt/Exception.php
+++ b/src/Mvc/View/Engine/Volt/Exception.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc\View\Engine\Volt;
 
+use Phalcon\Mvc\View\Exception as BaseException;
+
 /**
  * Class for exceptions thrown by Phalcon\Mvc\View
  */
diff --git a/src/Mvc/View/Simple.php b/src/Mvc/View/Simple.php
index 991f012f..517a28cc 100644
--- a/src/Mvc/View/Simple.php
+++ b/src/Mvc/View/Simple.php
@@ -9,9 +9,16 @@
  */
 namespace Phalcon\Mvc\View;
 
+use Closure;
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\Injectable;
+use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Str;
+use Phalcon\Mvc\ViewBaseInterface;
 use Phalcon\Mvc\View\Engine\EngineInterface;
+use Phalcon\Mvc\View\Engine\Php as PhpEngine;
 
 /**
  * Phalcon\Mvc\View\Simple
diff --git a/src/Mvc/ViewBaseInterface.php b/src/Mvc/ViewBaseInterface.php
index 494f184a..fc7f446f 100644
--- a/src/Mvc/ViewBaseInterface.php
+++ b/src/Mvc/ViewBaseInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Mvc;
 
+use Phalcon\Cache\Adapter\AdapterInterface;
+
 /**
  * Phalcon\Mvc\ViewInterface
  *
diff --git a/src/Paginator/Adapter/AbstractAdapter.php b/src/Paginator/Adapter/AbstractAdapter.php
index 97c5b2c0..1f2f0b5a 100644
--- a/src/Paginator/Adapter/AbstractAdapter.php
+++ b/src/Paginator/Adapter/AbstractAdapter.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Paginator\Adapter;
 
+use Phalcon\Paginator\Exception;
+use Phalcon\Paginator\Repository;
 use Phalcon\Paginator\RepositoryInterface;
 
 /**
@@ -76,10 +78,10 @@ public function setCurrentPage(int $page): AdapterInterface
     /**
      * Set current rows limit
      *
-     * @param int $limitRows
+     * @param int $limit
      * @return AdapterInterface
      */
-    public function setLimit(int $limitRows): AdapterInterface
+    public function setLimit(int $limit): AdapterInterface
     {
     }
 
diff --git a/src/Paginator/Adapter/Model.php b/src/Paginator/Adapter/Model.php
index cca3b9d3..21f04fe3 100644
--- a/src/Paginator/Adapter/Model.php
+++ b/src/Paginator/Adapter/Model.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Paginator\Adapter;
 
+use Phalcon\Helper\Arr;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Mvc\Model\ResultsetInterface;
+use Phalcon\Paginator\Exception;
 use Phalcon\Paginator\RepositoryInterface;
 
 /**
diff --git a/src/Paginator/Adapter/NativeArray.php b/src/Paginator/Adapter/NativeArray.php
index a6bae499..98dc5e5e 100644
--- a/src/Paginator/Adapter/NativeArray.php
+++ b/src/Paginator/Adapter/NativeArray.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Paginator\Adapter;
 
+use Phalcon\Paginator\Exception;
 use Phalcon\Paginator\RepositoryInterface;
 
 /**
diff --git a/src/Paginator/Adapter/QueryBuilder.php b/src/Paginator/Adapter/QueryBuilder.php
index 5ed0a4a1..c2318586 100644
--- a/src/Paginator/Adapter/QueryBuilder.php
+++ b/src/Paginator/Adapter/QueryBuilder.php
@@ -9,8 +9,10 @@
  */
 namespace Phalcon\Paginator\Adapter;
 
+use Phalcon\Db\Enum;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Paginator\RepositoryInterface;
+use Phalcon\Paginator\Exception;
 
 /**
  * Phalcon\Paginator\Adapter\QueryBuilder
diff --git a/src/Paginator/PaginatorFactory.php b/src/Paginator/PaginatorFactory.php
index f1193ec5..9659375b 100644
--- a/src/Paginator/PaginatorFactory.php
+++ b/src/Paginator/PaginatorFactory.php
@@ -9,8 +9,9 @@
  */
 namespace Phalcon\Paginator;
 
-use Phalcon\Factory\AbstractFactory;
 use Phalcon\Paginator\Adapter\AdapterInterface;
+use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/src/Paginator/Repository.php b/src/Paginator/Repository.php
index 19931fb2..20daf915 100644
--- a/src/Paginator/Repository.php
+++ b/src/Paginator/Repository.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Paginator;
 
+use JsonSerializable;
+use Phalcon\Helper\Arr;
+
 /**
  * Phalcon\Paginator\Repository
  *
diff --git a/src/Security.php b/src/Security.php
index fdd8723e..72446f46 100644
--- a/src/Security.php
+++ b/src/Security.php
@@ -9,9 +9,11 @@
  */
 namespace Phalcon;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Http\RequestInterface;
 use Phalcon\Security\Random;
+use Phalcon\Security\Exception;
 use Phalcon\Session\ManagerInterface as SessionInterface;
 
 /**
diff --git a/src/Security/JWT/Builder.php b/src/Security/JWT/Builder.php
index 8a481556..fd7eb587 100644
--- a/src/Security/JWT/Builder.php
+++ b/src/Security/JWT/Builder.php
@@ -9,9 +9,15 @@
  */
 namespace Phalcon\Security\JWT;
 
+use Phalcon\Collection;
 use Phalcon\Collection\CollectionInterface;
+use Phalcon\Helper\Base64;
+use Phalcon\Helper\Json;
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Signer\SignerInterface;
+use Phalcon\Security\JWT\Token\Enum;
+use Phalcon\Security\JWT\Token\Item;
+use Phalcon\Security\JWT\Token\Signature;
 use Phalcon\Security\JWT\Token\Token;
 
 /**
diff --git a/src/Security/JWT/Exceptions/UnsupportedAlgorithmException.php b/src/Security/JWT/Exceptions/UnsupportedAlgorithmException.php
index 54847fee..427fa4db 100644
--- a/src/Security/JWT/Exceptions/UnsupportedAlgorithmException.php
+++ b/src/Security/JWT/Exceptions/UnsupportedAlgorithmException.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Security\JWT\Exceptions;
 
 use Exception;
+use Throwable;
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/src/Security/JWT/Exceptions/ValidatorException.php b/src/Security/JWT/Exceptions/ValidatorException.php
index 09020d3d..bd615e7a 100644
--- a/src/Security/JWT/Exceptions/ValidatorException.php
+++ b/src/Security/JWT/Exceptions/ValidatorException.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Security\JWT\Exceptions;
 
 use Exception;
+use Throwable;
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/src/Security/JWT/Token/Parser.php b/src/Security/JWT/Token/Parser.php
index 10034e6f..47c89d4c 100644
--- a/src/Security/JWT/Token/Parser.php
+++ b/src/Security/JWT/Token/Parser.php
@@ -9,6 +9,11 @@
  */
 namespace Phalcon\Security\JWT\Token;
 
+use InvalidArgumentException;
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Base64;
+use Phalcon\Helper\Json;
+
 /**
  * Class Parser
  */
diff --git a/src/Security/JWT/Validator.php b/src/Security/JWT/Validator.php
index 1607fd36..7bcdf519 100644
--- a/src/Security/JWT/Validator.php
+++ b/src/Security/JWT/Validator.php
@@ -11,6 +11,7 @@
 
 use Phalcon\Security\JWT\Exceptions\ValidatorException;
 use Phalcon\Security\JWT\Signer\SignerInterface;
+use Phalcon\Security\JWT\Token\Enum;
 use Phalcon\Security\JWT\Token\Token;
 
 /**
diff --git a/src/Session/Adapter/AbstractAdapter.php b/src/Session/Adapter/AbstractAdapter.php
index e0d4fc6e..da45728c 100644
--- a/src/Session/Adapter/AbstractAdapter.php
+++ b/src/Session/Adapter/AbstractAdapter.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Session\Adapter;
 
 use Phalcon\Storage\Adapter\AdapterInterface;
+use SessionHandlerInterface;
 
 /**
  * This file is part of the Phalcon.
@@ -50,9 +51,8 @@ public function destroy($id): bool
      * Garbage Collector
      *
      * @param mixed $maxlifetime
-     * @return bool
      */
-    public function gc($maxlifetime): bool
+    public function gc($maxlifetime)
     {
     }
 
diff --git a/src/Session/Adapter/Libmemcached.php b/src/Session/Adapter/Libmemcached.php
index 5a11b14d..c12cd36e 100644
--- a/src/Session/Adapter/Libmemcached.php
+++ b/src/Session/Adapter/Libmemcached.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Session\Adapter;
 
+use Phalcon\Storage\AdapterFactory;
+use Phalcon\Helper\Arr;
+
 /**
  * Phalcon\Session\Adapter\Libmemcached
  */
diff --git a/src/Session/Adapter/Noop.php b/src/Session/Adapter/Noop.php
index c1ffd2f4..c32ce3a5 100644
--- a/src/Session/Adapter/Noop.php
+++ b/src/Session/Adapter/Noop.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Session\Adapter;
 
+use SessionHandlerInterface;
+
 /**
  * Phalcon\Session\Adapter\Noop
  *
@@ -90,9 +92,8 @@ public function destroy($id): bool
      * Garbage Collector
      *
      * @param mixed $maxlifetime
-     * @return bool
      */
-    public function gc($maxlifetime): bool
+    public function gc($maxlifetime)
     {
     }
 
diff --git a/src/Session/Adapter/Redis.php b/src/Session/Adapter/Redis.php
index 6732c01a..16ed7b50 100644
--- a/src/Session/Adapter/Redis.php
+++ b/src/Session/Adapter/Redis.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Session\Adapter;
 
+use Phalcon\Storage\AdapterFactory;
+use Phalcon\Helper\Arr;
+
 /**
  * Phalcon\Session\Adapter\Redis
  */
diff --git a/src/Session/Adapter/Stream.php b/src/Session/Adapter/Stream.php
index 9758443c..b7b820a6 100644
--- a/src/Session/Adapter/Stream.php
+++ b/src/Session/Adapter/Stream.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Session\Adapter;
 
+use Phalcon\Helper\Str;
+use Phalcon\Session\Exception;
+
 /**
  * Phalcon\Session\Adapter\Stream
  *
@@ -58,10 +61,11 @@ public function destroy($id): bool
     }
 
     /**
+     * Garbage Collector
+     *
      * @param mixed $maxlifetime
-     * @return bool
      */
-    public function gc($maxlifetime): bool
+    public function gc($maxlifetime)
     {
     }
 
diff --git a/src/Session/Bag.php b/src/Session/Bag.php
index e616c49c..fa0938ca 100644
--- a/src/Session/Bag.php
+++ b/src/Session/Bag.php
@@ -10,7 +10,9 @@
 namespace Phalcon\Session;
 
 use Phalcon\Collection;
+use Phalcon\Di;
 use Phalcon\Di\DiInterface;
+use Phalcon\Di\InjectionAwareInterface;
 
 /**
  * Phalcon\Session\Bag
diff --git a/src/Session/Manager.php b/src/Session/Manager.php
index 111de4f4..e3145b23 100644
--- a/src/Session/Manager.php
+++ b/src/Session/Manager.php
@@ -10,8 +10,11 @@
 namespace Phalcon\Session;
 
 use InvalidArgumentException;
-use Phalcon\Di\AbstractInjectionAware;
+use RuntimeException;
 use SessionHandlerInterface;
+use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Di\DiInterface;
+use Phalcon\Helper\Arr;
 
 /**
  * Phalcon\Session\Manager
diff --git a/src/Session/ManagerInterface.php b/src/Session/ManagerInterface.php
index 58faaa25..11c35f09 100644
--- a/src/Session/ManagerInterface.php
+++ b/src/Session/ManagerInterface.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Session;
 
 use InvalidArgumentException;
+use RuntimeException;
 use SessionHandlerInterface;
 
 /**
diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
index 85e98c57..4eda577f 100644
--- a/src/Storage/Adapter/AbstractAdapter.php
+++ b/src/Storage/Adapter/AbstractAdapter.php
@@ -10,9 +10,12 @@
 namespace Phalcon\Storage\Adapter;
 
 use DateInterval;
+use DateTime;
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Str;
 use Phalcon\Storage\Exception;
-use Phalcon\Storage\Serializer\SerializerInterface;
 use Phalcon\Storage\SerializerFactory;
+use Phalcon\Storage\Serializer\SerializerInterface;
 
 /**
  * This file is part of the Phalcon Framework.
@@ -64,6 +67,7 @@ abstract class AbstractAdapter implements \Phalcon\Storage\Adapter\AdapterInterf
 
 
     /**
+     *
      * Name of the default serializer class
      *
      * @return string
@@ -73,6 +77,7 @@ public function getDefaultSerializer(): string
     }
 
     /**
+     *
      * Name of the default serializer class
      *
      * @param string $defaultSerializer
diff --git a/src/Storage/Adapter/AdapterInterface.php b/src/Storage/Adapter/AdapterInterface.php
index 475ff95b..ddcbe9c3 100644
--- a/src/Storage/Adapter/AdapterInterface.php
+++ b/src/Storage/Adapter/AdapterInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Storage\Adapter;
 
+use Phalcon\Storage\Serializer\SerializerInterface;
+
 /**
  * Interface for Phalcon\Logger adapters
  */
diff --git a/src/Storage/Adapter/Apcu.php b/src/Storage/Adapter/Apcu.php
index 0e8019d2..8abf803c 100644
--- a/src/Storage/Adapter/Apcu.php
+++ b/src/Storage/Adapter/Apcu.php
@@ -9,6 +9,12 @@
  */
 namespace Phalcon\Storage\Adapter;
 
+use APCuIterator;
+use Phalcon\Helper\Arr;
+use Phalcon\Storage\Exception;
+use Phalcon\Storage\SerializerFactory;
+use Phalcon\Storage\Serializer\SerializerInterface;
+
 /**
  * Apcu adapter
  */
diff --git a/src/Storage/Adapter/Libmemcached.php b/src/Storage/Adapter/Libmemcached.php
index 7ffb8697..06a7c3c7 100644
--- a/src/Storage/Adapter/Libmemcached.php
+++ b/src/Storage/Adapter/Libmemcached.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Storage\Adapter;
 
+use Phalcon\Helper\Arr;
 use Phalcon\Storage\Exception;
+use Phalcon\Storage\SerializerFactory;
+use Phalcon\Storage\Serializer\SerializerInterface;
 
 /**
  * Libmemcached adapter
diff --git a/src/Storage/Adapter/Memory.php b/src/Storage/Adapter/Memory.php
index ebb84aaf..8e273b8c 100644
--- a/src/Storage/Adapter/Memory.php
+++ b/src/Storage/Adapter/Memory.php
@@ -11,6 +11,10 @@
 
 use Phalcon\Collection;
 use Phalcon\Collection\CollectionInterface;
+use Phalcon\Helper\Arr;
+use Phalcon\Storage\Exception;
+use Phalcon\Storage\SerializerFactory;
+use Phalcon\Storage\Serializer\SerializerInterface;
 
 /**
  * Memory adapter
diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
index dcf9ea83..44985bb6 100644
--- a/src/Storage/Adapter/Redis.php
+++ b/src/Storage/Adapter/Redis.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Storage\Adapter;
 
+use Phalcon\Helper\Arr;
 use Phalcon\Storage\Exception;
+use Phalcon\Storage\SerializerFactory;
+use Phalcon\Storage\Serializer\SerializerInterface;
 
 /**
  * Redis adapter
diff --git a/src/Storage/Adapter/Stream.php b/src/Storage/Adapter/Stream.php
index db256218..080e4a2c 100644
--- a/src/Storage/Adapter/Stream.php
+++ b/src/Storage/Adapter/Stream.php
@@ -9,8 +9,15 @@
  */
 namespace Phalcon\Storage\Adapter;
 
+use FilesystemIterator;
 use Iterator;
+use Phalcon\Helper\Arr;
+use Phalcon\Helper\Str;
 use Phalcon\Storage\Exception;
+use Phalcon\Storage\SerializerFactory;
+use Phalcon\Storage\Serializer\SerializerInterface;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 
 /**
  * Stream adapter
diff --git a/src/Storage/Serializer/AbstractSerializer.php b/src/Storage/Serializer/AbstractSerializer.php
index 3318abd4..9ee69e15 100644
--- a/src/Storage/Serializer/AbstractSerializer.php
+++ b/src/Storage/Serializer/AbstractSerializer.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Storage\Serializer;
 
+use Phalcon\Storage\Exception;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Storage/Serializer/Base64.php b/src/Storage/Serializer/Base64.php
index 1263829f..3d11a5fd 100644
--- a/src/Storage/Serializer/Base64.php
+++ b/src/Storage/Serializer/Base64.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Storage\Serializer;
 
+use InvalidArgumentException;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Storage/Serializer/Json.php b/src/Storage/Serializer/Json.php
index e7eaa92e..4f4f8f9b 100644
--- a/src/Storage/Serializer/Json.php
+++ b/src/Storage/Serializer/Json.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Storage\Serializer;
 
+use InvalidArgumentException;
+use JsonSerializable;
+use Phalcon\Helper\Json as JsonHelper;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Storage/Serializer/None.php b/src/Storage/Serializer/None.php
index 98c17ab4..a91ef9fe 100644
--- a/src/Storage/Serializer/None.php
+++ b/src/Storage/Serializer/None.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Storage\Serializer;
 
+use InvalidArgumentException;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Storage/Serializer/Php.php b/src/Storage/Serializer/Php.php
index ee3d65b4..5d9e62db 100644
--- a/src/Storage/Serializer/Php.php
+++ b/src/Storage/Serializer/Php.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Storage\Serializer;
 
+use InvalidArgumentException;
+use Phalcon\Storage\Exception;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Storage/Serializer/SerializerInterface.php b/src/Storage/Serializer/SerializerInterface.php
index ac0c3979..91370615 100644
--- a/src/Storage/Serializer/SerializerInterface.php
+++ b/src/Storage/Serializer/SerializerInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Storage\Serializer;
 
+use Serializable;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Support/Debug.php b/src/Support/Debug.php
index 3fb6895f..b2cbb994 100644
--- a/src/Support/Debug.php
+++ b/src/Support/Debug.php
@@ -9,6 +9,12 @@
  */
 namespace Phalcon\Support;
 
+use ErrorException;
+use Phalcon\Helper\Arr;
+use Phalcon\Tag;
+use ReflectionClass;
+use ReflectionFunction;
+
 /**
  * Provides debug capabilities to Phalcon applications
  */
diff --git a/src/Support/Debug/Dump.php b/src/Support/Debug/Dump.php
index 01b3ad7e..5064442e 100644
--- a/src/Support/Debug/Dump.php
+++ b/src/Support/Debug/Dump.php
@@ -9,6 +9,13 @@
  */
 namespace Phalcon\Support\Debug;
 
+use Phalcon\Di;
+use Phalcon\Helper\Json;
+use Reflection;
+use ReflectionClass;
+use ReflectionProperty;
+use stdClass;
+
 /**
  * Dumps information about a variable(s)
  *
diff --git a/src/Tag.php b/src/Tag.php
index 0d64d75f..71a9927e 100644
--- a/src/Tag.php
+++ b/src/Tag.php
@@ -11,6 +11,12 @@
 
 use Phalcon\Di\DiInterface;
 use Phalcon\Escaper\EscaperInterface;
+use Phalcon\Html\Link\Link;
+use Phalcon\Html\Link\Serializer\Header;
+use Phalcon\Helper\Str;
+use Phalcon\Helper\Exception as HelperException;
+use Phalcon\Tag\Select;
+use Phalcon\Tag\Exception;
 use Phalcon\Url\UrlInterface;
 
 /**
diff --git a/src/Tag/Select.php b/src/Tag/Select.php
index 5c2584ce..708f887e 100644
--- a/src/Tag/Select.php
+++ b/src/Tag/Select.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Tag;
 
+use Phalcon\Tag as BaseTag;
+use Phalcon\Escaper\EscaperInterface;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
 /**
  * Phalcon\Tag\Select
  *
diff --git a/src/Text.php b/src/Text.php
index fdb0bb09..9591be70 100644
--- a/src/Text.php
+++ b/src/Text.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon;
 
+use Phalcon\Helper\Str;
+
 /**
  * Provides utilities to work with texts
  */
diff --git a/src/Translate/Adapter/AbstractAdapter.php b/src/Translate/Adapter/AbstractAdapter.php
index 346083ed..fb4f6d40 100644
--- a/src/Translate/Adapter/AbstractAdapter.php
+++ b/src/Translate/Adapter/AbstractAdapter.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Translate\Adapter;
 
+use Phalcon\Helper\Arr;
+use Phalcon\Translate\Exception;
 use Phalcon\Translate\InterpolatorFactory;
 
 /**
diff --git a/src/Translate/Adapter/Csv.php b/src/Translate/Adapter/Csv.php
index dd16753c..933d7911 100644
--- a/src/Translate/Adapter/Csv.php
+++ b/src/Translate/Adapter/Csv.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Translate\Adapter;
 
+use ArrayAccess;
+use Phalcon\Translate\Exception;
+use Phalcon\Translate\InterpolatorFactory;
+
 /**
  * Phalcon\Translate\Adapter\Csv
  *
diff --git a/src/Translate/Adapter/Gettext.php b/src/Translate/Adapter/Gettext.php
index 11bfe81c..3adb4363 100644
--- a/src/Translate/Adapter/Gettext.php
+++ b/src/Translate/Adapter/Gettext.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Translate\Adapter;
 
+use ArrayAccess;
+use Phalcon\Translate\Exception;
+use Phalcon\Translate\InterpolatorFactory;
+
 /**
  * Phalcon\Translate\Adapter\Gettext
  *
diff --git a/src/Translate/Adapter/NativeArray.php b/src/Translate/Adapter/NativeArray.php
index 49ec0fb6..4f271789 100644
--- a/src/Translate/Adapter/NativeArray.php
+++ b/src/Translate/Adapter/NativeArray.php
@@ -9,6 +9,10 @@
  */
 namespace Phalcon\Translate\Adapter;
 
+use ArrayAccess;
+use Phalcon\Translate\Exception;
+use Phalcon\Translate\InterpolatorFactory;
+
 /**
  * Phalcon\Translate\Adapter\NativeArray
  *
diff --git a/src/Translate/Interpolator/AssociativeArray.php b/src/Translate/Interpolator/AssociativeArray.php
index 2b08dc89..fe5d3c9a 100644
--- a/src/Translate/Interpolator/AssociativeArray.php
+++ b/src/Translate/Interpolator/AssociativeArray.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Translate\Interpolator;
 
+use Phalcon\Support\Helper\Str\Interpolate;
+
 /**
  * This file is part of the Phalcon Framework.
  *
diff --git a/src/Translate/TranslateFactory.php b/src/Translate/TranslateFactory.php
index bbbc47a0..735386fe 100644
--- a/src/Translate/TranslateFactory.php
+++ b/src/Translate/TranslateFactory.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Translate;
 
+use Phalcon\Config;
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 use Phalcon\Translate\Adapter\AdapterInterface;
 
 /**
diff --git a/src/Url.php b/src/Url.php
index 86b152e2..9d0d767e 100644
--- a/src/Url.php
+++ b/src/Url.php
@@ -9,8 +9,11 @@
  */
 namespace Phalcon;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Mvc\RouterInterface;
+use Phalcon\Mvc\Router\RouteInterface;
+use Phalcon\Url\Exception;
 use Phalcon\Url\UrlInterface;
 
 /**
diff --git a/src/Validation.php b/src/Validation.php
index d8d1e746..328ec4a4 100644
--- a/src/Validation.php
+++ b/src/Validation.php
@@ -9,11 +9,15 @@
  */
 namespace Phalcon;
 
+use Phalcon\Di\DiInterface;
 use Phalcon\Di\Injectable;
+use Phalcon\Filter\FilterInterface;
 use Phalcon\Messages\MessageInterface;
 use Phalcon\Messages\Messages;
 use Phalcon\Validation\ValidationInterface;
+use Phalcon\Validation\Exception;
 use Phalcon\Validation\ValidatorInterface;
+use Phalcon\Validation\AbstractCombinedFieldsValidator;
 
 /**
  * Allows to validate data using custom or built-in validators
diff --git a/src/Validation/AbstractValidator.php b/src/Validation/AbstractValidator.php
index dd2beffe..1800fd86 100644
--- a/src/Validation/AbstractValidator.php
+++ b/src/Validation/AbstractValidator.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Validation;
 
+use Phalcon\Helper\Arr;
 use Phalcon\Messages\Message;
+use Phalcon\Validation;
 
 /**
  * This is a base class for validators
diff --git a/src/Validation/AbstractValidatorComposite.php b/src/Validation/AbstractValidatorComposite.php
index cc4957be..6edc0200 100644
--- a/src/Validation/AbstractValidatorComposite.php
+++ b/src/Validation/AbstractValidatorComposite.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation;
 
+use Phalcon\Validation;
+
 /**
  * This is a base class for combined fields validators
  */
diff --git a/src/Validation/ValidationInterface.php b/src/Validation/ValidationInterface.php
index 5eb0bd1a..e1c79607 100644
--- a/src/Validation/ValidationInterface.php
+++ b/src/Validation/ValidationInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation;
 
+use Phalcon\Di\Injectable;
+use Phalcon\Messages\MessageInterface;
 use Phalcon\Messages\Messages;
 
 /**
diff --git a/src/Validation/Validator/Alnum.php b/src/Validation/Validator/Alnum.php
index 2e39dedc..dd223fdc 100644
--- a/src/Validation/Validator/Alnum.php
+++ b/src/Validation/Validator/Alnum.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Alpha.php b/src/Validation/Validator/Alpha.php
index 03a7502f..7eedbc8f 100644
--- a/src/Validation/Validator/Alpha.php
+++ b/src/Validation/Validator/Alpha.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Between.php b/src/Validation/Validator/Between.php
index eb743d2d..ec7d8444 100644
--- a/src/Validation/Validator/Between.php
+++ b/src/Validation/Validator/Between.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Callback.php b/src/Validation/Validator/Callback.php
index 8a170eae..4c1a85e7 100644
--- a/src/Validation/Validator/Callback.php
+++ b/src/Validation/Validator/Callback.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
+use Phalcon\Validation\ValidatorInterface;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Confirmation.php b/src/Validation/Validator/Confirmation.php
index d8be81aa..413f17a2 100644
--- a/src/Validation/Validator/Confirmation.php
+++ b/src/Validation/Validator/Confirmation.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
+use Phalcon\Validation\Exception;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/CreditCard.php b/src/Validation/Validator/CreditCard.php
index 7b798741..c2db2bf1 100644
--- a/src/Validation/Validator/CreditCard.php
+++ b/src/Validation/Validator/CreditCard.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Date.php b/src/Validation/Validator/Date.php
index 37b084e0..2f33fa44 100644
--- a/src/Validation/Validator/Date.php
+++ b/src/Validation/Validator/Date.php
@@ -9,6 +9,9 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use DateTime;
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Digit.php b/src/Validation/Validator/Digit.php
index 5af0ffc7..254d5006 100644
--- a/src/Validation/Validator/Digit.php
+++ b/src/Validation/Validator/Digit.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Email.php b/src/Validation/Validator/Email.php
index f019b2f5..6efc5999 100644
--- a/src/Validation/Validator/Email.php
+++ b/src/Validation/Validator/Email.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/ExclusionIn.php b/src/Validation/Validator/ExclusionIn.php
index 6a327382..e4911009 100644
--- a/src/Validation/Validator/ExclusionIn.php
+++ b/src/Validation/Validator/ExclusionIn.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
+use Phalcon\Validation\Exception;
 
 /**
  * Check if a value is not included into a list of values
diff --git a/src/Validation/Validator/File.php b/src/Validation/Validator/File.php
index f050b47d..7c8ec56a 100644
--- a/src/Validation/Validator/File.php
+++ b/src/Validation/Validator/File.php
@@ -9,7 +9,17 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Helper\Arr;
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidatorComposite;
+use Phalcon\Validation\Validator\File\MimeType;
+use Phalcon\Validation\Validator\File\Resolution\Equal as EqualResolution;
+use Phalcon\Validation\Validator\File\Resolution\Max as MaxResolution;
+use Phalcon\Validation\Validator\File\Resolution\Min as MinResolution;
+use Phalcon\Validation\Validator\File\Size\Equal as EqualFileSize;
+use Phalcon\Validation\Validator\File\Size\Max as MaxFileSize;
+use Phalcon\Validation\Validator\File\Size\Min as MinFileSize;
 
 /**
  * Checks if a value has a correct file
diff --git a/src/Validation/Validator/File/AbstractFile.php b/src/Validation/Validator/File/AbstractFile.php
index 671c4f20..d7e73183 100644
--- a/src/Validation/Validator/File/AbstractFile.php
+++ b/src/Validation/Validator/File/AbstractFile.php
@@ -9,6 +9,7 @@
  */
 namespace Phalcon\Validation\Validator\File;
 
+use Phalcon\Messages\Message;
 use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
diff --git a/src/Validation/Validator/File/MimeType.php b/src/Validation/Validator/File/MimeType.php
index 443c35bd..60cb7c75 100644
--- a/src/Validation/Validator/File/MimeType.php
+++ b/src/Validation/Validator/File/MimeType.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Validation\Validator\File;
 
+use Phalcon\Messages\Message;
 use Phalcon\Validation;
+use Phalcon\Validation\Exception;
 
 /**
  * Checks if a value has a correct file mime type
diff --git a/src/Validation/Validator/File/Resolution/Equal.php b/src/Validation/Validator/File/Resolution/Equal.php
index a9994fe3..95802d58 100644
--- a/src/Validation/Validator/File/Resolution/Equal.php
+++ b/src/Validation/Validator/File/Resolution/Equal.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator\File\Resolution;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
diff --git a/src/Validation/Validator/File/Resolution/Max.php b/src/Validation/Validator/File/Resolution/Max.php
index a031a582..c675bcb5 100644
--- a/src/Validation/Validator/File/Resolution/Max.php
+++ b/src/Validation/Validator/File/Resolution/Max.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator\File\Resolution;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
diff --git a/src/Validation/Validator/File/Resolution/Min.php b/src/Validation/Validator/File/Resolution/Min.php
index d7afd978..dfd30a43 100644
--- a/src/Validation/Validator/File/Resolution/Min.php
+++ b/src/Validation/Validator/File/Resolution/Min.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator\File\Resolution;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
diff --git a/src/Validation/Validator/File/Size/Equal.php b/src/Validation/Validator/File/Size/Equal.php
index d6a477d4..14f562b6 100644
--- a/src/Validation/Validator/File/Size/Equal.php
+++ b/src/Validation/Validator/File/Size/Equal.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator\File\Size;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
diff --git a/src/Validation/Validator/File/Size/Max.php b/src/Validation/Validator/File/Size/Max.php
index 1c4b605f..ab5f202b 100644
--- a/src/Validation/Validator/File/Size/Max.php
+++ b/src/Validation/Validator/File/Size/Max.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator\File\Size;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
diff --git a/src/Validation/Validator/File/Size/Min.php b/src/Validation/Validator/File/Size/Min.php
index 435d6efa..9f42aece 100644
--- a/src/Validation/Validator/File/Size/Min.php
+++ b/src/Validation/Validator/File/Size/Min.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator\File\Size;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
diff --git a/src/Validation/Validator/Identical.php b/src/Validation/Validator/Identical.php
index 2af3ab03..890bbfcd 100644
--- a/src/Validation/Validator/Identical.php
+++ b/src/Validation/Validator/Identical.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/InclusionIn.php b/src/Validation/Validator/InclusionIn.php
index 9eb236e9..66606ab3 100644
--- a/src/Validation/Validator/InclusionIn.php
+++ b/src/Validation/Validator/InclusionIn.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
+use Phalcon\Validation\Exception;
 
 /**
  * Check if a value is included into a list of values
diff --git a/src/Validation/Validator/Ip.php b/src/Validation/Validator/Ip.php
index 1841f54e..300b894f 100644
--- a/src/Validation/Validator/Ip.php
+++ b/src/Validation/Validator/Ip.php
@@ -9,7 +9,9 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
+use Phalcon\Messages\Message;
 
 /**
  * Check for IP addresses
diff --git a/src/Validation/Validator/Numericality.php b/src/Validation/Validator/Numericality.php
index 66db4678..0a6a49b0 100644
--- a/src/Validation/Validator/Numericality.php
+++ b/src/Validation/Validator/Numericality.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/PresenceOf.php b/src/Validation/Validator/PresenceOf.php
index a6f9edf4..d45d08b7 100644
--- a/src/Validation/Validator/PresenceOf.php
+++ b/src/Validation/Validator/PresenceOf.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/Regex.php b/src/Validation/Validator/Regex.php
index 432af3ca..5de5e752 100644
--- a/src/Validation/Validator/Regex.php
+++ b/src/Validation/Validator/Regex.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/Validator/StringLength.php b/src/Validation/Validator/StringLength.php
index eb4b0460..fe01f94b 100644
--- a/src/Validation/Validator/StringLength.php
+++ b/src/Validation/Validator/StringLength.php
@@ -9,7 +9,12 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation\AbstractValidator;
 use Phalcon\Validation\AbstractValidatorComposite;
+use Phalcon\Validation\Validator\StringLength\Max;
+use Phalcon\Validation\Validator\StringLength\Min;
+use Phalcon\Validation\Exception;
 
 /**
  * Validates that a string has the specified maximum and minimum constraints
diff --git a/src/Validation/Validator/StringLength/Max.php b/src/Validation/Validator/StringLength/Max.php
index 8e38b435..1f241439 100644
--- a/src/Validation/Validator/StringLength/Max.php
+++ b/src/Validation/Validator/StringLength/Max.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Validation\Validator\StringLength;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
+use Phalcon\Validation\Exception;
 
 /**
  * Validates that a string has the specified maximum constraints
diff --git a/src/Validation/Validator/StringLength/Min.php b/src/Validation/Validator/StringLength/Min.php
index fbcad109..522625f3 100644
--- a/src/Validation/Validator/StringLength/Min.php
+++ b/src/Validation/Validator/StringLength/Min.php
@@ -9,7 +9,10 @@
  */
 namespace Phalcon\Validation\Validator\StringLength;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
+use Phalcon\Validation\Exception;
 
 /**
  * Validates that a string has the specified minimum constraints
diff --git a/src/Validation/Validator/Uniqueness.php b/src/Validation/Validator/Uniqueness.php
index e28736f7..b06a0f2a 100644
--- a/src/Validation/Validator/Uniqueness.php
+++ b/src/Validation/Validator/Uniqueness.php
@@ -9,7 +9,12 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\ModelInterface;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractCombinedFieldsValidator;
+use Phalcon\Validation\Exception;
 
 /**
  * Check that a field is unique in the related table
diff --git a/src/Validation/Validator/Url.php b/src/Validation/Validator/Url.php
index 88cc599f..626e5208 100644
--- a/src/Validation/Validator/Url.php
+++ b/src/Validation/Validator/Url.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation\Validator;
 
+use Phalcon\Messages\Message;
+use Phalcon\Validation;
 use Phalcon\Validation\AbstractValidator;
 
 /**
diff --git a/src/Validation/ValidatorCompositeInterface.php b/src/Validation/ValidatorCompositeInterface.php
index cb532dfc..9d1335de 100644
--- a/src/Validation/ValidatorCompositeInterface.php
+++ b/src/Validation/ValidatorCompositeInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation;
 
+use Phalcon\Validation;
+
 /**
  * This is a base class for combined fields validators
  */
diff --git a/src/Validation/ValidatorFactory.php b/src/Validation/ValidatorFactory.php
index a23b5a80..841fce9e 100644
--- a/src/Validation/ValidatorFactory.php
+++ b/src/Validation/ValidatorFactory.php
@@ -10,6 +10,7 @@
 namespace Phalcon\Validation;
 
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
 
 /**
  * This file is part of the Phalcon Framework.
diff --git a/src/Validation/ValidatorInterface.php b/src/Validation/ValidatorInterface.php
index 1844d552..1b4f2c64 100644
--- a/src/Validation/ValidatorInterface.php
+++ b/src/Validation/ValidatorInterface.php
@@ -9,6 +9,8 @@
  */
 namespace Phalcon\Validation;
 
+use Phalcon\Validation;
+
 /**
  * Interface for Phalcon\Validation\AbstractValidator
  */

From e8320678961864a1bd0db7b64053d351c46e809b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 11 Sep 2021 11:07:06 +0100
Subject: [PATCH 2/4] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6d1dfecd..c8840aec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 # https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 
 /vendor
+composer.phar

From 8778d28d5acc1b17828632c4414aa65d3323d508 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 11 Sep 2021 11:07:24 +0100
Subject: [PATCH 3/4] Update composer dependencies

---
 composer.lock | 133 +++++++++++++++++++++++++-------------------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/composer.lock b/composer.lock
index 53cca273..6811d163 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9,27 +9,27 @@
     "packages-dev": [
         {
             "name": "amphp/amp",
-            "version": "v2.5.2",
+            "version": "v2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/amp.git",
-                "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9"
+                "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9",
-                "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/caa95edeb1ca1bf7532e9118ede4a3c3126408cc",
+                "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "amphp/php-cs-fixer-config": "dev-master",
                 "amphp/phpunit-util": "^1",
                 "ext-json": "*",
                 "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6.0.9 | ^7",
+                "phpunit/phpunit": "^7 | ^8 | ^9",
                 "psalm/phar": "^3.11@dev",
                 "react/promise": "^2"
             },
@@ -86,7 +86,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/amphp",
                 "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.5.2"
+                "source": "https://github.com/amphp/amp/tree/v2.6.0"
             },
             "funding": [
                 {
@@ -94,7 +94,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-01-10T17:06:37+00:00"
+            "time": "2021-07-16T20:06:06+00:00"
         },
         {
             "name": "amphp/byte-stream",
@@ -175,16 +175,16 @@
         },
         {
             "name": "composer/package-versions-deprecated",
-            "version": "1.11.99.2",
+            "version": "1.11.99.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/package-versions-deprecated.git",
-                "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c"
+                "reference": "fff576ac850c045158a250e7e27666e146e78d18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c",
-                "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c",
+                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/fff576ac850c045158a250e7e27666e146e78d18",
+                "reference": "fff576ac850c045158a250e7e27666e146e78d18",
                 "shasum": ""
             },
             "require": {
@@ -228,7 +228,7 @@
             "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
             "support": {
                 "issues": "https://github.com/composer/package-versions-deprecated/issues",
-                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2"
+                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.3"
             },
             "funding": [
                 {
@@ -244,7 +244,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-24T07:46:03+00:00"
+            "time": "2021-08-17T13:49:14+00:00"
         },
         {
             "name": "composer/semver",
@@ -430,20 +430,20 @@
         },
         {
             "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e"
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e",
-                "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e",
+                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
                 "shasum": ""
             },
             "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0",
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
                 "php": "^7.1 || ^8.0",
                 "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
             },
@@ -469,9 +469,9 @@
             "description": "A more advanced JSONRPC implementation",
             "support": {
                 "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0"
+                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
             },
-            "time": "2021-01-10T17:48:47+00:00"
+            "time": "2021-06-11T22:34:44+00:00"
         },
         {
             "name": "felixfbecker/language-server-protocol",
@@ -531,16 +531,16 @@
         },
         {
             "name": "netresearch/jsonmapper",
-            "version": "v2.1.0",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e"
+                "reference": "ba09f0e456d4f00cef84e012da5715625594407c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e",
-                "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/ba09f0e456d4f00cef84e012da5715625594407c",
+                "reference": "ba09f0e456d4f00cef84e012da5715625594407c",
                 "shasum": ""
             },
             "require": {
@@ -576,22 +576,22 @@
             "support": {
                 "email": "cweiske@cweiske.de",
                 "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/master"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v3.1.1"
             },
-            "time": "2020-04-16T18:48:43+00:00"
+            "time": "2020-11-02T19:19:54+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.5",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
                 "shasum": ""
             },
             "require": {
@@ -632,9 +632,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
             },
-            "time": "2021-05-03T19:11:20+00:00"
+            "time": "2021-07-21T10:44:31+00:00"
         },
         {
             "name": "openlss/lib-array2xml",
@@ -1069,16 +1069,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.3.0",
+            "version": "v5.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "058553870f7809087fa80fa734704a21b9bcaeb2"
+                "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2",
-                "reference": "058553870f7809087fa80fa734704a21b9bcaeb2",
+                "url": "https://api.github.com/repos/symfony/console/zipball/8b1008344647462ae6ec57559da166c2bfa5e16a",
+                "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a",
                 "shasum": ""
             },
             "require": {
@@ -1086,11 +1086,12 @@
                 "symfony/deprecation-contracts": "^2.1",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
-                "symfony/polyfill-php80": "^1.15",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.1|^2",
                 "symfony/string": "^5.1"
             },
             "conflict": {
+                "psr/log": ">=3",
                 "symfony/dependency-injection": "<4.4",
                 "symfony/dotenv": "<5.1",
                 "symfony/event-dispatcher": "<4.4",
@@ -1098,10 +1099,10 @@
                 "symfony/process": "<4.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2",
                 "symfony/config": "^4.4|^5.0",
                 "symfony/dependency-injection": "^4.4|^5.0",
                 "symfony/event-dispatcher": "^4.4|^5.0",
@@ -1147,7 +1148,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.3.0"
+                "source": "https://github.com/symfony/console/tree/v5.3.7"
             },
             "funding": [
                 {
@@ -1163,7 +1164,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-08-25T20:02:16+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1313,16 +1314,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.0",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab"
+                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab",
-                "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
+                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
                 "shasum": ""
             },
             "require": {
@@ -1374,7 +1375,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -1390,7 +1391,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T09:17:38+00:00"
+            "time": "2021-05-27T12:26:48+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
@@ -1478,16 +1479,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.0",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
+                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
                 "shasum": ""
             },
             "require": {
@@ -1538,7 +1539,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -1554,7 +1555,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T09:27:20+00:00"
+            "time": "2021-05-27T12:26:48+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
@@ -1637,16 +1638,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.23.0",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
                 "shasum": ""
             },
             "require": {
@@ -1700,7 +1701,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -1716,7 +1717,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-07-28T13:41:28+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1799,16 +1800,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.3.0",
+            "version": "v5.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b"
+                "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
-                "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/8d224396e28d30f81969f083a58763b8b9ceb0a5",
+                "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5",
                 "shasum": ""
             },
             "require": {
@@ -1862,7 +1863,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.3.0"
+                "source": "https://github.com/symfony/string/tree/v5.3.7"
             },
             "funding": [
                 {
@@ -1878,7 +1879,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-08-26T08:00:08+00:00"
         },
         {
             "name": "vimeo/psalm",

From a599deea6798a229af8226f028c488d57f60184b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sat, 11 Sep 2021 11:12:44 +0100
Subject: [PATCH 4/4] Fix return type

---
 src/Mvc/ModelInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Mvc/ModelInterface.php b/src/Mvc/ModelInterface.php
index 9f9b043f..064a0565 100644
--- a/src/Mvc/ModelInterface.php
+++ b/src/Mvc/ModelInterface.php
@@ -285,7 +285,7 @@ public function setConnectionService(string $connectionService): void;
      * constants
      *
      * @param int $dirtyState
-     * @return 0|ModelInterface
+     * @return bool|ModelInterface
      */
     public function setDirtyState(int $dirtyState);