From 74bc73dfc38b8f552709d87a38f256a99c73fa6b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 22 Sep 2022 18:48:29 -0400
Subject: [PATCH] new stubs for v5.0.0 stable

---
 src/Acl/Adapter/AbstractAdapter.php           |  34 +-
 src/Acl/Adapter/AdapterInterface.php          |   2 -
 src/Acl/Adapter/Memory.php                    |  57 +-
 src/Acl/Component.php                         |  23 +-
 src/Acl/ComponentAwareInterface.php           |   2 -
 src/Acl/ComponentInterface.php                |   2 -
 src/Acl/Exception.php                         |   2 -
 src/Acl/Role.php                              |  27 +-
 src/Acl/RoleAwareInterface.php                |   2 -
 src/Acl/RoleInterface.php                     |   2 -
 src/Annotations/Adapter/AbstractAdapter.php   |   1 -
 src/Annotations/Adapter/AdapterInterface.php  |   2 -
 src/Annotations/Adapter/Apcu.php              |   1 -
 src/Annotations/Adapter/Memory.php            |   1 -
 src/Annotations/Adapter/Stream.php            |   1 -
 src/Annotations/Annotation.php                |   1 -
 src/Annotations/AnnotationsFactory.php        |   2 -
 src/Annotations/Collection.php                |   1 -
 src/Annotations/Exception.php                 |   2 -
 src/Annotations/Reader.php                    |   2 -
 src/Annotations/ReaderInterface.php           |   2 -
 src/Annotations/Reflection.php                |  33 +-
 src/Application/AbstractApplication.php       |   1 -
 src/Application/Exception.php                 |   2 -
 src/Assets/Asset.php                          |  95 +-
 src/Assets/Asset/Css.php                      |   2 -
 src/Assets/Asset/Js.php                       |   2 -
 src/Assets/AssetInterface.php                 |   2 -
 src/Assets/Collection.php                     | 159 ++--
 src/Assets/Exception.php                      |   2 -
 src/Assets/FilterInterface.php                |   2 -
 src/Assets/Filters/Cssmin.php                 |   2 -
 src/Assets/Filters/Jsmin.php                  |   2 -
 src/Assets/Filters/None.php                   |   2 -
 src/Assets/Inline.php                         |  35 +-
 src/Assets/Inline/Css.php                     |   2 -
 src/Assets/Inline/Js.php                      |   2 -
 src/Assets/Manager.php                        |   1 -
 src/Autoload/Exception.php                    |   2 -
 src/Autoload/Loader.php                       |   1 -
 src/Cache/AbstractCache.php                   |   1 -
 src/Cache/Adapter/AdapterInterface.php        |   2 -
 src/Cache/Adapter/Apcu.php                    |   2 -
 src/Cache/Adapter/Libmemcached.php            |   2 -
 src/Cache/Adapter/Memory.php                  |   2 -
 src/Cache/Adapter/Redis.php                   |   2 -
 src/Cache/Adapter/Stream.php                  |   2 -
 src/Cache/AdapterFactory.php                  |   1 -
 src/Cache/Cache.php                           |   2 -
 src/Cache/CacheFactory.php                    |   1 -
 src/Cache/CacheInterface.php                  |   2 -
 src/Cache/Exception/Exception.php             |   2 -
 .../Exception/InvalidArgumentException.php    |   2 -
 src/Cli/Console.php                           |   1 -
 src/Cli/Console/Exception.php                 |   2 -
 src/Cli/Dispatcher.php                        |   1 -
 src/Cli/Dispatcher/Exception.php              |   2 -
 src/Cli/DispatcherInterface.php               |   2 -
 src/Cli/Router.php                            |   5 +-
 src/Cli/Router/Exception.php                  |   2 -
 src/Cli/Router/RouteInterface.php             |   2 -
 src/Cli/RouterInterface.php                   |   6 +-
 src/Cli/Task.php                              |   1 -
 src/Cli/TaskInterface.php                     |   2 -
 src/Config/Adapter/Grouped.php                |   2 -
 src/Config/Adapter/Ini.php                    |   2 -
 src/Config/Adapter/Json.php                   |   2 -
 src/Config/Adapter/Php.php                    |   2 -
 src/Config/Adapter/Yaml.php                   |   2 -
 src/Config/ConfigFactory.php                  |   2 -
 src/Config/ConfigInterface.php                |   2 -
 src/Config/Exception.php                      |   2 -
 src/DataMapper/Pdo/Connection.php             |   1 -
 .../Pdo/Connection/AbstractConnection.php     |   1 -
 .../Pdo/Connection/ConnectionInterface.php    |   2 -
 src/DataMapper/Pdo/Connection/Decorated.php   |   2 -
 .../Pdo/Connection/PdoInterface.php           |   2 -
 src/DataMapper/Pdo/ConnectionLocator.php      |   1 -
 .../Pdo/ConnectionLocatorInterface.php        |   2 -
 .../Pdo/Exception/CannotDisconnect.php        |   2 -
 .../Pdo/Exception/ConnectionNotFound.php      |   2 -
 src/DataMapper/Pdo/Exception/Exception.php    |   2 -
 src/DataMapper/Pdo/Profiler/MemoryLogger.php  |   1 -
 src/DataMapper/Pdo/Profiler/Profiler.php      |   1 -
 .../Pdo/Profiler/ProfilerInterface.php        |   2 -
 src/DataMapper/Query/AbstractConditions.php   |   2 -
 src/DataMapper/Query/AbstractQuery.php        |   1 -
 src/DataMapper/Query/Bind.php                 |   1 -
 src/DataMapper/Query/Delete.php               |   2 -
 src/DataMapper/Query/Insert.php               |   2 -
 src/DataMapper/Query/QueryFactory.php         |   1 -
 src/DataMapper/Query/Update.php               |   2 -
 src/Db/AbstractDb.php                         |   4 +-
 src/Db/Adapter/AbstractAdapter.php            |  37 +-
 src/Db/Adapter/AdapterInterface.php           |   2 -
 src/Db/Adapter/Pdo/AbstractPdo.php            |   1 -
 src/Db/Adapter/Pdo/Mysql.php                  |   1 -
 src/Db/Adapter/Pdo/Postgresql.php             |   1 -
 src/Db/Adapter/Pdo/Sqlite.php                 |   1 -
 src/Db/Adapter/PdoFactory.php                 |   2 -
 src/Db/Column.php                             |  82 +-
 src/Db/ColumnInterface.php                    |   2 -
 src/Db/Dialect.php                            |   1 -
 src/Db/Dialect/Mysql.php                      |   1 -
 src/Db/Dialect/Postgresql.php                 |   1 -
 src/Db/Dialect/Sqlite.php                     |   1 -
 src/Db/DialectInterface.php                   |   2 -
 src/Db/Exception.php                          |   2 -
 src/Db/Index.php                              |  23 +-
 src/Db/IndexInterface.php                     |   2 -
 src/Db/Profiler.php                           |   1 -
 src/Db/Profiler/Item.php                      |  70 +-
 src/Db/RawValue.php                           |  15 +-
 src/Db/Reference.php                          |  21 +-
 src/Db/ReferenceInterface.php                 |   2 -
 src/Db/Result/PdoResult.php                   |   1 -
 src/Db/ResultInterface.php                    |   2 -
 src/Di/AbstractInjectionAware.php             |   1 -
 src/Di/Di.php                                 |   3 +-
 src/Di/DiInterface.php                        |   2 -
 src/Di/Exception.php                          |   2 -
 .../Exception/ServiceResolutionException.php  |   2 -
 src/Di/FactoryDefault.php                     |   2 -
 src/Di/FactoryDefault/Cli.php                 |   2 -
 src/Di/InitializationAwareInterface.php       |  10 +-
 src/Di/Injectable.php                         |   3 +-
 src/Di/InjectionAwareInterface.php            |   2 -
 src/Di/Service.php                            |   1 -
 src/Di/Service/Builder.php                    |   2 -
 src/Di/ServiceInterface.php                   |   2 -
 src/Di/ServiceProviderInterface.php           |   2 -
 src/Dispatcher/AbstractDispatcher.php         |   7 +-
 src/Dispatcher/DispatcherInterface.php        |   4 +-
 src/Domain/Payload/Payload.php                |  19 +-
 src/Domain/Payload/PayloadFactory.php         |   2 -
 src/Domain/Payload/PayloadInterface.php       |   2 -
 src/Domain/Payload/ReadableInterface.php      |   2 -
 src/Domain/Payload/WriteableInterface.php     |   2 -
 src/Encryption/Crypt/CryptInterface.php       |   2 -
 src/Encryption/Crypt/Exception/Exception.php  |   2 -
 src/Encryption/Crypt/Exception/Mismatch.php   |   2 -
 src/Encryption/Crypt/PadFactory.php           |   1 -
 src/Encryption/Crypt/Padding/Ansi.php         |   2 -
 src/Encryption/Crypt/Padding/Iso10126.php     |   2 -
 src/Encryption/Crypt/Padding/IsoIek.php       |   2 -
 src/Encryption/Crypt/Padding/Noop.php         |   2 -
 src/Encryption/Crypt/Padding/PadInterface.php |   2 -
 src/Encryption/Crypt/Padding/Pkcs7.php        |   2 -
 src/Encryption/Crypt/Padding/Space.php        |   2 -
 src/Encryption/Crypt/Padding/Zero.php         |   2 -
 src/Encryption/Security.php                   |  14 +-
 src/Encryption/Security/Exception.php         |   2 -
 src/Encryption/Security/JWT/Builder.php       |   5 +-
 .../UnsupportedAlgorithmException.php         |  12 +-
 .../JWT/Exceptions/ValidatorException.php     |  12 +-
 .../Security/JWT/Signer/AbstractSigner.php    |   7 +-
 src/Encryption/Security/JWT/Signer/Hmac.php   |   4 +-
 src/Encryption/Security/JWT/Signer/None.php   |   4 +-
 .../Security/JWT/Signer/SignerInterface.php   |   9 +-
 .../Security/JWT/Token/AbstractItem.php       |   3 +-
 src/Encryption/Security/JWT/Token/Enum.php    |   2 +-
 src/Encryption/Security/JWT/Token/Item.php    |   4 +-
 src/Encryption/Security/JWT/Token/Parser.php  |   8 +-
 .../Security/JWT/Token/Signature.php          |   4 +-
 src/Encryption/Security/JWT/Token/Token.php   |  58 +-
 src/Encryption/Security/JWT/Validator.php     |  15 +-
 src/Encryption/Security/Random.php            |   2 -
 src/Events/AbstractEventsAware.php            |   1 -
 src/Events/Event.php                          |  31 +-
 src/Events/EventInterface.php                 |   2 -
 src/Events/EventsAwareInterface.php           |   2 -
 src/Events/Exception.php                      |   2 -
 src/Events/ManagerInterface.php               |   2 -
 src/Factory/AbstractConfigFactory.php         |   2 -
 src/Factory/AbstractFactory.php               |   1 -
 src/Factory/Exception.php                     |   2 -
 src/Filter/Exception.php                      |   2 -
 src/Filter/Filter.php                         |   3 +
 src/Filter/FilterFactory.php                  |   2 -
 src/Filter/FilterInterface.php                |   2 -
 src/Filter/Sanitize/AbsInt.php                |   2 -
 src/Filter/Sanitize/Alnum.php                 |   2 -
 src/Filter/Sanitize/Alpha.php                 |   2 -
 src/Filter/Sanitize/BoolVal.php               |   2 -
 src/Filter/Sanitize/Email.php                 |   2 -
 src/Filter/Sanitize/FloatVal.php              |   2 -
 src/Filter/Sanitize/IntVal.php                |   2 -
 src/Filter/Sanitize/Lower.php                 |   2 -
 src/Filter/Sanitize/LowerFirst.php            |   2 -
 src/Filter/Sanitize/Regex.php                 |   2 -
 src/Filter/Sanitize/Remove.php                |   2 -
 src/Filter/Sanitize/Replace.php               |   2 -
 src/Filter/Sanitize/Special.php               |   2 -
 src/Filter/Sanitize/SpecialFull.php           |   2 -
 src/Filter/Sanitize/StringVal.php             |   8 +-
 src/Filter/Sanitize/StringValLegacy.php       |  28 +
 src/Filter/Sanitize/Striptags.php             |   2 -
 src/Filter/Sanitize/Trim.php                  |   2 -
 src/Filter/Sanitize/Upper.php                 |   2 -
 src/Filter/Sanitize/UpperFirst.php            |   2 -
 src/Filter/Sanitize/UpperWords.php            |   2 -
 src/Filter/Sanitize/Url.php                   |   2 -
 src/Filter/Validation.php                     |  32 +-
 .../AbstractCombinedFieldsValidator.php       |   2 -
 src/Filter/Validation/AbstractValidator.php   |   1 -
 .../Validation/AbstractValidatorComposite.php |   1 -
 src/Filter/Validation/Exception.php           |   2 -
 src/Filter/Validation/ValidationInterface.php |   2 -
 src/Filter/Validation/Validator/Alnum.php     |   1 -
 src/Filter/Validation/Validator/Alpha.php     |   1 -
 src/Filter/Validation/Validator/Between.php   |   1 -
 src/Filter/Validation/Validator/Callback.php  |   1 -
 .../Validation/Validator/Confirmation.php     |   1 -
 .../Validation/Validator/CreditCard.php       |   1 -
 src/Filter/Validation/Validator/Date.php      |   1 -
 src/Filter/Validation/Validator/Digit.php     |   1 -
 src/Filter/Validation/Validator/Email.php     |   1 -
 src/Filter/Validation/Validator/Exception.php |   2 -
 .../Validation/Validator/ExclusionIn.php      |   1 -
 src/Filter/Validation/Validator/File.php      |   2 -
 .../Validator/File/AbstractFile.php           |  99 +-
 .../Validation/Validator/File/MimeType.php    |   1 -
 .../Validator/File/Resolution/Equal.php       |   1 -
 .../Validator/File/Resolution/Max.php         |   1 -
 .../Validator/File/Resolution/Min.php         |   1 -
 .../Validation/Validator/File/Size/Equal.php  |   1 -
 .../Validation/Validator/File/Size/Max.php    |   1 -
 .../Validation/Validator/File/Size/Min.php    |   1 -
 src/Filter/Validation/Validator/Identical.php |   1 -
 .../Validation/Validator/InclusionIn.php      |   1 -
 .../Validation/Validator/Numericality.php     |   1 -
 .../Validation/Validator/PresenceOf.php       |   1 -
 src/Filter/Validation/Validator/Regex.php     |   1 -
 .../Validation/Validator/StringLength.php     |   2 -
 .../Validation/Validator/StringLength/Max.php |   1 -
 .../Validation/Validator/StringLength/Min.php |   1 -
 .../Validation/Validator/Uniqueness.php       |   1 -
 src/Filter/Validation/Validator/Url.php       |   1 -
 .../ValidatorCompositeInterface.php           |   2 -
 src/Filter/Validation/ValidatorFactory.php    |   2 -
 src/Filter/Validation/ValidatorInterface.php  |   2 -
 src/Flash/AbstractFlash.php                   |  62 +-
 src/Flash/Direct.php                          |   2 -
 src/Flash/Exception.php                       |   2 -
 src/Flash/FlashInterface.php                  |   2 -
 src/Forms/Element/AbstractElement.php         |   1 -
 src/Forms/Element/Check.php                   |   1 -
 src/Forms/Element/Date.php                    |   1 -
 src/Forms/Element/ElementInterface.php        |   2 -
 src/Forms/Element/Email.php                   |   1 -
 src/Forms/Element/File.php                    |   1 -
 src/Forms/Element/Hidden.php                  |   1 -
 src/Forms/Element/Numeric.php                 |   1 -
 src/Forms/Element/Password.php                |   1 -
 src/Forms/Element/Radio.php                   |   1 -
 src/Forms/Element/Select.php                  |   1 -
 src/Forms/Element/Submit.php                  |   1 -
 src/Forms/Element/Text.php                    |   2 -
 src/Forms/Element/TextArea.php                |   1 -
 src/Forms/Exception.php                       |   2 -
 src/Forms/Form.php                            |  33 +-
 src/Forms/Manager.php                         |   1 -
 src/Html/Attributes.php                       |   2 -
 src/Html/Attributes/AttributesInterface.php   |   2 -
 src/Html/Attributes/RenderInterface.php       |   2 -
 src/Html/Breadcrumbs.php                      |  37 +-
 src/Html/Escaper.php                          |  57 +-
 src/Html/Escaper/EscaperInterface.php         |   4 +-
 src/Html/Escaper/Exception.php                |   2 -
 src/Html/EscaperFactory.php                   |   2 -
 src/Html/Exception.php                        |   2 -
 src/Html/Helper/AbstractHelper.php            |   1 -
 src/Html/Helper/AbstractList.php              |   1 -
 src/Html/Helper/AbstractSeries.php            |   1 -
 src/Html/Helper/Anchor.php                    |   2 -
 src/Html/Helper/Base.php                      |   2 -
 src/Html/Helper/Body.php                      |   2 -
 src/Html/Helper/Button.php                    |   2 -
 src/Html/Helper/Close.php                     |   2 -
 src/Html/Helper/Doctype.php                   |   4 +-
 src/Html/Helper/Element.php                   |   2 -
 src/Html/Helper/Form.php                      |   2 -
 src/Html/Helper/Img.php                       |   2 -
 src/Html/Helper/Input/AbstractInput.php       |   1 -
 src/Html/Helper/Input/Checkbox.php            |   1 -
 src/Html/Helper/Input/Color.php               |   1 -
 src/Html/Helper/Input/Date.php                |   1 -
 src/Html/Helper/Input/DateTime.php            |   1 -
 src/Html/Helper/Input/DateTimeLocal.php       |   1 -
 src/Html/Helper/Input/Email.php               |   1 -
 src/Html/Helper/Input/File.php                |   1 -
 src/Html/Helper/Input/Hidden.php              |   1 -
 src/Html/Helper/Input/Image.php               |   1 -
 src/Html/Helper/Input/Input.php               |   2 -
 src/Html/Helper/Input/Month.php               |   1 -
 src/Html/Helper/Input/Numeric.php             |   1 -
 src/Html/Helper/Input/Password.php            |   1 -
 src/Html/Helper/Input/Radio.php               |   1 -
 src/Html/Helper/Input/Range.php               |   1 -
 src/Html/Helper/Input/Search.php              |   1 -
 src/Html/Helper/Input/Select.php              |   1 -
 src/Html/Helper/Input/Submit.php              |   1 -
 src/Html/Helper/Input/Tel.php                 |   1 -
 src/Html/Helper/Input/Text.php                |   2 -
 src/Html/Helper/Input/Textarea.php            |   1 -
 src/Html/Helper/Input/Time.php                |   1 -
 src/Html/Helper/Input/Url.php                 |   1 -
 src/Html/Helper/Input/Week.php                |   1 -
 src/Html/Helper/Label.php                     |   2 -
 src/Html/Helper/Link.php                      |   2 -
 src/Html/Helper/Meta.php                      |   2 -
 src/Html/Helper/Ol.php                        |   2 -
 src/Html/Helper/Script.php                    |   2 -
 src/Html/Helper/Style.php                     |   1 -
 src/Html/Helper/Title.php                     |   5 +-
 src/Html/Helper/Ul.php                        |   2 -
 src/Html/Link/AbstractLink.php                |   5 +-
 src/Html/Link/AbstractLinkProvider.php        |   1 -
 src/Html/Link/EvolvableLink.php               |   6 +-
 src/Html/Link/EvolvableLinkProvider.php       |   2 -
 .../Interfaces/EvolvableLinkInterface.php     |   2 -
 .../EvolvableLinkProviderInterface.php        |   2 -
 src/Html/Link/Interfaces/LinkInterface.php    |   2 -
 .../Link/Interfaces/LinkProviderInterface.php |   2 -
 src/Html/Link/Link.php                        |   2 -
 src/Html/Link/LinkProvider.php                |   2 -
 src/Html/Link/Serializer/Header.php           |   2 -
 .../Link/Serializer/SerializerInterface.php   |   2 -
 src/Html/TagFactory.php                       |  83 +-
 src/Http/Cookie.php                           |   1 -
 src/Http/Cookie/CookieInterface.php           |   2 -
 src/Http/Cookie/Exception.php                 |   2 -
 src/Http/Request.php                          |  35 +-
 src/Http/Request/Exception.php                |   2 -
 src/Http/Request/File.php                     |  21 +-
 src/Http/Request/FileInterface.php            |   4 -
 src/Http/RequestInterface.php                 |   2 -
 src/Http/Response.php                         |   1 -
 src/Http/Response/Cookies.php                 |   1 -
 src/Http/Response/CookiesInterface.php        |   2 -
 src/Http/Response/Exception.php               |   2 -
 src/Http/Response/Headers.php                 |   1 -
 src/Http/Response/HeadersInterface.php        |   2 -
 src/Http/ResponseInterface.php                |   2 -
 src/Image/Adapter/AbstractAdapter.php         | 166 ++--
 src/Image/Adapter/AdapterInterface.php        | 100 +-
 src/Image/Adapter/Gd.php                      | 127 ++-
 src/Image/Adapter/Imagick.php                 | 166 ++--
 src/Image/Exception.php                       |   2 -
 src/Image/ImageFactory.php                    |   2 -
 src/Logger/AbstractLogger.php                 |  12 +-
 src/Logger/Adapter/AbstractAdapter.php        |   1 -
 src/Logger/Adapter/AdapterInterface.php       |   2 -
 src/Logger/Adapter/Noop.php                   |   2 -
 src/Logger/Adapter/Stream.php                 |  27 +-
 src/Logger/Adapter/Syslog.php                 |   1 -
 src/Logger/AdapterFactory.php                 |   2 -
 src/Logger/Exception.php                      |   2 -
 src/Logger/Formatter/AbstractFormatter.php    |  22 +-
 src/Logger/Formatter/FormatterInterface.php   |   2 -
 src/Logger/Formatter/Json.php                 |   4 -
 src/Logger/Formatter/Line.php                 |  35 +-
 src/Logger/Item.php                           |  47 +-
 src/Logger/Logger.php                         |   2 -
 src/Logger/LoggerFactory.php                  |   1 -
 src/Logger/LoggerInterface.php                |   2 -
 src/Messages/Exception.php                    |   2 -
 src/Messages/Message.php                      |  41 +-
 src/Messages/MessageInterface.php             |   2 -
 src/Messages/Messages.php                     |   1 -
 src/Mvc/Application.php                       |   1 -
 src/Mvc/Application/Exception.php             |   2 -
 src/Mvc/Controller.php                        |   2 -
 src/Mvc/Controller/BindModelInterface.php     |   2 -
 src/Mvc/ControllerInterface.php               |   2 -
 src/Mvc/Dispatcher.php                        |   1 -
 src/Mvc/Dispatcher/Exception.php              |   2 -
 src/Mvc/DispatcherInterface.php               |   2 -
 src/Mvc/EntityInterface.php                   |   2 -
 src/Mvc/Micro.php                             |   5 +-
 src/Mvc/Micro/Collection.php                  |   1 -
 src/Mvc/Micro/CollectionInterface.php         |   5 +-
 src/Mvc/Micro/Exception.php                   |   2 -
 src/Mvc/Micro/LazyLoader.php                  |  33 +-
 src/Mvc/Micro/MiddlewareInterface.php         |   2 -
 src/Mvc/Model.php                             |  56 +-
 src/Mvc/Model/Behavior.php                    |   1 -
 src/Mvc/Model/Behavior/SoftDelete.php         |   2 -
 src/Mvc/Model/Behavior/Timestampable.php      |   2 -
 src/Mvc/Model/BehaviorInterface.php           |   2 -
 src/Mvc/Model/Binder.php                      |  37 +-
 src/Mvc/Model/Binder/BindableInterface.php    |   2 -
 src/Mvc/Model/BinderInterface.php             |   2 -
 src/Mvc/Model/Criteria.php                    |   1 -
 src/Mvc/Model/CriteriaInterface.php           |   2 -
 src/Mvc/Model/Exception.php                   |   2 -
 src/Mvc/Model/Manager.php                     | 803 ++++++++--------
 src/Mvc/Model/ManagerInterface.php            |   9 +-
 src/Mvc/Model/MetaData/Apcu.php               |   2 -
 src/Mvc/Model/MetaData/Libmemcached.php       |   2 -
 src/Mvc/Model/MetaData/Memory.php             |   2 -
 src/Mvc/Model/MetaData/Redis.php              |   2 -
 .../Model/MetaData/Strategy/Annotations.php   |   2 -
 .../Model/MetaData/Strategy/Introspection.php |   2 -
 .../MetaData/Strategy/StrategyInterface.php   |   2 -
 src/Mvc/Model/MetaData/Stream.php             |   1 -
 src/Mvc/Model/MetaDataInterface.php           |   2 -
 src/Mvc/Model/Query.php                       |  22 +-
 src/Mvc/Model/Query/Builder.php               |   1 -
 src/Mvc/Model/Query/BuilderInterface.php      |   4 +-
 src/Mvc/Model/Query/Lang.php                  |   2 -
 src/Mvc/Model/Query/Status.php                |   1 -
 src/Mvc/Model/Query/StatusInterface.php       |   2 -
 src/Mvc/Model/QueryInterface.php              |   2 -
 src/Mvc/Model/RelationInterface.php           |   2 -
 src/Mvc/Model/ResultInterface.php             |   2 -
 src/Mvc/Model/Resultset/Complex.php           |   1 -
 src/Mvc/Model/Resultset/Simple.php            |   1 -
 src/Mvc/Model/ResultsetInterface.php          |   2 -
 src/Mvc/Model/Row.php                         |   2 -
 src/Mvc/Model/Transaction.php                 |   1 -
 src/Mvc/Model/Transaction/Exception.php       |   2 -
 src/Mvc/Model/Transaction/Failed.php          |   1 -
 src/Mvc/Model/Transaction/Manager.php         |   1 -
 .../Model/Transaction/ManagerInterface.php    |   2 -
 src/Mvc/Model/TransactionInterface.php        |   2 -
 src/Mvc/Model/ValidationFailed.php            |   1 -
 src/Mvc/ModelInterface.php                    |   2 -
 src/Mvc/ModuleDefinitionInterface.php         |   2 -
 src/Mvc/Router.php                            |  78 +-
 src/Mvc/Router/Annotations.php                |   1 -
 src/Mvc/Router/Exception.php                  |   2 -
 src/Mvc/Router/Group.php                      |   1 -
 src/Mvc/Router/GroupInterface.php             |   2 -
 src/Mvc/Router/Route.php                      |  15 +-
 src/Mvc/Router/RouteInterface.php             |   2 -
 src/Mvc/RouterInterface.php                   |  57 +-
 src/Mvc/Url.php                               |   1 -
 src/Mvc/Url/Exception.php                     |   2 -
 src/Mvc/Url/UrlInterface.php                  |   2 -
 src/Mvc/View.php                              |  42 +-
 src/Mvc/View/Engine/AbstractEngine.php        |   1 -
 src/Mvc/View/Engine/EngineInterface.php       |   2 -
 src/Mvc/View/Engine/Php.php                   |   2 -
 src/Mvc/View/Engine/Volt.php                  |   1 -
 src/Mvc/View/Engine/Volt/Compiler.php         |  21 +-
 src/Mvc/View/Engine/Volt/Exception.php        |   1 -
 src/Mvc/View/Exception.php                    |   2 -
 src/Mvc/View/Simple.php                       |  19 +-
 src/Mvc/ViewBaseInterface.php                 |   2 -
 src/Mvc/ViewInterface.php                     |   2 -
 src/Paginator/Adapter/AbstractAdapter.php     |   1 -
 src/Paginator/Adapter/AdapterInterface.php    |   2 -
 src/Paginator/Adapter/Model.php               |   2 -
 src/Paginator/Adapter/NativeArray.php         |   2 -
 src/Paginator/Adapter/QueryBuilder.php        |   1 -
 src/Paginator/Exception.php                   |   2 -
 src/Paginator/PaginatorFactory.php            |   2 -
 src/Paginator/Repository.php                  |   1 -
 src/Session/Adapter/AbstractAdapter.php       |   1 -
 src/Session/Adapter/Libmemcached.php          |   2 -
 src/Session/Adapter/Noop.php                  |   1 -
 src/Session/Adapter/Redis.php                 |   2 -
 src/Session/Adapter/Stream.php                |   1 -
 src/Session/Bag.php                           |   1 -
 src/Session/BagInterface.php                  |   2 -
 src/Session/Exception.php                     |   2 -
 src/Session/Manager.php                       |   1 -
 src/Storage/Adapter/AbstractAdapter.php       |  19 +-
 src/Storage/Adapter/AdapterInterface.php      |   2 -
 src/Storage/Adapter/Apcu.php                  |   1 -
 src/Storage/Adapter/Libmemcached.php          |   1 -
 src/Storage/Adapter/Memory.php                |   1 -
 src/Storage/Adapter/Redis.php                 |  15 +-
 src/Storage/Adapter/Stream.php                |   4 -
 src/Storage/AdapterFactory.php                |   1 -
 src/Storage/Exception.php                     |   2 -
 src/Storage/Serializer/AbstractSerializer.php |  35 +-
 src/Storage/Serializer/Base64.php             |   2 -
 src/Storage/Serializer/Igbinary.php           |   2 -
 src/Storage/Serializer/Json.php               |   2 -
 src/Storage/Serializer/MemcachedIgbinary.php  |   2 -
 src/Storage/Serializer/MemcachedJson.php      |   2 -
 src/Storage/Serializer/MemcachedPhp.php       |   2 -
 src/Storage/Serializer/Msgpack.php            |   2 -
 src/Storage/Serializer/None.php               |   2 -
 src/Storage/Serializer/Php.php                |   2 -
 src/Storage/Serializer/RedisIgbinary.php      |   2 -
 src/Storage/Serializer/RedisJson.php          |   2 -
 src/Storage/Serializer/RedisMsgpack.php       |   2 -
 src/Storage/Serializer/RedisNone.php          |   2 -
 src/Storage/Serializer/RedisPhp.php           |   2 -
 .../Serializer/SerializerInterface.php        |   2 -
 src/Storage/SerializerFactory.php             |   2 -
 src/Support/Collection.php                    |   1 -
 .../Collection/CollectionInterface.php        |   2 -
 src/Support/Collection/Exception.php          |   2 -
 src/Support/Collection/ReadOnlyCollection.php |   2 -
 src/Support/Debug.php                         |   1 -
 src/Support/Debug/Dump.php                    |  28 +-
 src/Support/Debug/Exception.php               |   2 -
 src/Support/Exception.php                     |   2 -
 src/Support/Helper/Arr/AbstractArr.php        |   2 -
 src/Support/Helper/Arr/Blacklist.php          |   2 -
 src/Support/Helper/Arr/Chunk.php              |   2 -
 src/Support/Helper/Arr/Filter.php             |   2 -
 src/Support/Helper/Arr/First.php              |   2 -
 src/Support/Helper/Arr/FirstKey.php           |   2 -
 src/Support/Helper/Arr/Flatten.php            |   2 -
 src/Support/Helper/Arr/Get.php                |   2 -
 src/Support/Helper/Arr/Group.php              |   2 -
 src/Support/Helper/Arr/Has.php                |   2 -
 src/Support/Helper/Arr/IsUnique.php           |   2 -
 src/Support/Helper/Arr/Last.php               |   2 -
 src/Support/Helper/Arr/LastKey.php            |   2 -
 src/Support/Helper/Arr/Pluck.php              |   2 -
 src/Support/Helper/Arr/Set.php                |   2 -
 src/Support/Helper/Arr/SliceLeft.php          |   2 -
 src/Support/Helper/Arr/SliceRight.php         |   2 -
 src/Support/Helper/Arr/Split.php              |   2 -
 src/Support/Helper/Arr/ToObject.php           |   2 -
 src/Support/Helper/Arr/ValidateAll.php        |   2 -
 src/Support/Helper/Arr/ValidateAny.php        |   2 -
 src/Support/Helper/Arr/Whitelist.php          |   2 -
 src/Support/Helper/Exception.php              |   2 -
 src/Support/Helper/File/Basename.php          |   2 -
 src/Support/Helper/Json/Decode.php            |   2 -
 src/Support/Helper/Json/Encode.php            |   2 -
 src/Support/Helper/Number/IsBetween.php       |   2 -
 src/Support/Helper/Str/AbstractStr.php        |   2 -
 src/Support/Helper/Str/Camelize.php           |   2 -
 src/Support/Helper/Str/Concat.php             |   2 -
 src/Support/Helper/Str/CountVowels.php        |   2 -
 src/Support/Helper/Str/Decapitalize.php       |   2 -
 src/Support/Helper/Str/Decrement.php          |   2 -
 src/Support/Helper/Str/DirFromFile.php        |   2 -
 src/Support/Helper/Str/DirSeparator.php       |   2 -
 src/Support/Helper/Str/Dynamic.php            |   2 -
 src/Support/Helper/Str/EndsWith.php           |   2 -
 src/Support/Helper/Str/FirstBetween.php       |   2 -
 src/Support/Helper/Str/Friendly.php           |   2 -
 src/Support/Helper/Str/Humanize.php           |   2 -
 src/Support/Helper/Str/Includes.php           |   2 -
 src/Support/Helper/Str/Increment.php          |   2 -
 src/Support/Helper/Str/Interpolate.php        |   2 -
 src/Support/Helper/Str/IsAnagram.php          |   2 -
 src/Support/Helper/Str/IsLower.php            |   2 -
 src/Support/Helper/Str/IsPalindrome.php       |   2 -
 src/Support/Helper/Str/IsUpper.php            |   2 -
 src/Support/Helper/Str/KebabCase.php          |   2 -
 src/Support/Helper/Str/Len.php                |   2 -
 src/Support/Helper/Str/Lower.php              |   2 -
 src/Support/Helper/Str/PascalCase.php         |   2 -
 src/Support/Helper/Str/Prefix.php             |   2 -
 src/Support/Helper/Str/ReduceSlashes.php      |   2 -
 src/Support/Helper/Str/SnakeCase.php          |   2 -
 src/Support/Helper/Str/StartsWith.php         |   2 -
 src/Support/Helper/Str/Suffix.php             |   2 -
 src/Support/Helper/Str/Ucwords.php            |   2 -
 src/Support/Helper/Str/Uncamelize.php         |   2 -
 src/Support/Helper/Str/Underscore.php         |   2 -
 src/Support/Helper/Str/Upper.php              |   2 -
 src/Support/HelperFactory.php                 |   2 -
 src/Support/Registry.php                      |   2 -
 src/Tag.php                                   | 879 ++++++++++++++++++
 src/Tag/Exception.php                         |   2 -
 src/Tag/Select.php                            |   2 -
 src/Translate/Adapter/AbstractAdapter.php     |   1 -
 src/Translate/Adapter/AdapterInterface.php    |   2 -
 src/Translate/Adapter/Csv.php                 |   1 -
 src/Translate/Adapter/Gettext.php             |  53 +-
 src/Translate/Adapter/NativeArray.php         |   1 -
 src/Translate/Exception.php                   |   2 -
 .../Interpolator/AssociativeArray.php         |   2 -
 src/Translate/Interpolator/IndexedArray.php   |   2 -
 .../Interpolator/InterpolatorInterface.php    |   2 -
 src/Translate/InterpolatorFactory.php         |   2 -
 src/Translate/TranslateFactory.php            |   1 -
 578 files changed, 2776 insertions(+), 2523 deletions(-)
 create mode 100644 src/Filter/Sanitize/StringValLegacy.php
 create mode 100644 src/Tag.php

diff --git a/src/Acl/Adapter/AbstractAdapter.php b/src/Acl/Adapter/AbstractAdapter.php
index 036226ca..4d0cc899 100644
--- a/src/Acl/Adapter/AbstractAdapter.php
+++ b/src/Acl/Adapter/AbstractAdapter.php
@@ -18,14 +18,6 @@
  */
 abstract class AbstractAdapter extends AbstractEventsAware implements \Phalcon\Acl\Adapter\AdapterInterface, \Phalcon\Events\EventsAwareInterface
 {
-
-    /**
-     * Active access which the list is checking if some role can access it
-     *
-     * @var string|null
-     */
-    protected $activeAccess;
-
     /**
      * Access Granted
      *
@@ -34,19 +26,26 @@ abstract class AbstractAdapter extends AbstractEventsAware implements \Phalcon\A
     protected $accessGranted = false;
 
     /**
-     * Role which the list is checking if it's allowed to certain
-     * component/access
+     * Active access which the list is checking if some role can access it
      *
      * @var string|null
      */
-    protected $activeRole;
+    protected $activeAccess = null;
 
     /**
      * Component which the list is checking if some role can access it
      *
      * @var string|null
      */
-    protected $activeComponent;
+    protected $activeComponent = null;
+
+    /**
+     * Role which the list is checking if it's allowed to certain
+     * component/access
+     *
+     * @var string|null
+     */
+    protected $activeRole = null;
 
     /**
      * Default access
@@ -65,22 +64,21 @@ public function getActiveAccess(): ?string
     }
 
     /**
-     * Role which the list is checking if it's allowed to certain
-     *
-     * component/access
+     * Component which the list is checking if some role can access it
      *
      * @return string|null
      */
-    public function getActiveRole(): ?string
+    public function getActiveComponent(): ?string
     {
     }
 
     /**
-     * Component which the list is checking if some role can access it
+     * Role which the list is checking if it's allowed to certain
+     * component/access
      *
      * @return string|null
      */
-    public function getActiveComponent(): ?string
+    public function getActiveRole(): ?string
     {
     }
 
diff --git a/src/Acl/Adapter/AdapterInterface.php b/src/Acl/Adapter/AdapterInterface.php
index 5381b1a3..3333fd92 100644
--- a/src/Acl/Adapter/AdapterInterface.php
+++ b/src/Acl/Adapter/AdapterInterface.php
@@ -17,8 +17,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Do a role inherit from another existing role
      *
diff --git a/src/Acl/Adapter/Memory.php b/src/Acl/Adapter/Memory.php
index 16ef9f65..4408f330 100644
--- a/src/Acl/Adapter/Memory.php
+++ b/src/Acl/Adapter/Memory.php
@@ -84,7 +84,6 @@
  */
 class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
 {
-
     /**
      * Access
      *
@@ -118,7 +117,7 @@ class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
      *
      * @var string|null
      */
-    protected $activeKey;
+    protected $activeKey = null;
 
     /**
      * Components
@@ -162,33 +161,6 @@ class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter
      */
     protected $roleInherits;
 
-    /**
-     * Returns latest function used to acquire access
-     *
-     * @return mixed
-     */
-    public function getActiveFunction()
-    {
-    }
-
-    /**
-     * Returns number of additional arguments(excluding role and resource) for active function
-     *
-     * @return int
-     */
-    public function getActiveFunctionCustomArgumentsCount(): int
-    {
-    }
-
-    /**
-     * Returns latest key used to acquire access
-     *
-     * @return string|null
-     */
-    public function getActiveKey(): ?string
-    {
-    }
-
     /**
      * Phalcon\Acl\Adapter\Memory constructor
      */
@@ -350,6 +322,33 @@ public function dropComponentAccess(string $componentName, $accessList): void
     {
     }
 
+    /**
+     * Returns latest function used to acquire access
+     *
+     * @return mixed
+     */
+    public function getActiveFunction()
+    {
+    }
+
+    /**
+     * Returns number of additional arguments(excluding role and resource) for active function
+     *
+     * @return int
+     */
+    public function getActiveFunctionCustomArgumentsCount(): int
+    {
+    }
+
+    /**
+     * Returns latest key used to acquire access
+     *
+     * @return string|null
+     */
+    public function getActiveKey(): ?string
+    {
+    }
+
     /**
      * Return an array with every component registered in the list
      *
diff --git a/src/Acl/Component.php b/src/Acl/Component.php
index b761a687..0bf3f4b0 100644
--- a/src/Acl/Component.php
+++ b/src/Acl/Component.php
@@ -14,7 +14,6 @@
  */
 class Component implements \Phalcon\Acl\ComponentInterface
 {
-
     /**
      * Component description
      *
@@ -30,39 +29,33 @@ class Component implements \Phalcon\Acl\ComponentInterface
     private $name;
 
     /**
-     * Component description
+     * Phalcon\Acl\Component constructor
      *
-     * @return string
+     * @param string $name
+     * @param string $description
      */
-    public function getDescription(): string
+    public function __construct(string $name, string $description = null)
     {
     }
 
     /**
-     * Component name
-     *
      * @return string
      */
-    public function getName(): string
+    public function __toString(): string
     {
     }
 
     /**
-     * Component name
-     *
      * @return string
      */
-    public function __toString(): string
+    public function getDescription(): string
     {
     }
 
     /**
-     * Phalcon\Acl\Component constructor
-     *
-     * @param string $name
-     * @param string $description
+     * @return string
      */
-    public function __construct(string $name, string $description = null)
+    public function getName(): string
     {
     }
 }
diff --git a/src/Acl/ComponentAwareInterface.php b/src/Acl/ComponentAwareInterface.php
index c15c7e71..71f4b35b 100644
--- a/src/Acl/ComponentAwareInterface.php
+++ b/src/Acl/ComponentAwareInterface.php
@@ -14,8 +14,6 @@
  */
 interface ComponentAwareInterface
 {
-
-
     /**
      * Returns component name
      *
diff --git a/src/Acl/ComponentInterface.php b/src/Acl/ComponentInterface.php
index 79a48e56..f34c4cc0 100644
--- a/src/Acl/ComponentInterface.php
+++ b/src/Acl/ComponentInterface.php
@@ -14,8 +14,6 @@
  */
 interface ComponentInterface
 {
-
-
     /**
      * Returns component description
      *
diff --git a/src/Acl/Exception.php b/src/Acl/Exception.php
index 2668cd39..12d0693b 100644
--- a/src/Acl/Exception.php
+++ b/src/Acl/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Acl/Role.php b/src/Acl/Role.php
index 990a378a..60449f06 100644
--- a/src/Acl/Role.php
+++ b/src/Acl/Role.php
@@ -14,33 +14,31 @@
  */
 class Role implements \Phalcon\Acl\RoleInterface
 {
-
     /**
-     * Role name
+     * Role description
      *
      * @var string
      */
-    private $name;
+    private $description;
 
     /**
-     * Role description
+     * Role name
      *
      * @var string
      */
-    private $description;
+    private $name;
 
     /**
-     * Role name
+     * Phalcon\Acl\Role constructor
      *
-     * @return string
+     * @param string $name
+     * @param string $description
      */
-    public function getName(): string
+    public function __construct(string $name, string $description = null)
     {
     }
 
     /**
-     * Role name
-     *
      * @return string
      */
     public function __toString(): string
@@ -48,8 +46,6 @@ public function __toString(): string
     }
 
     /**
-     * Role description
-     *
      * @return string
      */
     public function getDescription(): string
@@ -57,12 +53,9 @@ public function getDescription(): string
     }
 
     /**
-     * Phalcon\Acl\Role constructor
-     *
-     * @param string $name
-     * @param string $description
+     * @return string
      */
-    public function __construct(string $name, string $description = null)
+    public function getName(): string
     {
     }
 }
diff --git a/src/Acl/RoleAwareInterface.php b/src/Acl/RoleAwareInterface.php
index a42385eb..003fe8bd 100644
--- a/src/Acl/RoleAwareInterface.php
+++ b/src/Acl/RoleAwareInterface.php
@@ -14,8 +14,6 @@
  */
 interface RoleAwareInterface
 {
-
-
     /**
      * Returns role name
      *
diff --git a/src/Acl/RoleInterface.php b/src/Acl/RoleInterface.php
index 4dc42ceb..5c38cb35 100644
--- a/src/Acl/RoleInterface.php
+++ b/src/Acl/RoleInterface.php
@@ -14,8 +14,6 @@
  */
 interface RoleInterface
 {
-
-
     /**
      * Returns the role name
      *
diff --git a/src/Annotations/Adapter/AbstractAdapter.php b/src/Annotations/Adapter/AbstractAdapter.php
index 86a35918..dd208985 100644
--- a/src/Annotations/Adapter/AbstractAdapter.php
+++ b/src/Annotations/Adapter/AbstractAdapter.php
@@ -20,7 +20,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Annotations/Adapter/AdapterInterface.php b/src/Annotations/Adapter/AdapterInterface.php
index 8376b718..978076cb 100644
--- a/src/Annotations/Adapter/AdapterInterface.php
+++ b/src/Annotations/Adapter/AdapterInterface.php
@@ -18,8 +18,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Parses or retrieves all the annotations found in a class
      *
diff --git a/src/Annotations/Adapter/Apcu.php b/src/Annotations/Adapter/Apcu.php
index ead7e836..7cb1d60b 100644
--- a/src/Annotations/Adapter/Apcu.php
+++ b/src/Annotations/Adapter/Apcu.php
@@ -22,7 +22,6 @@
  */
 class Apcu extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */
diff --git a/src/Annotations/Adapter/Memory.php b/src/Annotations/Adapter/Memory.php
index 527037ad..7e4194ec 100644
--- a/src/Annotations/Adapter/Memory.php
+++ b/src/Annotations/Adapter/Memory.php
@@ -17,7 +17,6 @@
  */
 class Memory extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
-
     /**
      * @var mixed
      */
diff --git a/src/Annotations/Adapter/Stream.php b/src/Annotations/Adapter/Stream.php
index 08cb7931..ead578fb 100644
--- a/src/Annotations/Adapter/Stream.php
+++ b/src/Annotations/Adapter/Stream.php
@@ -28,7 +28,6 @@
  */
 class Stream extends \Phalcon\Annotations\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */
diff --git a/src/Annotations/Annotation.php b/src/Annotations/Annotation.php
index 9c29ae36..daa1d03a 100644
--- a/src/Annotations/Annotation.php
+++ b/src/Annotations/Annotation.php
@@ -14,7 +14,6 @@
  */
 class Annotation
 {
-
     /**
      * Annotation Arguments
      *
diff --git a/src/Annotations/AnnotationsFactory.php b/src/Annotations/AnnotationsFactory.php
index ac43ee99..94105e4d 100644
--- a/src/Annotations/AnnotationsFactory.php
+++ b/src/Annotations/AnnotationsFactory.php
@@ -18,8 +18,6 @@
  */
 class AnnotationsFactory extends AbstractFactory
 {
-
-
     /**
      * AdapterFactory constructor.
      *
diff --git a/src/Annotations/Collection.php b/src/Annotations/Collection.php
index a92b49de..36300ede 100644
--- a/src/Annotations/Collection.php
+++ b/src/Annotations/Collection.php
@@ -31,7 +31,6 @@
  */
 class Collection implements \Iterator, \Countable
 {
-
     /**
      * @var array
      */
diff --git a/src/Annotations/Exception.php b/src/Annotations/Exception.php
index 7aa18eea..07286917 100644
--- a/src/Annotations/Exception.php
+++ b/src/Annotations/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Annotations/Reader.php b/src/Annotations/Reader.php
index 3f718b1a..b0d607d2 100644
--- a/src/Annotations/Reader.php
+++ b/src/Annotations/Reader.php
@@ -16,8 +16,6 @@
  */
 class Reader implements \Phalcon\Annotations\ReaderInterface
 {
-
-
     /**
      * Reads annotations from the class docblocks, its methods and/or properties
      *
diff --git a/src/Annotations/ReaderInterface.php b/src/Annotations/ReaderInterface.php
index 477ee4b3..d84ba0c4 100644
--- a/src/Annotations/ReaderInterface.php
+++ b/src/Annotations/ReaderInterface.php
@@ -14,8 +14,6 @@
  */
 interface ReaderInterface
 {
-
-
     /**
      * Reads annotations from the class docblocks, its constants, properties and methods
      *
diff --git a/src/Annotations/Reflection.php b/src/Annotations/Reflection.php
index 196ebe91..38069236 100644
--- a/src/Annotations/Reflection.php
+++ b/src/Annotations/Reflection.php
@@ -29,30 +29,25 @@
  */
 class Reflection
 {
-
     /**
-     * @var array
-     * TODO: Make always array
+     * @var Collection|null
      */
-    protected $classAnnotations;
+    protected $classAnnotations = null;
 
     /**
      * @var array
-     * TODO: Make always array
      */
-    protected $constantAnnotations;
+    protected $constantAnnotations = [];
 
     /**
      * @var array
-     * TODO: Make always array
      */
-    protected $propertyAnnotations;
+    protected $propertyAnnotations = [];
 
     /**
      * @var array
-     * TODO: Make always array
      */
-    protected $methodAnnotations;
+    protected $methodAnnotations = [];
 
     /**
      * @var array
@@ -60,8 +55,6 @@ class Reflection
     protected $reflectionData = [];
 
     /**
-     * Phalcon\Annotations\Reflection constructor
-     *
      * @param array $reflectionData
      */
     public function __construct(array $reflectionData = [])
@@ -71,36 +64,36 @@ public function __construct(array $reflectionData = [])
     /**
      * Returns the annotations found in the class docblock
      *
-     * @return bool|Collection
+     * @return Collection|null
      */
-    public function getClassAnnotations()
+    public function getClassAnnotations(): ?Collection
     {
     }
 
     /**
      * Returns the annotations found in the constants' docblocks
      *
-     * @return array|bool|Collection[]
+     * @return Collection[]
      */
-    public function getConstantsAnnotations()
+    public function getConstantsAnnotations(): array
     {
     }
 
     /**
      * Returns the annotations found in the properties' docblocks
      *
-     * @return array|bool|Collection[]
+     * @return Collection[]
      */
-    public function getPropertiesAnnotations()
+    public function getPropertiesAnnotations(): array
     {
     }
 
     /**
      * Returns the annotations found in the methods' docblocks
      *
-     * @return array|bool|Collection[]
+     * @return Collection[]
      */
-    public function getMethodsAnnotations()
+    public function getMethodsAnnotations(): array
     {
     }
 
diff --git a/src/Application/AbstractApplication.php b/src/Application/AbstractApplication.php
index a7f623df..b7a17fd1 100644
--- a/src/Application/AbstractApplication.php
+++ b/src/Application/AbstractApplication.php
@@ -19,7 +19,6 @@
  */
 abstract class AbstractApplication extends Injectable implements \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var DiInterface|null
      */
diff --git a/src/Application/Exception.php b/src/Application/Exception.php
index 4e182279..b4a27097 100644
--- a/src/Application/Exception.php
+++ b/src/Application/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 569089bc..a20868c5 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -30,7 +30,6 @@
  */
 class Asset implements \Phalcon\Assets\AssetInterface
 {
-
     /**
      * @var array
      */
@@ -84,130 +83,130 @@ class Asset implements \Phalcon\Assets\AssetInterface
     protected $version;
 
     /**
-     * @return bool
+     * Asset constructor.
+     *
+     * @param string      $type
+     * @param string      $path
+     * @param bool        $isLocal
+     * @param bool        $filter
+     * @param array       $attributes
+     * @param string|null $version
+     * @param bool        $isAutoVersion
      */
-    public function getFilter(): bool
+    public function __construct(string $type, string $path, bool $isLocal = true, bool $filter = true, array $attributes = [], string $version = null, bool $isAutoVersion = false)
     {
     }
 
     /**
+     * Gets the asset's key.
+     *
      * @return string
      */
-    public function getPath(): string
+    public function getAssetKey(): string
     {
     }
 
     /**
-     * @return string
+     * Gets extra HTML attributes.
+     *
+     * @return array
      */
-    public function getSourcePath(): string
+    public function getAttributes(): array
     {
     }
 
     /**
+     * Returns the content of the asset as an string
+     * Optionally a base path where the asset is located can be set
+     *
+     * @param string|null $basePath
+     *
      * @return string
+     * @throws Exception
      */
-    public function getTargetPath(): string
+    public function getContent(string $basePath = null): string
     {
     }
 
     /**
-     * @return string
+     * @return bool
      */
-    public function getTargetUri(): string
+    public function getFilter(): bool
     {
     }
 
     /**
      * @return string
      */
-    public function getType(): string
+    public function getPath(): string
     {
     }
 
     /**
-     * Version of resource
+     * Returns the complete location where the asset is located
      *
-     * @return string|null
+     * @param string|null $basePath
+     *
+     * @return string
      */
-    public function getVersion(): ?string
+    public function getRealSourcePath(string $basePath = null): string
     {
     }
 
     /**
-     * Asset constructor.
+     * Returns the complete location where the asset must be written
      *
-     * @param string      $type
-     * @param string      $path
-     * @param bool        $isLocal
-     * @param bool        $filter
-     * @param array       $attributes
-     * @param string|null $version
-     * @param bool        $isAutoVersion
+     * @param string|null $basePath
+     *
+     * @return string
      */
-    public function __construct(string $type, string $path, bool $isLocal = true, bool $filter = true, array $attributes = [], string $version = null, bool $isAutoVersion = false)
+    public function getRealTargetPath(string $basePath = null): string
     {
     }
 
     /**
-     * Gets the asset's key.
+     * Returns the real target uri for the generated HTML
      *
      * @return string
      */
-    public function getAssetKey(): string
+    public function getRealTargetUri(): string
     {
     }
 
     /**
-     * Gets extra HTML attributes.
-     *
-     * @return array
+     * @return string
      */
-    public function getAttributes(): array
+    public function getSourcePath(): string
     {
     }
 
     /**
-     * Returns the content of the asset as an string
-     * Optionally a base path where the asset is located can be set
-     *
-     * @param string|null $basePath
-     *
      * @return string
-     * @throws Exception
      */
-    public function getContent(string $basePath = null): string
+    public function getTargetPath(): string
     {
     }
 
     /**
-     * Returns the complete location where the asset is located
-     *
-     * @param string|null $basePath
-     *
      * @return string
      */
-    public function getRealSourcePath(string $basePath = null): string
+    public function getTargetUri(): string
     {
     }
 
     /**
-     * Returns the complete location where the asset must be written
-     *
-     * @param string|null $basePath
-     *
      * @return string
      */
-    public function getRealTargetPath(string $basePath = null): string
+    public function getType(): string
     {
     }
 
     /**
-     * Returns the real target uri for the generated HTML
+     * Version of resource
      *
-     * @return string
+     * @return string|null
      */
-    public function getRealTargetUri(): string
+    public function getVersion(): ?string
     {
     }
 
diff --git a/src/Assets/Asset/Css.php b/src/Assets/Asset/Css.php
index f0dba5f3..58fac1d8 100644
--- a/src/Assets/Asset/Css.php
+++ b/src/Assets/Asset/Css.php
@@ -16,8 +16,6 @@
  */
 class Css extends \Phalcon\Assets\Asset
 {
-
-
     /**
      * Phalcon\Assets\Asset\Css constructor
      *
diff --git a/src/Assets/Asset/Js.php b/src/Assets/Asset/Js.php
index 406a5b34..f4f75411 100644
--- a/src/Assets/Asset/Js.php
+++ b/src/Assets/Asset/Js.php
@@ -16,8 +16,6 @@
  */
 class Js extends \Phalcon\Assets\Asset
 {
-
-
     /**
      * Phalcon\Assets\Asset\Js constructor
      *
diff --git a/src/Assets/AssetInterface.php b/src/Assets/AssetInterface.php
index 53de8e14..d16d8a78 100644
--- a/src/Assets/AssetInterface.php
+++ b/src/Assets/AssetInterface.php
@@ -14,8 +14,6 @@
  */
 interface AssetInterface
 {
-
-
     /**
      * Gets the asset's key.
      *
diff --git a/src/Assets/Collection.php b/src/Assets/Collection.php
index 430a987f..ce61fee9 100644
--- a/src/Assets/Collection.php
+++ b/src/Assets/Collection.php
@@ -32,7 +32,6 @@
  */
 class Collection implements \Countable, \IteratorAggregate
 {
-
     /**
      * @var array
      */
@@ -63,12 +62,12 @@ class Collection implements \Countable, \IteratorAggregate
     /**
      * @var bool
      */
-    protected $join = true;
+    protected $isLocal = true;
 
     /**
      * @var bool
      */
-    protected $isLocal = true;
+    protected $join = true;
 
     /**
      * @var string
@@ -100,83 +99,6 @@ class Collection implements \Countable, \IteratorAggregate
      */
     protected $version = '';
 
-    /**
-     * @return array
-     */
-    public function getAssets(): array
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes(): array
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getCodes(): array
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getFilters(): array
-    {
-    }
-
-    /**
-     * @return bool
-     */
-    public function getJoin(): bool
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrefix(): string
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getSourcePath(): string
-    {
-    }
-
-    /**
-     * @return bool
-     */
-    public function getTargetIsLocal(): bool
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getTargetPath(): string
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getTargetUri(): string
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getVersion(): string
-    {
-    }
-
     /**
      * Adds an asset to the collection
      *
@@ -272,6 +194,34 @@ public function count(): int
     {
     }
 
+    /**
+     * @return array
+     */
+    public function getAssets(): array
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public function getCodes(): array
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilters(): array
+    {
+    }
+
     /**
      * Returns the generator of the class
      *
@@ -282,6 +232,20 @@ public function getIterator(): \Traversable
     {
     }
 
+    /**
+     * @return bool
+     */
+    public function getJoin(): bool
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix(): string
+    {
+    }
+
     /**
      * Returns the complete location where the joined/filtered collection must
      * be written
@@ -294,6 +258,41 @@ public function getRealTargetPath(string $basePath): string
     {
     }
 
+    /**
+     * @return string
+     */
+    public function getSourcePath(): string
+    {
+    }
+
+    /**
+     * @return bool
+     */
+    public function getTargetIsLocal(): bool
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getTargetPath(): string
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getTargetUri(): string
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion(): string
+    {
+    }
+
     /**
      * Checks this the asset is added to the collection.
      *
diff --git a/src/Assets/Exception.php b/src/Assets/Exception.php
index b903f4a5..f17ac72d 100644
--- a/src/Assets/Exception.php
+++ b/src/Assets/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Assets/FilterInterface.php b/src/Assets/FilterInterface.php
index 8ca18709..5654aa6b 100644
--- a/src/Assets/FilterInterface.php
+++ b/src/Assets/FilterInterface.php
@@ -14,8 +14,6 @@
  */
 interface FilterInterface
 {
-
-
     /**
      * Filters the content returning a string with the filtered content
      *
diff --git a/src/Assets/Filters/Cssmin.php b/src/Assets/Filters/Cssmin.php
index 86967d4c..58fc0fec 100644
--- a/src/Assets/Filters/Cssmin.php
+++ b/src/Assets/Filters/Cssmin.php
@@ -17,8 +17,6 @@
  */
 class Cssmin implements \Phalcon\Assets\FilterInterface
 {
-
-
     /**
      * Filters the content using CSSMIN
      * NOTE: This functionality is not currently available
diff --git a/src/Assets/Filters/Jsmin.php b/src/Assets/Filters/Jsmin.php
index b29002a4..afc0cd04 100644
--- a/src/Assets/Filters/Jsmin.php
+++ b/src/Assets/Filters/Jsmin.php
@@ -18,8 +18,6 @@
  */
 class Jsmin implements \Phalcon\Assets\FilterInterface
 {
-
-
     /**
      * Filters the content using JSMIN
      * NOTE: This functionality is not currently available
diff --git a/src/Assets/Filters/None.php b/src/Assets/Filters/None.php
index 5aa208fb..215abf06 100644
--- a/src/Assets/Filters/None.php
+++ b/src/Assets/Filters/None.php
@@ -16,8 +16,6 @@
  */
 class None implements \Phalcon\Assets\FilterInterface
 {
-
-
     /**
      * Returns the content as is
      *
diff --git a/src/Assets/Inline.php b/src/Assets/Inline.php
index 1862b470..3bdebcff 100644
--- a/src/Assets/Inline.php
+++ b/src/Assets/Inline.php
@@ -18,9 +18,8 @@
  */
 class Inline implements \Phalcon\Assets\AssetInterface
 {
-
     /**
-     * @var array | null
+     * @var array
      */
     protected $attributes;
 
@@ -40,51 +39,51 @@ class Inline implements \Phalcon\Assets\AssetInterface
     protected $type;
 
     /**
-     * @return array|null
+     * Phalcon\Assets\Inline constructor
+     *
+     * @param string $type
+     * @param string $content
+     * @param bool $filter
+     * @param array $attributes
      */
-    public function getAttributes(): ?array
+    public function __construct(string $type, string $content, bool $filter = true, array $attributes = [])
     {
     }
 
     /**
+     * Gets the asset's key.
+     *
      * @return string
      */
-    public function getContent(): string
+    public function getAssetKey(): string
     {
     }
 
     /**
-     * @return bool
+     * @return array
      */
-    public function getFilter(): bool
+    public function getAttributes(): array
     {
     }
 
     /**
      * @return string
      */
-    public function getType(): string
+    public function getContent(): string
     {
     }
 
     /**
-     * Phalcon\Assets\Inline constructor
-     *
-     * @param string $type
-     * @param string $content
-     * @param bool $filter
-     * @param array $attributes
+     * @return bool
      */
-    public function __construct(string $type, string $content, bool $filter = true, array $attributes = [])
+    public function getFilter(): bool
     {
     }
 
     /**
-     * Gets the asset's key.
-     *
      * @return string
      */
-    public function getAssetKey(): string
+    public function getType(): string
     {
     }
 
diff --git a/src/Assets/Inline/Css.php b/src/Assets/Inline/Css.php
index 67a59a38..da4a0502 100644
--- a/src/Assets/Inline/Css.php
+++ b/src/Assets/Inline/Css.php
@@ -16,8 +16,6 @@
  */
 class Css extends \Phalcon\Assets\Inline
 {
-
-
     /**
      * Phalcon\Assets\Inline\Css constructor
      *
diff --git a/src/Assets/Inline/Js.php b/src/Assets/Inline/Js.php
index 038e3fb9..3c6e89ce 100644
--- a/src/Assets/Inline/Js.php
+++ b/src/Assets/Inline/Js.php
@@ -16,8 +16,6 @@
  */
 class Js extends \Phalcon\Assets\Inline
 {
-
-
     /**
      * Phalcon\Assets\Inline\Js constructor
      *
diff --git a/src/Assets/Manager.php b/src/Assets/Manager.php
index b59608cb..40e39036 100644
--- a/src/Assets/Manager.php
+++ b/src/Assets/Manager.php
@@ -29,7 +29,6 @@
  */
 class Manager extends AbstractInjectionAware
 {
-
     /**
      * @var array
      */
diff --git a/src/Autoload/Exception.php b/src/Autoload/Exception.php
index 9077ae55..e6d78f3d 100644
--- a/src/Autoload/Exception.php
+++ b/src/Autoload/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Autoload/Loader.php b/src/Autoload/Loader.php
index db31ef45..78b81731 100644
--- a/src/Autoload/Loader.php
+++ b/src/Autoload/Loader.php
@@ -30,7 +30,6 @@
  */
 class Loader extends AbstractEventsAware
 {
-
     /**
      * @var string|null
      */
diff --git a/src/Cache/AbstractCache.php b/src/Cache/AbstractCache.php
index ca7dd36b..2ed1a50e 100644
--- a/src/Cache/AbstractCache.php
+++ b/src/Cache/AbstractCache.php
@@ -22,7 +22,6 @@
  */
 abstract class AbstractCache implements \Phalcon\Cache\CacheInterface
 {
-
     /**
      * The adapter
      *
diff --git a/src/Cache/Adapter/AdapterInterface.php b/src/Cache/Adapter/AdapterInterface.php
index a6214327..254ef2de 100644
--- a/src/Cache/Adapter/AdapterInterface.php
+++ b/src/Cache/Adapter/AdapterInterface.php
@@ -16,6 +16,4 @@
  */
 interface AdapterInterface extends StorageAdapterInterface
 {
-
-
 }
diff --git a/src/Cache/Adapter/Apcu.php b/src/Cache/Adapter/Apcu.php
index 971b9848..63cd8413 100644
--- a/src/Cache/Adapter/Apcu.php
+++ b/src/Cache/Adapter/Apcu.php
@@ -17,6 +17,4 @@
  */
 class Apcu extends \Phalcon\Storage\Adapter\Apcu implements CacheAdapterInterface
 {
-
-
 }
diff --git a/src/Cache/Adapter/Libmemcached.php b/src/Cache/Adapter/Libmemcached.php
index 959d3358..8d9bc0b3 100644
--- a/src/Cache/Adapter/Libmemcached.php
+++ b/src/Cache/Adapter/Libmemcached.php
@@ -17,6 +17,4 @@
  */
 class Libmemcached extends \Phalcon\Storage\Adapter\Libmemcached implements CacheAdapterInterface
 {
-
-
 }
diff --git a/src/Cache/Adapter/Memory.php b/src/Cache/Adapter/Memory.php
index f9593f7d..e615a152 100644
--- a/src/Cache/Adapter/Memory.php
+++ b/src/Cache/Adapter/Memory.php
@@ -17,6 +17,4 @@
  */
 class Memory extends \Phalcon\Storage\Adapter\Memory implements CacheAdapterInterface
 {
-
-
 }
diff --git a/src/Cache/Adapter/Redis.php b/src/Cache/Adapter/Redis.php
index 0a8f5b08..f8d676f2 100644
--- a/src/Cache/Adapter/Redis.php
+++ b/src/Cache/Adapter/Redis.php
@@ -17,6 +17,4 @@
  */
 class Redis extends \Phalcon\Storage\Adapter\Redis implements CacheAdapterInterface
 {
-
-
 }
diff --git a/src/Cache/Adapter/Stream.php b/src/Cache/Adapter/Stream.php
index 9f5bcbe0..37ddff08 100644
--- a/src/Cache/Adapter/Stream.php
+++ b/src/Cache/Adapter/Stream.php
@@ -17,6 +17,4 @@
  */
 class Stream extends \Phalcon\Storage\Adapter\Stream implements CacheAdapterInterface
 {
-
-
 }
diff --git a/src/Cache/AdapterFactory.php b/src/Cache/AdapterFactory.php
index 51cce574..ae451a05 100644
--- a/src/Cache/AdapterFactory.php
+++ b/src/Cache/AdapterFactory.php
@@ -21,7 +21,6 @@
  */
 class AdapterFactory extends AbstractFactory
 {
-
     /**
      * @var SerializerFactory
      */
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
index bd199fba..c81e6c26 100644
--- a/src/Cache/Cache.php
+++ b/src/Cache/Cache.php
@@ -21,8 +21,6 @@
  */
 class Cache extends \Phalcon\Cache\AbstractCache
 {
-
-
     /**
      * Wipes clean the entire cache's keys.
      *
diff --git a/src/Cache/CacheFactory.php b/src/Cache/CacheFactory.php
index 7aca9328..213b18a4 100644
--- a/src/Cache/CacheFactory.php
+++ b/src/Cache/CacheFactory.php
@@ -22,7 +22,6 @@
  */
 class CacheFactory extends AbstractConfigFactory
 {
-
     /**
      * @var AdapterFactory
      */
diff --git a/src/Cache/CacheInterface.php b/src/Cache/CacheInterface.php
index 904c023c..b255dbc9 100644
--- a/src/Cache/CacheInterface.php
+++ b/src/Cache/CacheInterface.php
@@ -17,8 +17,6 @@
  */
 interface CacheInterface
 {
-
-
     /**
      * Wipes clean the entire cache's keys.
      *
diff --git a/src/Cache/Exception/Exception.php b/src/Cache/Exception/Exception.php
index 7b4446e7..57a1309c 100644
--- a/src/Cache/Exception/Exception.php
+++ b/src/Cache/Exception/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Cache/Exception/InvalidArgumentException.php b/src/Cache/Exception/InvalidArgumentException.php
index 4915ef8c..2a9954c4 100644
--- a/src/Cache/Exception/InvalidArgumentException.php
+++ b/src/Cache/Exception/InvalidArgumentException.php
@@ -14,6 +14,4 @@
  */
 class InvalidArgumentException extends \Exception
 {
-
-
 }
diff --git a/src/Cli/Console.php b/src/Cli/Console.php
index 3f7f3250..bdf8e6d4 100644
--- a/src/Cli/Console.php
+++ b/src/Cli/Console.php
@@ -20,7 +20,6 @@
  */
 class Console extends AbstractApplication
 {
-
     /**
      * @var array
      */
diff --git a/src/Cli/Console/Exception.php b/src/Cli/Console/Exception.php
index 7c940feb..d4819feb 100644
--- a/src/Cli/Console/Exception.php
+++ b/src/Cli/Console/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Phalcon\Application\Exception
 {
-
-
 }
diff --git a/src/Cli/Dispatcher.php b/src/Cli/Dispatcher.php
index d13eee23..de1e7333 100644
--- a/src/Cli/Dispatcher.php
+++ b/src/Cli/Dispatcher.php
@@ -38,7 +38,6 @@
  */
 class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phalcon\Cli\DispatcherInterface
 {
-
     protected $defaultHandler = 'main';
 
     /**
diff --git a/src/Cli/Dispatcher/Exception.php b/src/Cli/Dispatcher/Exception.php
index c69ca0f1..6b0516fc 100644
--- a/src/Cli/Dispatcher/Exception.php
+++ b/src/Cli/Dispatcher/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Phalcon\Dispatcher\Exception
 {
-
-
 }
diff --git a/src/Cli/DispatcherInterface.php b/src/Cli/DispatcherInterface.php
index 42840d3c..a53c658e 100644
--- a/src/Cli/DispatcherInterface.php
+++ b/src/Cli/DispatcherInterface.php
@@ -16,8 +16,6 @@
  */
 interface DispatcherInterface extends DispatcherInterfaceBase
 {
-
-
     /**
      * Returns the active task in the dispatcher
      *
diff --git a/src/Cli/Router.php b/src/Cli/Router.php
index 22189344..cf60aaf7 100644
--- a/src/Cli/Router.php
+++ b/src/Cli/Router.php
@@ -37,7 +37,6 @@
  */
 class Router extends AbstractInjectionAware
 {
-
     /**
      * @var string|null
      */
@@ -135,9 +134,9 @@ public function getActionName(): string
     /**
      * Returns the route that matches the handled URI
      *
-     * @return RouteInterface
+     * @return RouteInterface|null
      */
-    public function getMatchedRoute(): RouteInterface
+    public function getMatchedRoute(): ?RouteInterface
     {
     }
 
diff --git a/src/Cli/Router/Exception.php b/src/Cli/Router/Exception.php
index 0eca2fcb..9f1ee8e0 100644
--- a/src/Cli/Router/Exception.php
+++ b/src/Cli/Router/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Cli/Router/RouteInterface.php b/src/Cli/Router/RouteInterface.php
index 3aea2d21..cdfe2c9a 100644
--- a/src/Cli/Router/RouteInterface.php
+++ b/src/Cli/Router/RouteInterface.php
@@ -14,8 +14,6 @@
  */
 interface RouteInterface
 {
-
-
     /**
      * Replaces placeholders from pattern returning a valid PCRE regular
      * expression
diff --git a/src/Cli/RouterInterface.php b/src/Cli/RouterInterface.php
index efcba3b5..1187996b 100644
--- a/src/Cli/RouterInterface.php
+++ b/src/Cli/RouterInterface.php
@@ -16,8 +16,6 @@
  */
 interface RouterInterface
 {
-
-
     /**
      * Adds a route to the router on any HTTP method
      *
@@ -37,9 +35,9 @@ public function getActionName(): string;
     /**
      * Returns the route that matches the handled URI
      *
-     * @return RouteInterface
+     * @return RouteInterface|null
      */
-    public function getMatchedRoute(): RouteInterface;
+    public function getMatchedRoute(): ?RouteInterface;
 
     /**
      * Return the sub expressions in the regular expression matched
diff --git a/src/Cli/Task.php b/src/Cli/Task.php
index 2bd6ba4b..96885d53 100644
--- a/src/Cli/Task.php
+++ b/src/Cli/Task.php
@@ -39,7 +39,6 @@
  */
 class Task extends Injectable implements \Phalcon\Cli\TaskInterface, \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var ManagerInterface
      */
diff --git a/src/Cli/TaskInterface.php b/src/Cli/TaskInterface.php
index 85fd522f..41d8f6dd 100644
--- a/src/Cli/TaskInterface.php
+++ b/src/Cli/TaskInterface.php
@@ -14,6 +14,4 @@
  */
 interface TaskInterface
 {
-
-
 }
diff --git a/src/Config/Adapter/Grouped.php b/src/Config/Adapter/Grouped.php
index 8d25daac..4638e0b6 100644
--- a/src/Config/Adapter/Grouped.php
+++ b/src/Config/Adapter/Grouped.php
@@ -68,8 +68,6 @@
  */
 class Grouped extends Config
 {
-
-
     /**
      * Phalcon\Config\Adapter\Grouped constructor
      *
diff --git a/src/Config/Adapter/Ini.php b/src/Config/Adapter/Ini.php
index b7e3fc82..846bbe9c 100644
--- a/src/Config/Adapter/Ini.php
+++ b/src/Config/Adapter/Ini.php
@@ -57,8 +57,6 @@
  */
 class Ini extends Config
 {
-
-
     /**
      * Ini constructor.
      *
diff --git a/src/Config/Adapter/Json.php b/src/Config/Adapter/Json.php
index 1c2321b7..a06d5804 100644
--- a/src/Config/Adapter/Json.php
+++ b/src/Config/Adapter/Json.php
@@ -34,8 +34,6 @@
  */
 class Json extends Config
 {
-
-
     /**
      * Phalcon\Config\Adapter\Json constructor
      *
diff --git a/src/Config/Adapter/Php.php b/src/Config/Adapter/Php.php
index 8e721bab..95ccf762 100644
--- a/src/Config/Adapter/Php.php
+++ b/src/Config/Adapter/Php.php
@@ -48,8 +48,6 @@
  */
 class Php extends Config
 {
-
-
     /**
      * Phalcon\Config\Adapter\Php constructor
      *
diff --git a/src/Config/Adapter/Yaml.php b/src/Config/Adapter/Yaml.php
index 45161b27..ab410e43 100644
--- a/src/Config/Adapter/Yaml.php
+++ b/src/Config/Adapter/Yaml.php
@@ -51,8 +51,6 @@
  */
 class Yaml extends Config
 {
-
-
     /**
      * Phalcon\Config\Adapter\Yaml constructor
      *
diff --git a/src/Config/ConfigFactory.php b/src/Config/ConfigFactory.php
index 1f54fd30..64896eff 100644
--- a/src/Config/ConfigFactory.php
+++ b/src/Config/ConfigFactory.php
@@ -30,8 +30,6 @@
  */
 class ConfigFactory extends AbstractFactory
 {
-
-
     /**
      * ConfigFactory constructor.
      *
diff --git a/src/Config/ConfigInterface.php b/src/Config/ConfigInterface.php
index d9482a81..9445c4d1 100644
--- a/src/Config/ConfigInterface.php
+++ b/src/Config/ConfigInterface.php
@@ -18,8 +18,6 @@
  */
 interface ConfigInterface extends \Phalcon\Support\Collection\CollectionInterface
 {
-
-
     /**
      * @return string
      */
diff --git a/src/Config/Exception.php b/src/Config/Exception.php
index 7537265c..4cf841e3 100644
--- a/src/Config/Exception.php
+++ b/src/Config/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/DataMapper/Pdo/Connection.php b/src/DataMapper/Pdo/Connection.php
index ae61668f..646881ef 100644
--- a/src/DataMapper/Pdo/Connection.php
+++ b/src/DataMapper/Pdo/Connection.php
@@ -24,7 +24,6 @@
  */
 class Connection extends AbstractConnection
 {
-
     /**
      * @var array
      */
diff --git a/src/DataMapper/Pdo/Connection/AbstractConnection.php b/src/DataMapper/Pdo/Connection/AbstractConnection.php
index 64b2adab..7f39ab9e 100644
--- a/src/DataMapper/Pdo/Connection/AbstractConnection.php
+++ b/src/DataMapper/Pdo/Connection/AbstractConnection.php
@@ -22,7 +22,6 @@
  */
 abstract class AbstractConnection implements \Phalcon\DataMapper\Pdo\Connection\ConnectionInterface
 {
-
     /**
      * @var \PDO
      */
diff --git a/src/DataMapper/Pdo/Connection/ConnectionInterface.php b/src/DataMapper/Pdo/Connection/ConnectionInterface.php
index c3c44a53..cb346682 100644
--- a/src/DataMapper/Pdo/Connection/ConnectionInterface.php
+++ b/src/DataMapper/Pdo/Connection/ConnectionInterface.php
@@ -24,8 +24,6 @@
  */
 interface ConnectionInterface extends \Phalcon\DataMapper\Pdo\Connection\PdoInterface
 {
-
-
     /**
      * Connects to the database.
      *
diff --git a/src/DataMapper/Pdo/Connection/Decorated.php b/src/DataMapper/Pdo/Connection/Decorated.php
index 5ee471b8..02eb003c 100644
--- a/src/DataMapper/Pdo/Connection/Decorated.php
+++ b/src/DataMapper/Pdo/Connection/Decorated.php
@@ -18,8 +18,6 @@
  */
 class Decorated extends \Phalcon\DataMapper\Pdo\Connection\AbstractConnection
 {
-
-
     /**
      *
      * Constructor.
diff --git a/src/DataMapper/Pdo/Connection/PdoInterface.php b/src/DataMapper/Pdo/Connection/PdoInterface.php
index a5ca7983..14b42be3 100644
--- a/src/DataMapper/Pdo/Connection/PdoInterface.php
+++ b/src/DataMapper/Pdo/Connection/PdoInterface.php
@@ -14,8 +14,6 @@
  */
 interface PdoInterface
 {
-
-
     /**
      * Begins a transaction. If the profiler is enabled, the operation will
      * be recorded.
diff --git a/src/DataMapper/Pdo/ConnectionLocator.php b/src/DataMapper/Pdo/ConnectionLocator.php
index 91432098..690b14ea 100644
--- a/src/DataMapper/Pdo/ConnectionLocator.php
+++ b/src/DataMapper/Pdo/ConnectionLocator.php
@@ -21,7 +21,6 @@
  */
 class ConnectionLocator implements \Phalcon\DataMapper\Pdo\ConnectionLocatorInterface
 {
-
     /**
      * A default Connection connection factory/instance.
      *
diff --git a/src/DataMapper/Pdo/ConnectionLocatorInterface.php b/src/DataMapper/Pdo/ConnectionLocatorInterface.php
index 86a3aa03..60bb6f4a 100644
--- a/src/DataMapper/Pdo/ConnectionLocatorInterface.php
+++ b/src/DataMapper/Pdo/ConnectionLocatorInterface.php
@@ -16,8 +16,6 @@
  */
 interface ConnectionLocatorInterface
 {
-
-
     /**
      * Returns the default connection object.
      *
diff --git a/src/DataMapper/Pdo/Exception/CannotDisconnect.php b/src/DataMapper/Pdo/Exception/CannotDisconnect.php
index ee219064..da2c16a2 100644
--- a/src/DataMapper/Pdo/Exception/CannotDisconnect.php
+++ b/src/DataMapper/Pdo/Exception/CannotDisconnect.php
@@ -15,6 +15,4 @@
  */
 class CannotDisconnect extends \Phalcon\DataMapper\Pdo\Exception\Exception
 {
-
-
 }
diff --git a/src/DataMapper/Pdo/Exception/ConnectionNotFound.php b/src/DataMapper/Pdo/Exception/ConnectionNotFound.php
index b7233934..b0e25934 100644
--- a/src/DataMapper/Pdo/Exception/ConnectionNotFound.php
+++ b/src/DataMapper/Pdo/Exception/ConnectionNotFound.php
@@ -14,6 +14,4 @@
  */
 class ConnectionNotFound extends \Phalcon\DataMapper\Pdo\Exception\Exception
 {
-
-
 }
diff --git a/src/DataMapper/Pdo/Exception/Exception.php b/src/DataMapper/Pdo/Exception/Exception.php
index 08c63feb..8994cb20 100644
--- a/src/DataMapper/Pdo/Exception/Exception.php
+++ b/src/DataMapper/Pdo/Exception/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/DataMapper/Pdo/Profiler/MemoryLogger.php b/src/DataMapper/Pdo/Profiler/MemoryLogger.php
index 242b7bc9..b8cb36a2 100644
--- a/src/DataMapper/Pdo/Profiler/MemoryLogger.php
+++ b/src/DataMapper/Pdo/Profiler/MemoryLogger.php
@@ -21,7 +21,6 @@
  */
 class MemoryLogger implements \Phalcon\Logger\LoggerInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/DataMapper/Pdo/Profiler/Profiler.php b/src/DataMapper/Pdo/Profiler/Profiler.php
index a2ac777c..43c89715 100644
--- a/src/DataMapper/Pdo/Profiler/Profiler.php
+++ b/src/DataMapper/Pdo/Profiler/Profiler.php
@@ -25,7 +25,6 @@
  */
 class Profiler implements \Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface
 {
-
     /**
      * @var bool
      */
diff --git a/src/DataMapper/Pdo/Profiler/ProfilerInterface.php b/src/DataMapper/Pdo/Profiler/ProfilerInterface.php
index b634a1c6..1247b52d 100644
--- a/src/DataMapper/Pdo/Profiler/ProfilerInterface.php
+++ b/src/DataMapper/Pdo/Profiler/ProfilerInterface.php
@@ -16,8 +16,6 @@
  */
 interface ProfilerInterface
 {
-
-
     /**
      * Finishes and logs a profile entry.
      *
diff --git a/src/DataMapper/Query/AbstractConditions.php b/src/DataMapper/Query/AbstractConditions.php
index cb60d987..90b8d3fd 100644
--- a/src/DataMapper/Query/AbstractConditions.php
+++ b/src/DataMapper/Query/AbstractConditions.php
@@ -14,8 +14,6 @@
  */
 abstract class AbstractConditions extends \Phalcon\DataMapper\Query\AbstractQuery
 {
-
-
     /**
      * Sets the `LIMIT` clause
      *
diff --git a/src/DataMapper/Query/AbstractQuery.php b/src/DataMapper/Query/AbstractQuery.php
index b8e4bd0e..712ba4ec 100644
--- a/src/DataMapper/Query/AbstractQuery.php
+++ b/src/DataMapper/Query/AbstractQuery.php
@@ -20,7 +20,6 @@
  */
 abstract class AbstractQuery
 {
-
     /**
      * @var Bind
      */
diff --git a/src/DataMapper/Query/Bind.php b/src/DataMapper/Query/Bind.php
index a857b391..6b681ea0 100644
--- a/src/DataMapper/Query/Bind.php
+++ b/src/DataMapper/Query/Bind.php
@@ -17,7 +17,6 @@
  */
 class Bind
 {
-
     /**
      * @var int
      */
diff --git a/src/DataMapper/Query/Delete.php b/src/DataMapper/Query/Delete.php
index b94c77db..4f74348d 100644
--- a/src/DataMapper/Query/Delete.php
+++ b/src/DataMapper/Query/Delete.php
@@ -26,8 +26,6 @@
  */
 class Delete extends \Phalcon\DataMapper\Query\AbstractConditions
 {
-
-
     /**
      * Delete constructor.
      *
diff --git a/src/DataMapper/Query/Insert.php b/src/DataMapper/Query/Insert.php
index d76f8f9e..56f1e831 100644
--- a/src/DataMapper/Query/Insert.php
+++ b/src/DataMapper/Query/Insert.php
@@ -16,8 +16,6 @@
  */
 class Insert extends \Phalcon\DataMapper\Query\AbstractQuery
 {
-
-
     /**
      * Insert constructor.
      *
diff --git a/src/DataMapper/Query/QueryFactory.php b/src/DataMapper/Query/QueryFactory.php
index 2af7bf74..39f15086 100644
--- a/src/DataMapper/Query/QueryFactory.php
+++ b/src/DataMapper/Query/QueryFactory.php
@@ -18,7 +18,6 @@
  */
 class QueryFactory
 {
-
     /**
      * @var string
      */
diff --git a/src/DataMapper/Query/Update.php b/src/DataMapper/Query/Update.php
index a3af4d7f..c2b50a74 100644
--- a/src/DataMapper/Query/Update.php
+++ b/src/DataMapper/Query/Update.php
@@ -16,8 +16,6 @@
  */
 class Update extends \Phalcon\DataMapper\Query\AbstractConditions
 {
-
-
     /**
      * Update constructor.
      *
diff --git a/src/Db/AbstractDb.php b/src/Db/AbstractDb.php
index 121a2fdb..bc32871c 100644
--- a/src/Db/AbstractDb.php
+++ b/src/Db/AbstractDb.php
@@ -9,7 +9,7 @@
  */
 namespace Phalcon\Db;
 
-use \PDO as Pdo;
+use PDO as Pdo;
 
 /**
  * Phalcon\Db and its related classes provide a simple SQL database interface
@@ -56,8 +56,6 @@
  */
 abstract class AbstractDb
 {
-
-
     /**
      * Enables/disables options in the Database component
      *
diff --git a/src/Db/Adapter/AbstractAdapter.php b/src/Db/Adapter/AbstractAdapter.php
index a7d7eb14..46a2ab92 100644
--- a/src/Db/Adapter/AbstractAdapter.php
+++ b/src/Db/Adapter/AbstractAdapter.php
@@ -26,7 +26,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Db\Adapter\AdapterInterface, \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * Connection ID
      *
@@ -118,24 +117,6 @@ abstract class AbstractAdapter implements \Phalcon\Db\Adapter\AdapterInterface,
      */
     protected $type;
 
-    /**
-     * Name of the dialect used
-     *
-     * @return string
-     */
-    public function getDialectType(): string
-    {
-    }
-
-    /**
-     * Type of database system the adapter is used for
-     *
-     * @return string
-     */
-    public function getType(): string
-    {
-    }
-
     /**
      * Phalcon\Db\Adapter constructor
      *
@@ -586,6 +567,15 @@ public function getDialect(): DialectInterface
     {
     }
 
+    /**
+     * Name of the dialect used
+     *
+     * @return string
+     */
+    public function getDialectType(): string
+    {
+    }
+
     /**
      * Returns the internal event manager
      *
@@ -640,6 +630,15 @@ public function getSQLVariables(): array
     {
     }
 
+    /**
+     * Type of database system the adapter is used for
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+    }
+
     /**
      * Inserts data into a table using custom RDBMS SQL syntax
      *
diff --git a/src/Db/Adapter/AdapterInterface.php b/src/Db/Adapter/AdapterInterface.php
index 9da34bf0..5441886f 100644
--- a/src/Db/Adapter/AdapterInterface.php
+++ b/src/Db/Adapter/AdapterInterface.php
@@ -21,8 +21,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Adds a column to a table
      *
diff --git a/src/Db/Adapter/Pdo/AbstractPdo.php b/src/Db/Adapter/Pdo/AbstractPdo.php
index aa1aa27e..c89ae7b5 100644
--- a/src/Db/Adapter/Pdo/AbstractPdo.php
+++ b/src/Db/Adapter/Pdo/AbstractPdo.php
@@ -36,7 +36,6 @@
  */
 abstract class AbstractPdo extends AbstractAdapter
 {
-
     /**
      * Last affected rows
      *
diff --git a/src/Db/Adapter/Pdo/Mysql.php b/src/Db/Adapter/Pdo/Mysql.php
index 52b4d759..1b25259a 100644
--- a/src/Db/Adapter/Pdo/Mysql.php
+++ b/src/Db/Adapter/Pdo/Mysql.php
@@ -38,7 +38,6 @@
  */
 class Mysql extends \Phalcon\Db\Adapter\Pdo\AbstractPdo
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/Adapter/Pdo/Postgresql.php b/src/Db/Adapter/Pdo/Postgresql.php
index 70de3da9..df497c22 100644
--- a/src/Db/Adapter/Pdo/Postgresql.php
+++ b/src/Db/Adapter/Pdo/Postgresql.php
@@ -38,7 +38,6 @@
  */
 class Postgresql extends \Phalcon\Db\Adapter\Pdo\AbstractPdo
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/Adapter/Pdo/Sqlite.php b/src/Db/Adapter/Pdo/Sqlite.php
index 070e8fe4..4f5e826b 100644
--- a/src/Db/Adapter/Pdo/Sqlite.php
+++ b/src/Db/Adapter/Pdo/Sqlite.php
@@ -35,7 +35,6 @@
  */
 class Sqlite extends \Phalcon\Db\Adapter\Pdo\AbstractPdo
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/Adapter/PdoFactory.php b/src/Db/Adapter/PdoFactory.php
index dd3f6fd4..08b391a0 100644
--- a/src/Db/Adapter/PdoFactory.php
+++ b/src/Db/Adapter/PdoFactory.php
@@ -22,8 +22,6 @@
  */
 class PdoFactory extends AbstractFactory
 {
-
-
     /**
      * Constructor
      *
diff --git a/src/Db/Column.php b/src/Db/Column.php
index 438f3f85..d6ae2eae 100644
--- a/src/Db/Column.php
+++ b/src/Db/Column.php
@@ -236,12 +236,19 @@ class Column implements \Phalcon\Db\ColumnInterface
      */
     protected $bindType = 2;
 
+    /**
+     * Column's comment
+     *
+     * @var string|null
+     */
+    protected $comment = null;
+
     /**
      * Default column value
      *
      * @var mixed|null
      */
-    protected $_default = null;
+    protected $defaultValue = null;
 
     /**
      * Position is first
@@ -264,13 +271,6 @@ class Column implements \Phalcon\Db\ColumnInterface
      */
     protected $name;
 
-    /**
-     * Column's comment
-     *
-     * @var string|null
-     */
-    protected $comment = null;
-
     /**
      * Column not nullable?
      *
@@ -330,102 +330,102 @@ class Column implements \Phalcon\Db\ColumnInterface
     protected $unsigned = false;
 
     /**
-     * Default column value
+     * Phalcon\Db\Column constructor
      *
-     * @return mixed|null
+     * @param string $name
+     * @param array $definition
      */
-    public function getDefault()
+    public function __construct(string $name, array $definition)
     {
     }
 
     /**
-     * Column's name
+     * Check whether field absolute to position in table
      *
-     * @return string
+     * @return string|null
      */
-    public function getName(): string
+    public function getAfterPosition(): ?string
     {
     }
 
     /**
-     * Column's comment
+     * Returns the type of bind handling
      *
-     * @return string|null
+     * @return int
      */
-    public function getComment(): ?string
+    public function getBindType(): int
     {
     }
 
     /**
-     * Integer column number scale
+     * Column's comment
      *
-     * @return int
+     * @return string|null
      */
-    public function getScale(): int
+    public function getComment(): ?string
     {
     }
 
     /**
-     * Integer column size
+     * Default column value
      *
-     * @return int|string
+     * @return mixed
      */
-    public function getSize()
+    public function getDefault()
     {
     }
 
     /**
-     * Column data type
+     * Column's name
      *
-     * @return int
+     * @return string
      */
-    public function getType(): int
+    public function getName(): string
     {
     }
 
     /**
-     * Column data type reference
+     * Integer column number scale
      *
      * @return int
      */
-    public function getTypeReference(): int
+    public function getScale(): int
     {
     }
 
     /**
-     * Column data type values
+     * Integer column size
      *
-     * @return array|string
+     * @return int|string
      */
-    public function getTypeValues()
+    public function getSize()
     {
     }
 
     /**
-     * Phalcon\Db\Column constructor
+     * Column data type
      *
-     * @param string $name
-     * @param array $definition
+     * @return int
      */
-    public function __construct(string $name, array $definition)
+    public function getType(): int
     {
     }
 
     /**
-     * Check whether field absolute to position in table
+     * Column data type reference
      *
-     * @return string|null
+     * @return int
      */
-    public function getAfterPosition(): ?string
+    public function getTypeReference(): int
     {
     }
 
     /**
-     * Returns the type of bind handling
+     * Column data type values
      *
-     * @return int
+     * @return array|string
      */
-    public function getBindType(): int
+    public function getTypeValues()
     {
     }
 
diff --git a/src/Db/ColumnInterface.php b/src/Db/ColumnInterface.php
index b0cd3ecb..105a05aa 100644
--- a/src/Db/ColumnInterface.php
+++ b/src/Db/ColumnInterface.php
@@ -14,8 +14,6 @@
  */
 interface ColumnInterface
 {
-
-
     /**
      * Check whether field absolute to position in table
      *
diff --git a/src/Db/Dialect.php b/src/Db/Dialect.php
index 362b095f..2cfba1a8 100644
--- a/src/Db/Dialect.php
+++ b/src/Db/Dialect.php
@@ -15,7 +15,6 @@
  */
 abstract class Dialect implements \Phalcon\Db\DialectInterface
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/Dialect/Mysql.php b/src/Db/Dialect/Mysql.php
index 03d0f107..abc53bb4 100644
--- a/src/Db/Dialect/Mysql.php
+++ b/src/Db/Dialect/Mysql.php
@@ -22,7 +22,6 @@
  */
 class Mysql extends Dialect
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/Dialect/Postgresql.php b/src/Db/Dialect/Postgresql.php
index 9835295b..a3829440 100644
--- a/src/Db/Dialect/Postgresql.php
+++ b/src/Db/Dialect/Postgresql.php
@@ -22,7 +22,6 @@
  */
 class Postgresql extends Dialect
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/Dialect/Sqlite.php b/src/Db/Dialect/Sqlite.php
index b80ae7c2..b9d6dbc3 100644
--- a/src/Db/Dialect/Sqlite.php
+++ b/src/Db/Dialect/Sqlite.php
@@ -22,7 +22,6 @@
  */
 class Sqlite extends Dialect
 {
-
     /**
      * @var string
      */
diff --git a/src/Db/DialectInterface.php b/src/Db/DialectInterface.php
index 1509c782..3bf821df 100644
--- a/src/Db/DialectInterface.php
+++ b/src/Db/DialectInterface.php
@@ -14,8 +14,6 @@
  */
 interface DialectInterface
 {
-
-
     /**
      * Generates SQL to add a column to a table
      *
diff --git a/src/Db/Exception.php b/src/Db/Exception.php
index c6bea851..f3795cd1 100644
--- a/src/Db/Exception.php
+++ b/src/Db/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Db/Index.php b/src/Db/Index.php
index f43ac4a6..3ef9f00e 100644
--- a/src/Db/Index.php
+++ b/src/Db/Index.php
@@ -40,7 +40,6 @@
  */
 class Index implements \Phalcon\Db\IndexInterface
 {
-
     /**
      * Index columns
      *
@@ -62,6 +61,17 @@ class Index implements \Phalcon\Db\IndexInterface
      */
     protected $type;
 
+    /**
+     * Phalcon\Db\Index constructor
+     *
+     * @param string $name
+     * @param array $columns
+     * @param string $type
+     */
+    public function __construct(string $name, array $columns, string $type = '')
+    {
+    }
+
     /**
      * Index columns
      *
@@ -88,15 +98,4 @@ public function getName(): string
     public function getType(): string
     {
     }
-
-    /**
-     * Phalcon\Db\Index constructor
-     *
-     * @param string $name
-     * @param array $columns
-     * @param string $type
-     */
-    public function __construct(string $name, array $columns, string $type = '')
-    {
-    }
 }
diff --git a/src/Db/IndexInterface.php b/src/Db/IndexInterface.php
index 943e0291..1fab9678 100644
--- a/src/Db/IndexInterface.php
+++ b/src/Db/IndexInterface.php
@@ -14,8 +14,6 @@
  */
 interface IndexInterface
 {
-
-
     /**
      * Gets the columns that corresponds the index
      *
diff --git a/src/Db/Profiler.php b/src/Db/Profiler.php
index 313ed717..2ee177fd 100644
--- a/src/Db/Profiler.php
+++ b/src/Db/Profiler.php
@@ -63,7 +63,6 @@
  */
 class Profiler
 {
-
     /**
      * Active Item
      *
diff --git a/src/Db/Profiler/Item.php b/src/Db/Profiler/Item.php
index ae93c2eb..a19f00e2 100644
--- a/src/Db/Profiler/Item.php
+++ b/src/Db/Profiler/Item.php
@@ -14,7 +14,6 @@
  */
 class Item
 {
-
     /**
      * Timestamp when the profile ended
      *
@@ -51,101 +50,106 @@ class Item
     protected $sqlVariables;
 
     /**
-     * Timestamp when the profile ended
+     * Return the timestamp when the profile ended
      *
-     * @param double $finalTime
+     * @return float
      */
-    public function setFinalTime(float $finalTime)
+    public function getFinalTime(): float
     {
     }
 
     /**
-     * Timestamp when the profile ended
+     * Return the timestamp when the profile started
      *
      * @return float
      */
-    public function getFinalTime(): float
+    public function getInitialTime(): float
     {
     }
 
     /**
-     * Timestamp when the profile started
+     * Return the SQL bind types related to the profile
      *
-     * @param double $initialTime
+     * @return array
      */
-    public function setInitialTime(float $initialTime)
+    public function getSqlBindTypes(): array
     {
     }
 
     /**
-     * Timestamp when the profile started
+     * Return the SQL statement related to the profile
      *
-     * @return float
+     * @return string
      */
-    public function getInitialTime(): float
+    public function getSqlStatement(): string
     {
     }
 
     /**
-     * SQL bind types related to the profile
+     * Return the SQL variables related to the profile
      *
-     * @param array $sqlBindTypes
+     * @return array
      */
-    public function setSqlBindTypes(array $sqlBindTypes)
+    public function getSqlVariables(): array
     {
     }
 
     /**
-     * SQL bind types related to the profile
+     * Returns the total time in seconds spent by the profile
      *
-     * @return array
+     * @return float
      */
-    public function getSqlBindTypes(): array
+    public function getTotalElapsedSeconds(): float
     {
     }
 
     /**
-     * SQL statement related to the profile
+     * Return the timestamp when the profile ended
      *
-     * @param string $sqlStatement
+     * @param double $finalTime
+     * @return Item
      */
-    public function setSqlStatement(string $sqlStatement)
+    public function setFinalTime(float $finalTime): Item
     {
     }
 
     /**
-     * SQL statement related to the profile
+     * Return the timestamp when the profile started
      *
-     * @return string
+     * @param double $initialTime
+     * @return Item
      */
-    public function getSqlStatement(): string
+    public function setInitialTime(float $initialTime): Item
     {
     }
 
     /**
-     * SQL variables related to the profile
+     * Return the SQL bind types related to the profile
      *
-     * @param array $sqlVariables
+     * @param array $sqlBindTypes
+     * @return Item
      */
-    public function setSqlVariables(array $sqlVariables)
+    public function setSqlBindTypes(array $sqlBindTypes): Item
     {
     }
 
     /**
-     * SQL variables related to the profile
+     * Return the SQL statement related to the profile
      *
-     * @return array
+     * @param string $sqlStatement
+     * @return Item
      */
-    public function getSqlVariables(): array
+    public function setSqlStatement(string $sqlStatement): Item
     {
     }
 
     /**
-     * Returns the total time in seconds spent by the profile
+     * Return the SQL variables related to the profile
      *
-     * @return float
+     * @param array $sqlVariables
+     * @return Item
      */
-    public function getTotalElapsedSeconds(): float
+    public function setSqlVariables(array $sqlVariables): Item
     {
     }
 }
diff --git a/src/Db/RawValue.php b/src/Db/RawValue.php
index 4f7f1336..cb01a6e5 100644
--- a/src/Db/RawValue.php
+++ b/src/Db/RawValue.php
@@ -25,7 +25,6 @@
  */
 class RawValue
 {
-
     /**
      * Raw value without quoting or formatting
      *
@@ -34,17 +33,15 @@ class RawValue
     protected $value;
 
     /**
-     * Raw value without quoting or formatting
+     * Phalcon\Db\RawValue constructor
      *
-     * @return string
+     * @param mixed $value
      */
-    public function getValue(): string
+    public function __construct($value)
     {
     }
 
     /**
-     * Raw value without quoting or formatting
-     *
      * @return string
      */
     public function __toString(): string
@@ -52,11 +49,9 @@ public function __toString(): string
     }
 
     /**
-     * Phalcon\Db\RawValue constructor
-     *
-     * @param mixed $value
+     * @return string
      */
-    public function __construct($value)
+    public function getValue(): string
     {
     }
 }
diff --git a/src/Db/Reference.php b/src/Db/Reference.php
index b0754678..b44787d7 100644
--- a/src/Db/Reference.php
+++ b/src/Db/Reference.php
@@ -32,7 +32,6 @@
  */
 class Reference implements \Phalcon\Db\ReferenceInterface
 {
-
     /**
      * Local reference columns
      *
@@ -89,6 +88,16 @@ class Reference implements \Phalcon\Db\ReferenceInterface
      */
     protected $onUpdate;
 
+    /**
+     * Phalcon\Db\Reference constructor
+     *
+     * @param string $name
+     * @param array $definition
+     */
+    public function __construct(string $name, array $definition)
+    {
+    }
+
     /**
      * Local reference columns
      *
@@ -160,14 +169,4 @@ public function getOnDelete(): string
     public function getOnUpdate(): string
     {
     }
-
-    /**
-     * Phalcon\Db\Reference constructor
-     *
-     * @param string $name
-     * @param array $definition
-     */
-    public function __construct(string $name, array $definition)
-    {
-    }
 }
diff --git a/src/Db/ReferenceInterface.php b/src/Db/ReferenceInterface.php
index df5c1b6e..f96555c2 100644
--- a/src/Db/ReferenceInterface.php
+++ b/src/Db/ReferenceInterface.php
@@ -14,8 +14,6 @@
  */
 interface ReferenceInterface
 {
-
-
     /**
      * Gets local columns which reference is based
      *
diff --git a/src/Db/Result/PdoResult.php b/src/Db/Result/PdoResult.php
index 15002c10..5e9ae23d 100644
--- a/src/Db/Result/PdoResult.php
+++ b/src/Db/Result/PdoResult.php
@@ -31,7 +31,6 @@
  */
 class PdoResult implements \Phalcon\Db\ResultInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Db/ResultInterface.php b/src/Db/ResultInterface.php
index 0ac4dd34..e080f615 100644
--- a/src/Db/ResultInterface.php
+++ b/src/Db/ResultInterface.php
@@ -14,8 +14,6 @@
  */
 interface ResultInterface
 {
-
-
     /**
      * Moves internal resultset cursor to another position letting us to fetch a
      * certain row
diff --git a/src/Di/AbstractInjectionAware.php b/src/Di/AbstractInjectionAware.php
index bb281f9f..46c19f07 100644
--- a/src/Di/AbstractInjectionAware.php
+++ b/src/Di/AbstractInjectionAware.php
@@ -14,7 +14,6 @@
  */
 abstract class AbstractInjectionAware implements \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * Dependency Injector
      *
diff --git a/src/Di/Di.php b/src/Di/Di.php
index f7aa556a..8e0f8265 100644
--- a/src/Di/Di.php
+++ b/src/Di/Di.php
@@ -62,7 +62,6 @@
  */
 class Di implements \Phalcon\Di\DiInterface
 {
-
     /**
      * List of registered services
      *
@@ -89,7 +88,7 @@ class Di implements \Phalcon\Di\DiInterface
      *
      * @var DiInterface|null
      */
-    protected static $_default;
+    protected static $defaultDi;
 
     /**
      * Phalcon\Di\Di constructor
diff --git a/src/Di/DiInterface.php b/src/Di/DiInterface.php
index 39eac0dd..45848f56 100644
--- a/src/Di/DiInterface.php
+++ b/src/Di/DiInterface.php
@@ -16,8 +16,6 @@
  */
 interface DiInterface extends \ArrayAccess
 {
-
-
     /**
      * Attempts to register a service in the services container
      * Only is successful if a service hasn't been registered previously
diff --git a/src/Di/Exception.php b/src/Di/Exception.php
index 79d32b7e..e0bca701 100644
--- a/src/Di/Exception.php
+++ b/src/Di/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Di/Exception/ServiceResolutionException.php b/src/Di/Exception/ServiceResolutionException.php
index 69e17440..aceff70c 100644
--- a/src/Di/Exception/ServiceResolutionException.php
+++ b/src/Di/Exception/ServiceResolutionException.php
@@ -14,6 +14,4 @@
  */
 class ServiceResolutionException extends \Phalcon\Di\Exception
 {
-
-
 }
diff --git a/src/Di/FactoryDefault.php b/src/Di/FactoryDefault.php
index a25106d6..2a1b5f18 100644
--- a/src/Di/FactoryDefault.php
+++ b/src/Di/FactoryDefault.php
@@ -19,8 +19,6 @@
  */
 class FactoryDefault extends \Phalcon\Di\Di
 {
-
-
     /**
      * Phalcon\Di\FactoryDefault constructor
      */
diff --git a/src/Di/FactoryDefault/Cli.php b/src/Di/FactoryDefault/Cli.php
index d73bfe38..2e5462b2 100644
--- a/src/Di/FactoryDefault/Cli.php
+++ b/src/Di/FactoryDefault/Cli.php
@@ -23,8 +23,6 @@
  */
 class Cli extends FactoryDefault
 {
-
-
     /**
      * Phalcon\Di\FactoryDefault\Cli constructor
      */
diff --git a/src/Di/InitializationAwareInterface.php b/src/Di/InitializationAwareInterface.php
index b544cc64..32af76ee 100644
--- a/src/Di/InitializationAwareInterface.php
+++ b/src/Di/InitializationAwareInterface.php
@@ -9,10 +9,16 @@
  */
 namespace Phalcon\Di;
 
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
 interface InitializationAwareInterface
 {
-
-
     /**
      * @return void
      */
diff --git a/src/Di/Injectable.php b/src/Di/Injectable.php
index 7eba2baa..6b982807 100644
--- a/src/Di/Injectable.php
+++ b/src/Di/Injectable.php
@@ -30,7 +30,7 @@
  * @property \Phalcon\Db\Adapter\AdapterInterface $db
  * @property \Phalcon\Encryption\Security $security
  * @property \Phalcon\Encryption\Crypt|\Phalcon\Encryption\Crypt\CryptInterface $crypt
- * @property \Phalcon\Tag $tag
+ * @property \Phalcon\Html\TagFactory $tag
  * @property \Phalcon\Html\Escaper|\Phalcon\Html\Escaper\EscaperInterface $escaper
  * @property \Phalcon\Annotations\Adapter\Memory|\Phalcon\Annotations\Adapter $annotations
  * @property \Phalcon\Mvc\Model\Manager|\Phalcon\Mvc\Model\ManagerInterface $modelsManager
@@ -43,7 +43,6 @@
  */
 abstract class Injectable implements \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * Dependency Injector
      *
diff --git a/src/Di/InjectionAwareInterface.php b/src/Di/InjectionAwareInterface.php
index 4d272be5..b2d1a8d3 100644
--- a/src/Di/InjectionAwareInterface.php
+++ b/src/Di/InjectionAwareInterface.php
@@ -15,8 +15,6 @@
  */
 interface InjectionAwareInterface
 {
-
-
     /**
      * Sets the dependency injector
      *
diff --git a/src/Di/Service.php b/src/Di/Service.php
index d22299f3..2c38e312 100644
--- a/src/Di/Service.php
+++ b/src/Di/Service.php
@@ -27,7 +27,6 @@
  */
 class Service implements \Phalcon\Di\ServiceInterface
 {
-
     /**
      * @var mixed
      */
diff --git a/src/Di/Service/Builder.php b/src/Di/Service/Builder.php
index 80f55f46..98c639e8 100644
--- a/src/Di/Service/Builder.php
+++ b/src/Di/Service/Builder.php
@@ -19,8 +19,6 @@
  */
 class Builder
 {
-
-
     /**
      * Builds a service using a complex service definition
      *
diff --git a/src/Di/ServiceInterface.php b/src/Di/ServiceInterface.php
index c65b638d..7d6db4dc 100644
--- a/src/Di/ServiceInterface.php
+++ b/src/Di/ServiceInterface.php
@@ -14,8 +14,6 @@
  */
 interface ServiceInterface
 {
-
-
     /**
      * Returns the service definition
      *
diff --git a/src/Di/ServiceProviderInterface.php b/src/Di/ServiceProviderInterface.php
index f3edf091..8d59bf14 100644
--- a/src/Di/ServiceProviderInterface.php
+++ b/src/Di/ServiceProviderInterface.php
@@ -35,8 +35,6 @@
  */
 interface ServiceProviderInterface
 {
-
-
     /**
      * Registers a service provider.
      *
diff --git a/src/Dispatcher/AbstractDispatcher.php b/src/Dispatcher/AbstractDispatcher.php
index c88dfaa1..c142d6aa 100644
--- a/src/Dispatcher/AbstractDispatcher.php
+++ b/src/Dispatcher/AbstractDispatcher.php
@@ -26,7 +26,6 @@
  */
 abstract class AbstractDispatcher extends AbstractInjectionAware implements \Phalcon\Dispatcher\DispatcherInterface, \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var object|null
      */
@@ -281,9 +280,9 @@ public function getModelBinder(): ?BinderInterface
     /**
      * Gets the module where the controller class is
      *
-     * @return string
+     * @return string|null
      */
-    public function getModuleName(): string
+    public function getModuleName(): ?string
     {
     }
 
@@ -470,7 +469,7 @@ public function setModelBinder(\Phalcon\Mvc\Model\BinderInterface $modelBinder,
      * @param string $moduleName
      * @return void
      */
-    public function setModuleName(string $moduleName): void
+    public function setModuleName(string $moduleName = null): void
     {
     }
 
diff --git a/src/Dispatcher/DispatcherInterface.php b/src/Dispatcher/DispatcherInterface.php
index 44a04855..bdfbb0eb 100644
--- a/src/Dispatcher/DispatcherInterface.php
+++ b/src/Dispatcher/DispatcherInterface.php
@@ -14,8 +14,6 @@
  */
 interface DispatcherInterface
 {
-
-
     /**
      * Dispatches a handle action taking into account the routing parameters
      *
@@ -137,7 +135,7 @@ public function setHandlerSuffix(string $handlerSuffix): void;
      * @param string $moduleName
      * @return void
      */
-    public function setModuleName(string $moduleName): void;
+    public function setModuleName(string $moduleName = null): void;
 
     /**
      * Sets the namespace which the controller belongs to
diff --git a/src/Domain/Payload/Payload.php b/src/Domain/Payload/Payload.php
index c3c7fa6c..589c7c6f 100644
--- a/src/Domain/Payload/Payload.php
+++ b/src/Domain/Payload/Payload.php
@@ -16,7 +16,6 @@
  */
 class Payload implements \Phalcon\Domain\Payload\PayloadInterface
 {
-
     /**
      * Exception if any
      *
@@ -59,6 +58,15 @@ class Payload implements \Phalcon\Domain\Payload\PayloadInterface
      */
     protected $output;
 
+    /**
+     * Gets the potential exception thrown in the domain layer
+     *
+     * @return Throwable|null
+     */
+    public function getException(): ?Throwable
+    {
+    }
+
     /**
      * Extra information
      *
@@ -104,15 +112,6 @@ public function getOutput()
     {
     }
 
-    /**
-     * Gets the potential exception thrown in the domain layer
-     *
-     * @return Throwable|null
-     */
-    public function getException(): ?Throwable
-    {
-    }
-
     /**
      * Sets an exception thrown in the domain
      *
diff --git a/src/Domain/Payload/PayloadFactory.php b/src/Domain/Payload/PayloadFactory.php
index dba30508..247ba2ae 100644
--- a/src/Domain/Payload/PayloadFactory.php
+++ b/src/Domain/Payload/PayloadFactory.php
@@ -14,8 +14,6 @@
  */
 class PayloadFactory
 {
-
-
     /**
      * Instantiate a new object
      *
diff --git a/src/Domain/Payload/PayloadInterface.php b/src/Domain/Payload/PayloadInterface.php
index 05f8ec7b..8139bc2d 100644
--- a/src/Domain/Payload/PayloadInterface.php
+++ b/src/Domain/Payload/PayloadInterface.php
@@ -14,6 +14,4 @@
  */
 interface PayloadInterface extends \Phalcon\Domain\Payload\ReadableInterface, \Phalcon\Domain\Payload\WriteableInterface
 {
-
-
 }
diff --git a/src/Domain/Payload/ReadableInterface.php b/src/Domain/Payload/ReadableInterface.php
index 18903c89..7521e149 100644
--- a/src/Domain/Payload/ReadableInterface.php
+++ b/src/Domain/Payload/ReadableInterface.php
@@ -16,8 +16,6 @@
  */
 interface ReadableInterface
 {
-
-
     /**
      * Gets the potential exception thrown in the domain layer
      *
diff --git a/src/Domain/Payload/WriteableInterface.php b/src/Domain/Payload/WriteableInterface.php
index fb7f3f00..0261a11e 100644
--- a/src/Domain/Payload/WriteableInterface.php
+++ b/src/Domain/Payload/WriteableInterface.php
@@ -16,8 +16,6 @@
  */
 interface WriteableInterface
 {
-
-
     /**
      * Sets an exception produced by the domain layer.
      *
diff --git a/src/Encryption/Crypt/CryptInterface.php b/src/Encryption/Crypt/CryptInterface.php
index 1848400e..beddc4fa 100644
--- a/src/Encryption/Crypt/CryptInterface.php
+++ b/src/Encryption/Crypt/CryptInterface.php
@@ -14,8 +14,6 @@
  */
 interface CryptInterface
 {
-
-
     /**
      * Decrypts a text
      *
diff --git a/src/Encryption/Crypt/Exception/Exception.php b/src/Encryption/Crypt/Exception/Exception.php
index 903e730b..9544e6e4 100644
--- a/src/Encryption/Crypt/Exception/Exception.php
+++ b/src/Encryption/Crypt/Exception/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Encryption/Crypt/Exception/Mismatch.php b/src/Encryption/Crypt/Exception/Mismatch.php
index 0045893f..98f71f86 100644
--- a/src/Encryption/Crypt/Exception/Mismatch.php
+++ b/src/Encryption/Crypt/Exception/Mismatch.php
@@ -14,6 +14,4 @@
  */
 class Mismatch extends \Phalcon\Encryption\Crypt\Exception\Exception
 {
-
-
 }
diff --git a/src/Encryption/Crypt/PadFactory.php b/src/Encryption/Crypt/PadFactory.php
index 0b15bb89..19a1e017 100644
--- a/src/Encryption/Crypt/PadFactory.php
+++ b/src/Encryption/Crypt/PadFactory.php
@@ -21,7 +21,6 @@
  */
 class PadFactory extends AbstractFactory
 {
-
     /**
      * @var string
      */
diff --git a/src/Encryption/Crypt/Padding/Ansi.php b/src/Encryption/Crypt/Padding/Ansi.php
index 70088300..43de11d6 100644
--- a/src/Encryption/Crypt/Padding/Ansi.php
+++ b/src/Encryption/Crypt/Padding/Ansi.php
@@ -16,8 +16,6 @@
  */
 class Ansi implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Crypt/Padding/Iso10126.php b/src/Encryption/Crypt/Padding/Iso10126.php
index 97688e44..5736ddb5 100644
--- a/src/Encryption/Crypt/Padding/Iso10126.php
+++ b/src/Encryption/Crypt/Padding/Iso10126.php
@@ -16,8 +16,6 @@
  */
 class Iso10126 implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param string $input
      * @param int    $blockSize
diff --git a/src/Encryption/Crypt/Padding/IsoIek.php b/src/Encryption/Crypt/Padding/IsoIek.php
index e39a3d89..dcdb16c7 100644
--- a/src/Encryption/Crypt/Padding/IsoIek.php
+++ b/src/Encryption/Crypt/Padding/IsoIek.php
@@ -16,8 +16,6 @@
  */
 class IsoIek implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Crypt/Padding/Noop.php b/src/Encryption/Crypt/Padding/Noop.php
index 43f6783f..9001c9d9 100644
--- a/src/Encryption/Crypt/Padding/Noop.php
+++ b/src/Encryption/Crypt/Padding/Noop.php
@@ -16,8 +16,6 @@
  */
 class Noop implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Crypt/Padding/PadInterface.php b/src/Encryption/Crypt/Padding/PadInterface.php
index f508ea96..41506419 100644
--- a/src/Encryption/Crypt/Padding/PadInterface.php
+++ b/src/Encryption/Crypt/Padding/PadInterface.php
@@ -14,8 +14,6 @@
  */
 interface PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Crypt/Padding/Pkcs7.php b/src/Encryption/Crypt/Padding/Pkcs7.php
index 9127ce96..b2cf9d99 100644
--- a/src/Encryption/Crypt/Padding/Pkcs7.php
+++ b/src/Encryption/Crypt/Padding/Pkcs7.php
@@ -16,8 +16,6 @@
  */
 class Pkcs7 implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Crypt/Padding/Space.php b/src/Encryption/Crypt/Padding/Space.php
index 1b7d6c21..c8167f6f 100644
--- a/src/Encryption/Crypt/Padding/Space.php
+++ b/src/Encryption/Crypt/Padding/Space.php
@@ -16,8 +16,6 @@
  */
 class Space implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Crypt/Padding/Zero.php b/src/Encryption/Crypt/Padding/Zero.php
index 00198539..02ab2cf1 100644
--- a/src/Encryption/Crypt/Padding/Zero.php
+++ b/src/Encryption/Crypt/Padding/Zero.php
@@ -16,8 +16,6 @@
  */
 class Zero implements \Phalcon\Encryption\Crypt\Padding\PadInterface
 {
-
-
     /**
      * @param int $paddingSize
      *
diff --git a/src/Encryption/Security.php b/src/Encryption/Security.php
index 6f51e8c6..70076691 100644
--- a/src/Encryption/Security.php
+++ b/src/Encryption/Security.php
@@ -116,13 +116,6 @@ class Security extends AbstractInjectionAware
      */
     private $localRequest = null;
 
-    /**
-     * @return int
-     */
-    public function getWorkFactor(): int
-    {
-    }
-
     /**
      * Security constructor.
      *
@@ -277,6 +270,13 @@ public function getTokenKey(): ?string
     {
     }
 
+    /**
+     * @return int
+     */
+    public function getWorkFactor(): int
+    {
+    }
+
     /**
      * Creates a password hash using bcrypt with a pseudo random salt
      *
diff --git a/src/Encryption/Security/Exception.php b/src/Encryption/Security/Exception.php
index 7b07e254..26ff21c0 100644
--- a/src/Encryption/Security/Exception.php
+++ b/src/Encryption/Security/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Encryption/Security/JWT/Builder.php b/src/Encryption/Security/JWT/Builder.php
index be8b05d9..a805e01b 100644
--- a/src/Encryption/Security/JWT/Builder.php
+++ b/src/Encryption/Security/JWT/Builder.php
@@ -20,7 +20,9 @@
 use Phalcon\Encryption\Security\JWT\Token\Token;
 
 /**
- * Class Builder
+ * Builder
+ *
+ * The builder offers
  *
  * @property CollectionInterface  $claims
  * @property CollectionInterface  $jose
@@ -31,7 +33,6 @@
  */
 class Builder
 {
-
     /**
      * @var CollectionInterface
      */
diff --git a/src/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.php b/src/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.php
index ab082b5d..3b9a0867 100644
--- a/src/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.php
+++ b/src/Encryption/Security/JWT/Exceptions/UnsupportedAlgorithmException.php
@@ -10,18 +10,10 @@
 namespace Phalcon\Encryption\Security\JWT\Exceptions;
 
 use Exception;
-use Throwable;
 
 /**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
+ * Exception thrown when the algorithm is not supported for JWT
  */
-class UnsupportedAlgorithmException extends Exception implements \Throwable
+class UnsupportedAlgorithmException extends Exception
 {
-
-
 }
diff --git a/src/Encryption/Security/JWT/Exceptions/ValidatorException.php b/src/Encryption/Security/JWT/Exceptions/ValidatorException.php
index 7620b41b..6113ea1b 100644
--- a/src/Encryption/Security/JWT/Exceptions/ValidatorException.php
+++ b/src/Encryption/Security/JWT/Exceptions/ValidatorException.php
@@ -10,18 +10,10 @@
 namespace Phalcon\Encryption\Security\JWT\Exceptions;
 
 use Exception;
-use Throwable;
 
 /**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
+ * Exception thrown when the validation does not pass for JWT
  */
-class ValidatorException extends Exception implements \Throwable
+class ValidatorException extends Exception
 {
-
-
 }
diff --git a/src/Encryption/Security/JWT/Signer/AbstractSigner.php b/src/Encryption/Security/JWT/Signer/AbstractSigner.php
index f097e682..6f6e74db 100644
--- a/src/Encryption/Security/JWT/Signer/AbstractSigner.php
+++ b/src/Encryption/Security/JWT/Signer/AbstractSigner.php
@@ -10,17 +10,14 @@
 namespace Phalcon\Encryption\Security\JWT\Signer;
 
 /**
- * Class AbstractSigner
- *
- * @property string $algo
+ * Abstract class helping with the signer classes
  */
 abstract class AbstractSigner implements \Phalcon\Encryption\Security\JWT\Signer\SignerInterface
 {
-
     /**
      * @var string
      */
-    protected $algorithm;
+    protected $algorithm = '';
 
     /**
      * @return string
diff --git a/src/Encryption/Security/JWT/Signer/Hmac.php b/src/Encryption/Security/JWT/Signer/Hmac.php
index bd391dfe..86444bcb 100644
--- a/src/Encryption/Security/JWT/Signer/Hmac.php
+++ b/src/Encryption/Security/JWT/Signer/Hmac.php
@@ -12,12 +12,10 @@
 use Phalcon\Encryption\Security\JWT\Exceptions\UnsupportedAlgorithmException;
 
 /**
- * Class Hmac
+ * HMAC signing class
  */
 class Hmac extends \Phalcon\Encryption\Security\JWT\Signer\AbstractSigner
 {
-
-
     /**
      * Hmac constructor.
      *
diff --git a/src/Encryption/Security/JWT/Signer/None.php b/src/Encryption/Security/JWT/Signer/None.php
index 409050a3..4a1ed334 100644
--- a/src/Encryption/Security/JWT/Signer/None.php
+++ b/src/Encryption/Security/JWT/Signer/None.php
@@ -10,12 +10,10 @@
 namespace Phalcon\Encryption\Security\JWT\Signer;
 
 /**
- * Class None
+ * No signing class
  */
 class None implements \Phalcon\Encryption\Security\JWT\Signer\SignerInterface
 {
-
-
     /**
      * Return the value that is used for the "alg" header
      *
diff --git a/src/Encryption/Security/JWT/Signer/SignerInterface.php b/src/Encryption/Security/JWT/Signer/SignerInterface.php
index f89090a0..8019de8a 100644
--- a/src/Encryption/Security/JWT/Signer/SignerInterface.php
+++ b/src/Encryption/Security/JWT/Signer/SignerInterface.php
@@ -10,17 +10,10 @@
 namespace Phalcon\Encryption\Security\JWT\Signer;
 
 /**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
+ * Interface for JWT Signer classes
  */
 interface SignerInterface
 {
-
-
     /**
      * Return the value that is used for the "alg" header
      *
diff --git a/src/Encryption/Security/JWT/Token/AbstractItem.php b/src/Encryption/Security/JWT/Token/AbstractItem.php
index 521ca5a8..45df2261 100644
--- a/src/Encryption/Security/JWT/Token/AbstractItem.php
+++ b/src/Encryption/Security/JWT/Token/AbstractItem.php
@@ -10,13 +10,12 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class AbstractItem
+ * Abstract helper class for Tokens
  *
  * @property array $data
  */
 abstract class AbstractItem
 {
-
     /**
      * @var array
      */
diff --git a/src/Encryption/Security/JWT/Token/Enum.php b/src/Encryption/Security/JWT/Token/Enum.php
index f62a157d..07030f7b 100644
--- a/src/Encryption/Security/JWT/Token/Enum.php
+++ b/src/Encryption/Security/JWT/Token/Enum.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class Enum
+ * Constants for Tokens. It offers constants for Headers as well as Claims
  *
  * @link https://tools.ietf.org/html/rfc7519
  */
diff --git a/src/Encryption/Security/JWT/Token/Item.php b/src/Encryption/Security/JWT/Token/Item.php
index bf0e26d7..6538eacd 100644
--- a/src/Encryption/Security/JWT/Token/Item.php
+++ b/src/Encryption/Security/JWT/Token/Item.php
@@ -10,12 +10,10 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class Item
+ * Storage class for a Token Item
  */
 class Item extends \Phalcon\Encryption\Security\JWT\Token\AbstractItem
 {
-
-
     /**
      * Item constructor.
      *
diff --git a/src/Encryption/Security/JWT/Token/Parser.php b/src/Encryption/Security/JWT/Token/Parser.php
index b07d8209..cd609636 100644
--- a/src/Encryption/Security/JWT/Token/Parser.php
+++ b/src/Encryption/Security/JWT/Token/Parser.php
@@ -12,12 +12,14 @@
 use InvalidArgumentException;
 
 /**
- * Class Parser
+ * Token Parser class.
+ *
+ * It parses a token by validating if it is formed properly and splits it into
+ * three parts. The headers are decoded, then the claims and finally the
+ * signature. It returns a token object populated with the decoded information.
  */
 class Parser
 {
-
-
     /**
      * Parse a token and return it
      *
diff --git a/src/Encryption/Security/JWT/Token/Signature.php b/src/Encryption/Security/JWT/Token/Signature.php
index 708a6ec9..c609d3cc 100644
--- a/src/Encryption/Security/JWT/Token/Signature.php
+++ b/src/Encryption/Security/JWT/Token/Signature.php
@@ -10,12 +10,10 @@
 namespace Phalcon\Encryption\Security\JWT\Token;
 
 /**
- * Class Item
+ * Signature class containing the encoded data and the hash.
  */
 class Signature extends \Phalcon\Encryption\Security\JWT\Token\AbstractItem
 {
-
-
     /**
      * Signature constructor.
      *
diff --git a/src/Encryption/Security/JWT/Token/Token.php b/src/Encryption/Security/JWT/Token/Token.php
index 515809c1..fe148ca2 100644
--- a/src/Encryption/Security/JWT/Token/Token.php
+++ b/src/Encryption/Security/JWT/Token/Token.php
@@ -9,8 +9,14 @@
  */
 namespace Phalcon\Encryption\Security\JWT\Token;
 
+use Phalcon\Encryption\Security\JWT\Signer\SignerInterface;
+use Phalcon\Encryption\Security\JWT\Validator;
+
 /**
- * Class Token
+ * Token Class.
+ *
+ * A container for Token related data. It stores the claims, headers, signature
+ * and payload. It also calculates and returns the token string.
  *
  * @property Item      $claims
  * @property Item      $headers
@@ -20,7 +26,6 @@
  */
 class Token
 {
-
     /**
      * @var Item
      */
@@ -37,41 +42,41 @@ class Token
     private $signature;
 
     /**
-     * @return mixed
+     * Token constructor.
+     *
+     * @param Item      $headers
+     * @param Item      $claims
+     * @param Signature $signature
      */
-    public function getClaims()
+    public function __construct(Item $headers, Item $claims, Signature $signature)
     {
     }
 
     /**
-     * @return mixed
+     * @return Item
      */
-    public function getHeaders()
+    public function getClaims(): Item
     {
     }
 
     /**
-     * @return mixed
+     * @return Item
      */
-    public function getSignature()
+    public function getHeaders(): Item
     {
     }
 
     /**
-     * Token constructor.
-     *
-     * @param Item      $headers
-     * @param Item      $claims
-     * @param Signature $signature
+     * @return string
      */
-    public function __construct(Item $headers, Item $claims, Signature $signature)
+    public function getPayload(): string
     {
     }
 
     /**
-     * @return string
+     * @return Signature
      */
-    public function getPayload(): string
+    public function getSignature(): Signature
     {
     }
 
@@ -81,4 +86,25 @@ public function getPayload(): string
     public function getToken(): string
     {
     }
+
+    /**
+     * @param Validator $validator
+     *
+     * @return array
+     */
+    public function validate(\Phalcon\Encryption\Security\JWT\Validator $validator): array
+    {
+    }
+
+    /**
+     * Verify the signature
+     *
+     * @param SignerInterface $signer
+     * @param string          $key
+     *
+     * @return bool
+     */
+    public function verify(\Phalcon\Encryption\Security\JWT\Signer\SignerInterface $signer, string $key): bool
+    {
+    }
 }
diff --git a/src/Encryption/Security/JWT/Validator.php b/src/Encryption/Security/JWT/Validator.php
index b24d06e0..68e5b649 100644
--- a/src/Encryption/Security/JWT/Validator.php
+++ b/src/Encryption/Security/JWT/Validator.php
@@ -22,6 +22,10 @@
  */
 class Validator
 {
+    /**
+     * @var array
+     */
+    private $errors = [];
 
     /**
      * @var int
@@ -43,6 +47,13 @@ public function __construct(\Phalcon\Encryption\Security\JWT\Token\Token $token,
     {
     }
 
+    /**
+     * @return array
+     */
+    public function getErrors(): array
+    {
+    }
+
     /**
      * @param Token $token
      *
@@ -53,12 +64,12 @@ public function setToken(\Phalcon\Encryption\Security\JWT\Token\Token $token): V
     }
 
     /**
-     * @param string $audience
+     * @param string|array $audience
      *
      * @return Validator
      * @throws ValidatorException
      */
-    public function validateAudience(string $audience): Validator
+    public function validateAudience($audience): Validator
     {
     }
 
diff --git a/src/Encryption/Security/Random.php b/src/Encryption/Security/Random.php
index 5c2005c4..44078266 100644
--- a/src/Encryption/Security/Random.php
+++ b/src/Encryption/Security/Random.php
@@ -76,8 +76,6 @@
  */
 class Random
 {
-
-
     /**
      * Generates a random base58 string
      *
diff --git a/src/Events/AbstractEventsAware.php b/src/Events/AbstractEventsAware.php
index 6ecfb7b9..72d15a8e 100644
--- a/src/Events/AbstractEventsAware.php
+++ b/src/Events/AbstractEventsAware.php
@@ -18,7 +18,6 @@
  */
 abstract class AbstractEventsAware
 {
-
     /**
      * @var ManagerInterface|null
      */
diff --git a/src/Events/Event.php b/src/Events/Event.php
index 2966d672..696cad71 100644
--- a/src/Events/Event.php
+++ b/src/Events/Event.php
@@ -24,7 +24,6 @@
  */
 class Event implements \Phalcon\Events\EventInterface
 {
-
     /**
      * Is event cancelable?
      *
@@ -44,7 +43,7 @@ class Event implements \Phalcon\Events\EventInterface
      *
      * @var object|null
      */
-    protected $source;
+    protected $source = null;
 
     /**
      * Is event propagation stopped?
@@ -61,8 +60,18 @@ class Event implements \Phalcon\Events\EventInterface
     protected $type;
 
     /**
-     * Event data
+     * Phalcon\Events\Event constructor
      *
+     * @param object $source
+     * @param string $type
+     * @param mixed $data
+     * @param bool $cancelable
+     */
+    public function __construct(string $type, $source = null, $data = null, bool $cancelable = true)
+    {
+    }
+
+    /**
      * @return mixed
      */
     public function getData()
@@ -70,8 +79,6 @@ public function getData()
     }
 
     /**
-     * Event source
-     *
      * @return object|null
      */
     public function getSource()
@@ -79,26 +86,12 @@ public function getSource()
     }
 
     /**
-     * Event type
-     *
      * @return string
      */
     public function getType(): string
     {
     }
 
-    /**
-     * Phalcon\Events\Event constructor
-     *
-     * @param object $source
-     * @param string $type
-     * @param mixed $data
-     * @param bool $cancelable
-     */
-    public function __construct(string $type, $source = null, $data = null, bool $cancelable = true)
-    {
-    }
-
     /**
      * Check whether the event is cancelable.
      *
diff --git a/src/Events/EventInterface.php b/src/Events/EventInterface.php
index 67f314fa..46826ae0 100644
--- a/src/Events/EventInterface.php
+++ b/src/Events/EventInterface.php
@@ -14,8 +14,6 @@
  */
 interface EventInterface
 {
-
-
     /**
      * Gets event data
      *
diff --git a/src/Events/EventsAwareInterface.php b/src/Events/EventsAwareInterface.php
index 25031892..94fcc701 100644
--- a/src/Events/EventsAwareInterface.php
+++ b/src/Events/EventsAwareInterface.php
@@ -15,8 +15,6 @@
  */
 interface EventsAwareInterface
 {
-
-
     /**
      * Returns the internal event manager
      *
diff --git a/src/Events/Exception.php b/src/Events/Exception.php
index 789a5507..6208ae74 100644
--- a/src/Events/Exception.php
+++ b/src/Events/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Events/ManagerInterface.php b/src/Events/ManagerInterface.php
index bd014aa3..0ef99c7a 100644
--- a/src/Events/ManagerInterface.php
+++ b/src/Events/ManagerInterface.php
@@ -14,8 +14,6 @@
  */
 interface ManagerInterface
 {
-
-
     /**
      * Attach a listener to the events manager
      *
diff --git a/src/Factory/AbstractConfigFactory.php b/src/Factory/AbstractConfigFactory.php
index 50e275e9..03b1147c 100644
--- a/src/Factory/AbstractConfigFactory.php
+++ b/src/Factory/AbstractConfigFactory.php
@@ -21,8 +21,6 @@
  */
 abstract class AbstractConfigFactory
 {
-
-
     /**
      * Checks the config if it is a valid object
      *
diff --git a/src/Factory/AbstractFactory.php b/src/Factory/AbstractFactory.php
index 713bd527..c7cb8b99 100644
--- a/src/Factory/AbstractFactory.php
+++ b/src/Factory/AbstractFactory.php
@@ -21,7 +21,6 @@
  */
 abstract class AbstractFactory extends \Phalcon\Factory\AbstractConfigFactory
 {
-
     /**
      * @var array
      */
diff --git a/src/Factory/Exception.php b/src/Factory/Exception.php
index 8f16c189..099060ae 100644
--- a/src/Factory/Exception.php
+++ b/src/Factory/Exception.php
@@ -19,6 +19,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Filter/Exception.php b/src/Filter/Exception.php
index 5f505950..874f8725 100644
--- a/src/Filter/Exception.php
+++ b/src/Filter/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Filter/Filter.php b/src/Filter/Filter.php
index 5299c341..094cbcdb 100644
--- a/src/Filter/Filter.php
+++ b/src/Filter/Filter.php
@@ -27,6 +27,7 @@
  * @method special(string $input): string
  * @method specialfull(string $input): string
  * @method string(string $input): string
+ * @method stringlegacy(mixed $input): string
  * @method striptags(string $input): string
  * @method trim(string $input): string
  * @method upper(string $input): string
@@ -69,6 +70,8 @@ class Filter implements \Phalcon\Filter\FilterInterface
 
     const FILTER_STRING = 'string';
 
+    const FILTER_STRING_LEGACY = 'stringlegacy';
+
     const FILTER_STRIPTAGS = 'striptags';
 
     const FILTER_TRIM = 'trim';
diff --git a/src/Filter/FilterFactory.php b/src/Filter/FilterFactory.php
index d7092ed3..1f685c69 100644
--- a/src/Filter/FilterFactory.php
+++ b/src/Filter/FilterFactory.php
@@ -18,8 +18,6 @@
  */
 class FilterFactory
 {
-
-
     /**
      * Returns a Locator object with all the helpers defined in anonymous
      * functions
diff --git a/src/Filter/FilterInterface.php b/src/Filter/FilterInterface.php
index 04b2bd44..53036b34 100644
--- a/src/Filter/FilterInterface.php
+++ b/src/Filter/FilterInterface.php
@@ -14,8 +14,6 @@
  */
 interface FilterInterface
 {
-
-
     /**
      * Sanitizes a value with a specified single or set of sanitizers
      *
diff --git a/src/Filter/Sanitize/AbsInt.php b/src/Filter/Sanitize/AbsInt.php
index 3c243ca1..6c9e0068 100644
--- a/src/Filter/Sanitize/AbsInt.php
+++ b/src/Filter/Sanitize/AbsInt.php
@@ -16,8 +16,6 @@
  */
 class AbsInt
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Alnum.php b/src/Filter/Sanitize/Alnum.php
index 5f6ed673..425c88bd 100644
--- a/src/Filter/Sanitize/Alnum.php
+++ b/src/Filter/Sanitize/Alnum.php
@@ -16,8 +16,6 @@
  */
 class Alnum
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Alpha.php b/src/Filter/Sanitize/Alpha.php
index 708d6739..61e10edd 100644
--- a/src/Filter/Sanitize/Alpha.php
+++ b/src/Filter/Sanitize/Alpha.php
@@ -16,8 +16,6 @@
  */
 class Alpha
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/BoolVal.php b/src/Filter/Sanitize/BoolVal.php
index 42f13719..f200548d 100644
--- a/src/Filter/Sanitize/BoolVal.php
+++ b/src/Filter/Sanitize/BoolVal.php
@@ -16,8 +16,6 @@
  */
 class BoolVal
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Email.php b/src/Filter/Sanitize/Email.php
index 8e18e22a..b3910d0a 100644
--- a/src/Filter/Sanitize/Email.php
+++ b/src/Filter/Sanitize/Email.php
@@ -16,8 +16,6 @@
  */
 class Email
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/FloatVal.php b/src/Filter/Sanitize/FloatVal.php
index ba56b230..c274616f 100644
--- a/src/Filter/Sanitize/FloatVal.php
+++ b/src/Filter/Sanitize/FloatVal.php
@@ -16,8 +16,6 @@
  */
 class FloatVal
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/IntVal.php b/src/Filter/Sanitize/IntVal.php
index f1319e14..b2d02092 100644
--- a/src/Filter/Sanitize/IntVal.php
+++ b/src/Filter/Sanitize/IntVal.php
@@ -16,8 +16,6 @@
  */
 class IntVal
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Lower.php b/src/Filter/Sanitize/Lower.php
index 736c36e9..ca49ef50 100644
--- a/src/Filter/Sanitize/Lower.php
+++ b/src/Filter/Sanitize/Lower.php
@@ -16,8 +16,6 @@
  */
 class Lower
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/LowerFirst.php b/src/Filter/Sanitize/LowerFirst.php
index 9578464d..3468f371 100644
--- a/src/Filter/Sanitize/LowerFirst.php
+++ b/src/Filter/Sanitize/LowerFirst.php
@@ -16,8 +16,6 @@
  */
 class LowerFirst
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Regex.php b/src/Filter/Sanitize/Regex.php
index 259eecbe..4af35034 100644
--- a/src/Filter/Sanitize/Regex.php
+++ b/src/Filter/Sanitize/Regex.php
@@ -16,8 +16,6 @@
  */
 class Regex
 {
-
-
     /**
      * @param mixed $input
      * @param mixed $pattern
diff --git a/src/Filter/Sanitize/Remove.php b/src/Filter/Sanitize/Remove.php
index 09c48d02..02d7d851 100644
--- a/src/Filter/Sanitize/Remove.php
+++ b/src/Filter/Sanitize/Remove.php
@@ -16,8 +16,6 @@
  */
 class Remove
 {
-
-
     /**
      * @param mixed $input
      * @param mixed $replace
diff --git a/src/Filter/Sanitize/Replace.php b/src/Filter/Sanitize/Replace.php
index 5994820b..571bfe09 100644
--- a/src/Filter/Sanitize/Replace.php
+++ b/src/Filter/Sanitize/Replace.php
@@ -16,8 +16,6 @@
  */
 class Replace
 {
-
-
     /**
      * @param mixed $input
      * @param mixed $source
diff --git a/src/Filter/Sanitize/Special.php b/src/Filter/Sanitize/Special.php
index 47eb375d..9f9f5030 100644
--- a/src/Filter/Sanitize/Special.php
+++ b/src/Filter/Sanitize/Special.php
@@ -16,8 +16,6 @@
  */
 class Special
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/SpecialFull.php b/src/Filter/Sanitize/SpecialFull.php
index 6b339b68..cc12ecf1 100644
--- a/src/Filter/Sanitize/SpecialFull.php
+++ b/src/Filter/Sanitize/SpecialFull.php
@@ -16,8 +16,6 @@
  */
 class SpecialFull
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/StringVal.php b/src/Filter/Sanitize/StringVal.php
index d56f257f..e9ce398c 100644
--- a/src/Filter/Sanitize/StringVal.php
+++ b/src/Filter/Sanitize/StringVal.php
@@ -14,14 +14,12 @@
  */
 class StringVal
 {
-
-
     /**
-     * @param mixed $input The text to sanitize
+     * @param string $input The text to sanitize
      *
-     * @return string|false
+     * @return string
      */
-    public function __invoke($input)
+    public function __invoke(string $input): string
     {
     }
 }
diff --git a/src/Filter/Sanitize/StringValLegacy.php b/src/Filter/Sanitize/StringValLegacy.php
new file mode 100644
index 00000000..01332bef
--- /dev/null
+++ b/src/Filter/Sanitize/StringValLegacy.php
@@ -0,0 +1,28 @@
+<?php
+
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+namespace Phalcon\Filter\Sanitize;
+
+/**
+ * Sanitizes a value to string using `filter_var()`. The filter provides
+ * backwards compatibility with versions prior to v5. For PHP higher or equal to
+ * 8.1, the filter will remain the string unchanged. If anything other than a
+ * string is passed, the method will return false
+ */
+class StringValLegacy
+{
+    /**
+     * @param string $input The text to sanitize
+     *
+     * @return string|false
+     */
+    public function __invoke($input)
+    {
+    }
+}
diff --git a/src/Filter/Sanitize/Striptags.php b/src/Filter/Sanitize/Striptags.php
index 9fb37ccc..30bec9fe 100644
--- a/src/Filter/Sanitize/Striptags.php
+++ b/src/Filter/Sanitize/Striptags.php
@@ -16,8 +16,6 @@
  */
 class Striptags
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Trim.php b/src/Filter/Sanitize/Trim.php
index a88a3176..78a07be5 100644
--- a/src/Filter/Sanitize/Trim.php
+++ b/src/Filter/Sanitize/Trim.php
@@ -16,8 +16,6 @@
  */
 class Trim
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Upper.php b/src/Filter/Sanitize/Upper.php
index 59b33974..bad762ca 100644
--- a/src/Filter/Sanitize/Upper.php
+++ b/src/Filter/Sanitize/Upper.php
@@ -16,8 +16,6 @@
  */
 class Upper
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/UpperFirst.php b/src/Filter/Sanitize/UpperFirst.php
index de9fe0c1..a62da89f 100644
--- a/src/Filter/Sanitize/UpperFirst.php
+++ b/src/Filter/Sanitize/UpperFirst.php
@@ -16,8 +16,6 @@
  */
 class UpperFirst
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/UpperWords.php b/src/Filter/Sanitize/UpperWords.php
index f657907e..eca1f2e3 100644
--- a/src/Filter/Sanitize/UpperWords.php
+++ b/src/Filter/Sanitize/UpperWords.php
@@ -16,8 +16,6 @@
  */
 class UpperWords
 {
-
-
     /**
      * @param string $input The text to sanitize
      *
diff --git a/src/Filter/Sanitize/Url.php b/src/Filter/Sanitize/Url.php
index a9e774fe..1a115ca8 100644
--- a/src/Filter/Sanitize/Url.php
+++ b/src/Filter/Sanitize/Url.php
@@ -16,8 +16,6 @@
  */
 class Url
 {
-
-
     /**
      * @param mixed $input The text to sanitize
      *
diff --git a/src/Filter/Validation.php b/src/Filter/Validation.php
index 4a6b2f9a..8ff283f4 100644
--- a/src/Filter/Validation.php
+++ b/src/Filter/Validation.php
@@ -25,7 +25,6 @@
  */
 class Validation extends Injectable implements \Phalcon\Filter\Validation\ValidationInterface
 {
-
     /**
      * @var array
      */
@@ -70,22 +69,6 @@ class Validation extends Injectable implements \Phalcon\Filter\Validation\Valida
      */
     protected $values = [];
 
-    /**
-     * @return mixed
-     */
-    public function getData()
-    {
-    }
-
-    /**
-     * List of validators
-     *
-     * @param array $validators
-     */
-    public function setValidators(array $validators)
-    {
-    }
-
     /**
      * Phalcon\Filter\Validation constructor
      *
@@ -129,6 +112,13 @@ public function bind($entity, $data): ValidationInterface
     {
     }
 
+    /**
+     * @return mixed
+     */
+    public function getData()
+    {
+    }
+
     /**
      * Returns the bound entity
      *
@@ -262,6 +252,14 @@ public function setLabels(array $labels): void
     {
     }
 
+    /**
+     * @param array $validators
+     * @return Validation
+     */
+    public function setValidators(array $validators): Validation
+    {
+    }
+
     /**
      * Validate a set of data according to a set of rules
      *
diff --git a/src/Filter/Validation/AbstractCombinedFieldsValidator.php b/src/Filter/Validation/AbstractCombinedFieldsValidator.php
index 7e43ac39..48a74c36 100644
--- a/src/Filter/Validation/AbstractCombinedFieldsValidator.php
+++ b/src/Filter/Validation/AbstractCombinedFieldsValidator.php
@@ -14,6 +14,4 @@
  */
 abstract class AbstractCombinedFieldsValidator extends \Phalcon\Filter\Validation\AbstractValidator
 {
-
-
 }
diff --git a/src/Filter/Validation/AbstractValidator.php b/src/Filter/Validation/AbstractValidator.php
index d069acb6..c25fe6cb 100644
--- a/src/Filter/Validation/AbstractValidator.php
+++ b/src/Filter/Validation/AbstractValidator.php
@@ -18,7 +18,6 @@
  */
 abstract class AbstractValidator implements \Phalcon\Filter\Validation\ValidatorInterface
 {
-
     /**
      * Message template
      *
diff --git a/src/Filter/Validation/AbstractValidatorComposite.php b/src/Filter/Validation/AbstractValidatorComposite.php
index 09ea11e0..ba4d7949 100644
--- a/src/Filter/Validation/AbstractValidatorComposite.php
+++ b/src/Filter/Validation/AbstractValidatorComposite.php
@@ -16,7 +16,6 @@
  */
 abstract class AbstractValidatorComposite extends \Phalcon\Filter\Validation\AbstractValidator implements \Phalcon\Filter\Validation\ValidatorCompositeInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Filter/Validation/Exception.php b/src/Filter/Validation/Exception.php
index fad2c65a..363b6954 100644
--- a/src/Filter/Validation/Exception.php
+++ b/src/Filter/Validation/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Filter/Validation/ValidationInterface.php b/src/Filter/Validation/ValidationInterface.php
index b4d8d37c..9bbf9e15 100644
--- a/src/Filter/Validation/ValidationInterface.php
+++ b/src/Filter/Validation/ValidationInterface.php
@@ -18,8 +18,6 @@
  */
 interface ValidationInterface
 {
-
-
     /**
      * Adds a validator to a field
      *
diff --git a/src/Filter/Validation/Validator/Alnum.php b/src/Filter/Validation/Validator/Alnum.php
index 4db9f760..a1651af4 100644
--- a/src/Filter/Validation/Validator/Alnum.php
+++ b/src/Filter/Validation/Validator/Alnum.php
@@ -48,7 +48,6 @@
  */
 class Alnum extends AbstractValidator
 {
-
     protected $template = 'Field :field must contain only letters and numbers';
 
     /**
diff --git a/src/Filter/Validation/Validator/Alpha.php b/src/Filter/Validation/Validator/Alpha.php
index ddfab168..433c9118 100644
--- a/src/Filter/Validation/Validator/Alpha.php
+++ b/src/Filter/Validation/Validator/Alpha.php
@@ -49,7 +49,6 @@
  */
 class Alpha extends AbstractValidator
 {
-
     protected $template = 'Field :field must contain only letters';
 
     /**
diff --git a/src/Filter/Validation/Validator/Between.php b/src/Filter/Validation/Validator/Between.php
index 223813b0..5e155628 100644
--- a/src/Filter/Validation/Validator/Between.php
+++ b/src/Filter/Validation/Validator/Between.php
@@ -60,7 +60,6 @@
  */
 class Between extends AbstractValidator
 {
-
     protected $template = 'Field :field must be within the range of :min to :max';
 
     /**
diff --git a/src/Filter/Validation/Validator/Callback.php b/src/Filter/Validation/Validator/Callback.php
index 19743053..eb83d434 100644
--- a/src/Filter/Validation/Validator/Callback.php
+++ b/src/Filter/Validation/Validator/Callback.php
@@ -60,7 +60,6 @@
  */
 class Callback extends AbstractValidator
 {
-
     protected $template = 'Field :field must match the callback function';
 
     /**
diff --git a/src/Filter/Validation/Validator/Confirmation.php b/src/Filter/Validation/Validator/Confirmation.php
index 88109fcd..01b556df 100644
--- a/src/Filter/Validation/Validator/Confirmation.php
+++ b/src/Filter/Validation/Validator/Confirmation.php
@@ -55,7 +55,6 @@
  */
 class Confirmation extends AbstractValidator
 {
-
     protected $template = 'Field :field must be the same as :with';
 
     /**
diff --git a/src/Filter/Validation/Validator/CreditCard.php b/src/Filter/Validation/Validator/CreditCard.php
index 63ff7e93..9d91c50f 100644
--- a/src/Filter/Validation/Validator/CreditCard.php
+++ b/src/Filter/Validation/Validator/CreditCard.php
@@ -49,7 +49,6 @@
  */
 class CreditCard extends AbstractValidator
 {
-
     protected $template = 'Field :field is not valid for a credit card number';
 
     /**
diff --git a/src/Filter/Validation/Validator/Date.php b/src/Filter/Validation/Validator/Date.php
index 4751aec7..a12493b2 100644
--- a/src/Filter/Validation/Validator/Date.php
+++ b/src/Filter/Validation/Validator/Date.php
@@ -55,7 +55,6 @@
  */
 class Date extends AbstractValidator
 {
-
     protected $template = 'Field :field is not a valid date';
 
     /**
diff --git a/src/Filter/Validation/Validator/Digit.php b/src/Filter/Validation/Validator/Digit.php
index 516bc482..91ee1d48 100644
--- a/src/Filter/Validation/Validator/Digit.php
+++ b/src/Filter/Validation/Validator/Digit.php
@@ -49,7 +49,6 @@
  */
 class Digit extends AbstractValidator
 {
-
     protected $template = 'Field :field must be numeric';
 
     /**
diff --git a/src/Filter/Validation/Validator/Email.php b/src/Filter/Validation/Validator/Email.php
index cc70ae16..3d1fbcca 100644
--- a/src/Filter/Validation/Validator/Email.php
+++ b/src/Filter/Validation/Validator/Email.php
@@ -49,7 +49,6 @@
  */
 class Email extends AbstractValidator
 {
-
     protected $template = 'Field :field must be an email address';
 
     /**
diff --git a/src/Filter/Validation/Validator/Exception.php b/src/Filter/Validation/Validator/Exception.php
index 803c8444..68a568c4 100644
--- a/src/Filter/Validation/Validator/Exception.php
+++ b/src/Filter/Validation/Validator/Exception.php
@@ -15,6 +15,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Filter/Validation/Validator/ExclusionIn.php b/src/Filter/Validation/Validator/ExclusionIn.php
index 10299c15..98d36001 100644
--- a/src/Filter/Validation/Validator/ExclusionIn.php
+++ b/src/Filter/Validation/Validator/ExclusionIn.php
@@ -61,7 +61,6 @@
  */
 class ExclusionIn extends AbstractValidator
 {
-
     protected $template = 'Field :field must not be a part of list: :domain';
 
     /**
diff --git a/src/Filter/Validation/Validator/File.php b/src/Filter/Validation/Validator/File.php
index 73dce744..dce30a72 100644
--- a/src/Filter/Validation/Validator/File.php
+++ b/src/Filter/Validation/Validator/File.php
@@ -93,8 +93,6 @@
  */
 class File extends AbstractValidatorComposite
 {
-
-
     /**
      * Constructor
      *
diff --git a/src/Filter/Validation/Validator/File/AbstractFile.php b/src/Filter/Validation/Validator/File/AbstractFile.php
index db4791b7..8abc1070 100644
--- a/src/Filter/Validation/Validator/File/AbstractFile.php
+++ b/src/Filter/Validation/Validator/File/AbstractFile.php
@@ -54,7 +54,6 @@
  */
 abstract class AbstractFile extends AbstractValidator
 {
-
     /**
      * Empty is empty
      *
@@ -77,121 +76,127 @@ abstract class AbstractFile extends AbstractValidator
     protected $messageValid = 'Field :field is not valid';
 
     /**
-     * Empty is empty
+     * Check upload
      *
-     * @return string
+     * @param Validation $validation
+     * @param mixed $field
+     * @return bool
      */
-    public function getMessageFileEmpty(): string
+    public function checkUpload(\Phalcon\Filter\Validation $validation, $field): bool
     {
     }
 
     /**
-     * Empty is empty
+     * Check if upload is empty
      *
-     * @param string $messageFileEmpty
+     * @param Validation $validation
+     * @param mixed $field
+     * @return boolean
      */
-    public function setMessageFileEmpty(string $messageFileEmpty)
+    public function checkUploadIsEmpty(\Phalcon\Filter\Validation $validation, $field): bool
     {
     }
 
     /**
-     * File exceeds the file size set in PHP configuration
+     * Check if upload is valid
      *
-     * @return string
+     * @param Validation $validation
+     * @param mixed $field
+     * @return boolean
      */
-    public function getMessageIniSize(): string
+    public function checkUploadIsValid(\Phalcon\Filter\Validation $validation, $field): bool
     {
     }
 
     /**
-     * File exceeds the file size set in PHP configuration
+     * Check if uploaded file is larger than PHP allowed size
      *
-     * @param string $messageIniSize
+     * @param Validation $validation
+     * @param mixed $field
+     * @return boolean
      */
-    public function setMessageIniSize(string $messageIniSize)
+    public function checkUploadMaxSize(\Phalcon\Filter\Validation $validation, $field): bool
     {
     }
 
     /**
-     * File is not valid
+     * Convert a string like "2.5MB" in bytes
      *
-     * @return string
+     * @param string $size
+     * @return float
      */
-    public function getMessageValid(): string
+    public function getFileSizeInBytes(string $size): float
     {
     }
 
     /**
-     * File is not valid
+     * Empty is empty
      *
-     * @param string $messageValid
+     * @return string
      */
-    public function setMessageValid(string $messageValid)
+    public function getMessageFileEmpty(): string
     {
     }
 
     /**
-     * Check upload
+     * File exceeds the file size set in PHP configuration
      *
-     * @param Validation $validation
-     * @param mixed $field
-     * @return bool
+     * @return string
      */
-    public function checkUpload(\Phalcon\Filter\Validation $validation, $field): bool
+    public function getMessageIniSize(): string
     {
     }
 
     /**
-     * Check if upload is empty
+     * File is not valid
      *
-     * @param Validation $validation
-     * @param mixed $field
-     * @return boolean
+     * @return string
      */
-    public function checkUploadIsEmpty(\Phalcon\Filter\Validation $validation, $field): bool
+    public function getMessageValid(): string
     {
     }
 
     /**
-     * Check if upload is valid
+     * Check on empty
      *
      * @param Validation $validation
-     * @param mixed $field
-     * @return boolean
+     * @param string $field
+     * @return bool
      */
-    public function checkUploadIsValid(\Phalcon\Filter\Validation $validation, $field): bool
+    public function isAllowEmpty(\Phalcon\Filter\Validation $validation, string $field): bool
     {
     }
 
     /**
-     * Check if uploaded file is larger than PHP allowed size
+     * Empty is empty
      *
-     * @param Validation $validation
-     * @param mixed $field
-     * @return boolean
+     * @param string $message
+     *
+     * @return void
      */
-    public function checkUploadMaxSize(\Phalcon\Filter\Validation $validation, $field): bool
+    public function setMessageFileEmpty(string $message): void
     {
     }
 
     /**
-     * Convert a string like "2.5MB" in bytes
+     * File exceeds the file size set in PHP configuration
      *
-     * @param string $size
-     * @return float
+     * @param string $message
+     *
+     * @return void
      */
-    public function getFileSizeInBytes(string $size): float
+    public function setMessageIniSize(string $message): void
     {
     }
 
     /**
-     * Check on empty
+     * File is not valid
      *
-     * @param Validation $validation
-     * @param string $field
-     * @return bool
+     * @param string $message
+     *
+     * @return void
      */
-    public function isAllowEmpty(\Phalcon\Filter\Validation $validation, string $field): bool
+    public function setMessageValid(string $message): void
     {
     }
 
diff --git a/src/Filter/Validation/Validator/File/MimeType.php b/src/Filter/Validation/Validator/File/MimeType.php
index da9fb26c..beafa328 100644
--- a/src/Filter/Validation/Validator/File/MimeType.php
+++ b/src/Filter/Validation/Validator/File/MimeType.php
@@ -63,7 +63,6 @@
  */
 class MimeType extends \Phalcon\Filter\Validation\Validator\File\AbstractFile
 {
-
     protected $template = 'File :field must be of type: :types';
 
     /**
diff --git a/src/Filter/Validation/Validator/File/Resolution/Equal.php b/src/Filter/Validation/Validator/File/Resolution/Equal.php
index 5263715e..28cd20f0 100644
--- a/src/Filter/Validation/Validator/File/Resolution/Equal.php
+++ b/src/Filter/Validation/Validator/File/Resolution/Equal.php
@@ -54,7 +54,6 @@
  */
 class Equal extends AbstractFile
 {
-
     protected $template = 'The resolution of the field :field has to be equal :resolution';
 
     /**
diff --git a/src/Filter/Validation/Validator/File/Resolution/Max.php b/src/Filter/Validation/Validator/File/Resolution/Max.php
index 015795f9..e0f71278 100644
--- a/src/Filter/Validation/Validator/File/Resolution/Max.php
+++ b/src/Filter/Validation/Validator/File/Resolution/Max.php
@@ -59,7 +59,6 @@
  */
 class Max extends AbstractFile
 {
-
     protected $template = 'File :field exceeds the maximum resolution of :resolution';
 
     /**
diff --git a/src/Filter/Validation/Validator/File/Resolution/Min.php b/src/Filter/Validation/Validator/File/Resolution/Min.php
index 6beb61f6..3ce11cee 100644
--- a/src/Filter/Validation/Validator/File/Resolution/Min.php
+++ b/src/Filter/Validation/Validator/File/Resolution/Min.php
@@ -59,7 +59,6 @@
  */
 class Min extends AbstractFile
 {
-
     protected $template = 'File :field can not have the minimum resolution of :resolution';
 
     /**
diff --git a/src/Filter/Validation/Validator/File/Size/Equal.php b/src/Filter/Validation/Validator/File/Size/Equal.php
index 6586e6da..36b87a87 100644
--- a/src/Filter/Validation/Validator/File/Size/Equal.php
+++ b/src/Filter/Validation/Validator/File/Size/Equal.php
@@ -59,7 +59,6 @@
  */
 class Equal extends AbstractFile
 {
-
     protected $template = 'File :field does not have the exact :size file size';
 
     /**
diff --git a/src/Filter/Validation/Validator/File/Size/Max.php b/src/Filter/Validation/Validator/File/Size/Max.php
index c81811b3..659c4869 100644
--- a/src/Filter/Validation/Validator/File/Size/Max.php
+++ b/src/Filter/Validation/Validator/File/Size/Max.php
@@ -59,7 +59,6 @@
  */
 class Max extends AbstractFile
 {
-
     protected $template = 'File :field exceeds the size of :size';
 
     /**
diff --git a/src/Filter/Validation/Validator/File/Size/Min.php b/src/Filter/Validation/Validator/File/Size/Min.php
index 44a5d6c0..147e9e8e 100644
--- a/src/Filter/Validation/Validator/File/Size/Min.php
+++ b/src/Filter/Validation/Validator/File/Size/Min.php
@@ -59,7 +59,6 @@
  */
 class Min extends AbstractFile
 {
-
     protected $template = 'File :field can not have the minimum size of :size';
 
     /**
diff --git a/src/Filter/Validation/Validator/Identical.php b/src/Filter/Validation/Validator/Identical.php
index c8882bfd..611768a5 100644
--- a/src/Filter/Validation/Validator/Identical.php
+++ b/src/Filter/Validation/Validator/Identical.php
@@ -54,7 +54,6 @@
  */
 class Identical extends AbstractValidator
 {
-
     protected $template = 'Field :field does not have the expected value';
 
     /**
diff --git a/src/Filter/Validation/Validator/InclusionIn.php b/src/Filter/Validation/Validator/InclusionIn.php
index c34ef3da..fcc8e2be 100644
--- a/src/Filter/Validation/Validator/InclusionIn.php
+++ b/src/Filter/Validation/Validator/InclusionIn.php
@@ -55,7 +55,6 @@
  */
 class InclusionIn extends AbstractValidator
 {
-
     protected $template = 'Field :field must be a part of list: :domain';
 
     /**
diff --git a/src/Filter/Validation/Validator/Numericality.php b/src/Filter/Validation/Validator/Numericality.php
index e6839624..a041d072 100644
--- a/src/Filter/Validation/Validator/Numericality.php
+++ b/src/Filter/Validation/Validator/Numericality.php
@@ -49,7 +49,6 @@
  */
 class Numericality extends AbstractValidator
 {
-
     protected $template = 'Field :field does not have a valid numeric format';
 
     /**
diff --git a/src/Filter/Validation/Validator/PresenceOf.php b/src/Filter/Validation/Validator/PresenceOf.php
index c4f3fe76..fe0b93b7 100644
--- a/src/Filter/Validation/Validator/PresenceOf.php
+++ b/src/Filter/Validation/Validator/PresenceOf.php
@@ -49,7 +49,6 @@
  */
 class PresenceOf extends AbstractValidator
 {
-
     protected $template = 'Field :field is required';
 
     /**
diff --git a/src/Filter/Validation/Validator/Regex.php b/src/Filter/Validation/Validator/Regex.php
index f8f60f29..aff37179 100644
--- a/src/Filter/Validation/Validator/Regex.php
+++ b/src/Filter/Validation/Validator/Regex.php
@@ -54,7 +54,6 @@
  */
 class Regex extends AbstractValidator
 {
-
     protected $template = 'Field :field does not match the required format';
 
     /**
diff --git a/src/Filter/Validation/Validator/StringLength.php b/src/Filter/Validation/Validator/StringLength.php
index 7b220d90..4e434f44 100644
--- a/src/Filter/Validation/Validator/StringLength.php
+++ b/src/Filter/Validation/Validator/StringLength.php
@@ -80,8 +80,6 @@
  */
 class StringLength extends AbstractValidatorComposite
 {
-
-
     /**
      * Constructor
      *
diff --git a/src/Filter/Validation/Validator/StringLength/Max.php b/src/Filter/Validation/Validator/StringLength/Max.php
index 38f05c3f..1fda09d9 100644
--- a/src/Filter/Validation/Validator/StringLength/Max.php
+++ b/src/Filter/Validation/Validator/StringLength/Max.php
@@ -62,7 +62,6 @@
  */
 class Max extends AbstractValidator
 {
-
     protected $template = 'Field :field must not exceed :max characters long';
 
     /**
diff --git a/src/Filter/Validation/Validator/StringLength/Min.php b/src/Filter/Validation/Validator/StringLength/Min.php
index 3346a9a9..5905b0d5 100644
--- a/src/Filter/Validation/Validator/StringLength/Min.php
+++ b/src/Filter/Validation/Validator/StringLength/Min.php
@@ -62,7 +62,6 @@
  */
 class Min extends AbstractValidator
 {
-
     protected $template = 'Field :field must be at least :min characters long';
 
     /**
diff --git a/src/Filter/Validation/Validator/Uniqueness.php b/src/Filter/Validation/Validator/Uniqueness.php
index b221ac08..63a99f3e 100644
--- a/src/Filter/Validation/Validator/Uniqueness.php
+++ b/src/Filter/Validation/Validator/Uniqueness.php
@@ -88,7 +88,6 @@
  */
 class Uniqueness extends AbstractCombinedFieldsValidator
 {
-
     protected $template = 'Field :field must be unique';
 
     /**
diff --git a/src/Filter/Validation/Validator/Url.php b/src/Filter/Validation/Validator/Url.php
index e6f4815f..a1c2ca35 100644
--- a/src/Filter/Validation/Validator/Url.php
+++ b/src/Filter/Validation/Validator/Url.php
@@ -49,7 +49,6 @@
  */
 class Url extends AbstractValidator
 {
-
     protected $template = 'Field :field must be a url';
 
     /**
diff --git a/src/Filter/Validation/ValidatorCompositeInterface.php b/src/Filter/Validation/ValidatorCompositeInterface.php
index 442a88e8..3a9601bc 100644
--- a/src/Filter/Validation/ValidatorCompositeInterface.php
+++ b/src/Filter/Validation/ValidatorCompositeInterface.php
@@ -16,8 +16,6 @@
  */
 interface ValidatorCompositeInterface
 {
-
-
     /**
      * Executes the validation
      *
diff --git a/src/Filter/Validation/ValidatorFactory.php b/src/Filter/Validation/ValidatorFactory.php
index 95ca668e..d3c8e6cc 100644
--- a/src/Filter/Validation/ValidatorFactory.php
+++ b/src/Filter/Validation/ValidatorFactory.php
@@ -21,8 +21,6 @@
  */
 class ValidatorFactory extends AbstractFactory
 {
-
-
     /**
      * TagFactory constructor.
      *
diff --git a/src/Filter/Validation/ValidatorInterface.php b/src/Filter/Validation/ValidatorInterface.php
index 2f974b38..ace0fba7 100644
--- a/src/Filter/Validation/ValidatorInterface.php
+++ b/src/Filter/Validation/ValidatorInterface.php
@@ -16,8 +16,6 @@
  */
 interface ValidatorInterface
 {
-
-
     /**
      * Returns an option in the validator's options
      * Returns null if the option hasn't set
diff --git a/src/Flash/AbstractFlash.php b/src/Flash/AbstractFlash.php
index e076ae0d..9ae7498d 100644
--- a/src/Flash/AbstractFlash.php
+++ b/src/Flash/AbstractFlash.php
@@ -31,7 +31,6 @@
  */
 abstract class AbstractFlash extends AbstractInjectionAware implements \Phalcon\Flash\FlashInterface
 {
-
     /**
      * @var bool
      */
@@ -83,64 +82,71 @@ abstract class AbstractFlash extends AbstractInjectionAware implements \Phalcon\
     protected $sessionService = null;
 
     /**
-     * @return bool
+     * AbstractFlash constructor.
+     *
+     * @param EscaperInterface|null $escaper
+     * @param SessionInterface|null $session
      */
-    public function getAutoescape(): bool
+    public function __construct(\Phalcon\Html\Escaper\EscaperInterface $escaper = null, \Phalcon\Session\ManagerInterface $session = null)
     {
     }
 
     /**
-     * @return array
+     * Clears accumulated messages when implicit flush is disabled
+     *
+     * @return void
      */
-    public function getCssClasses(): array
+    public function clear(): void
     {
     }
 
     /**
-     * @return array
+     * Shows a HTML error message
+     *
+     * ```php
+     * $flash->error("This is an error");
+     * ```
+     *
+     * @param string $message
+     *
+     * @return string|null
      */
-    public function getCssIconClasses(): array
+    public function error(string $message): ?string
     {
     }
 
     /**
-     * @return string
+     * @return bool
      */
-    public function getCustomTemplate(): string
+    public function getAutoescape(): bool
     {
     }
 
     /**
-     * AbstractFlash constructor.
-     *
-     * @param EscaperInterface|null $escaper
-     * @param SessionInterface|null $session
+     * @return bool
      */
-    public function __construct(\Phalcon\Html\Escaper\EscaperInterface $escaper = null, \Phalcon\Session\ManagerInterface $session = null)
+    public function getAutomaticHtml(): bool
     {
     }
 
     /**
-     * Clears accumulated messages when implicit flush is disabled
-     *
-     * @return void
+     * @return array
      */
-    public function clear(): void
+    public function getCssClasses(): array
     {
     }
 
     /**
-     * Shows a HTML error message
-     *
-     * ```php
-     * $flash->error("This is an error");
-     * ```
-     *
-     * @param string $message
-     *
-     * @return string|null
+     * @return array
      */
-    public function error(string $message): ?string
+    public function getCssIconClasses(): array
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getCustomTemplate(): string
     {
     }
 
diff --git a/src/Flash/Direct.php b/src/Flash/Direct.php
index d7f60f69..4c70a180 100644
--- a/src/Flash/Direct.php
+++ b/src/Flash/Direct.php
@@ -16,8 +16,6 @@
  */
 class Direct extends \Phalcon\Flash\AbstractFlash
 {
-
-
     /**
      * Outputs a message
      *
diff --git a/src/Flash/Exception.php b/src/Flash/Exception.php
index 4c658105..eb04b266 100644
--- a/src/Flash/Exception.php
+++ b/src/Flash/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Flash/FlashInterface.php b/src/Flash/FlashInterface.php
index b84df73e..df8d7519 100644
--- a/src/Flash/FlashInterface.php
+++ b/src/Flash/FlashInterface.php
@@ -16,8 +16,6 @@
  */
 interface FlashInterface
 {
-
-
     /**
      * Shows a HTML error message
      *
diff --git a/src/Forms/Element/AbstractElement.php b/src/Forms/Element/AbstractElement.php
index 61be083b..4121461a 100644
--- a/src/Forms/Element/AbstractElement.php
+++ b/src/Forms/Element/AbstractElement.php
@@ -25,7 +25,6 @@
  */
 abstract class AbstractElement implements \Phalcon\Forms\Element\ElementInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Forms/Element/Check.php b/src/Forms/Element/Check.php
index c58abcf1..c5228146 100644
--- a/src/Forms/Element/Check.php
+++ b/src/Forms/Element/Check.php
@@ -14,7 +14,6 @@
  */
 class Check extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Date.php b/src/Forms/Element/Date.php
index 5e203705..ae6e4e64 100644
--- a/src/Forms/Element/Date.php
+++ b/src/Forms/Element/Date.php
@@ -16,7 +16,6 @@
  */
 class Date extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/ElementInterface.php b/src/Forms/Element/ElementInterface.php
index bb388393..d5f76076 100644
--- a/src/Forms/Element/ElementInterface.php
+++ b/src/Forms/Element/ElementInterface.php
@@ -19,8 +19,6 @@
  */
 interface ElementInterface
 {
-
-
     /**
      * Adds a filter to current list of filters
      *
diff --git a/src/Forms/Element/Email.php b/src/Forms/Element/Email.php
index f67a47ae..4324ab73 100644
--- a/src/Forms/Element/Email.php
+++ b/src/Forms/Element/Email.php
@@ -16,7 +16,6 @@
  */
 class Email extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/File.php b/src/Forms/Element/File.php
index 3579d7ef..54465ef8 100644
--- a/src/Forms/Element/File.php
+++ b/src/Forms/Element/File.php
@@ -16,7 +16,6 @@
  */
 class File extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Hidden.php b/src/Forms/Element/Hidden.php
index d3df78ec..0dbff8e7 100644
--- a/src/Forms/Element/Hidden.php
+++ b/src/Forms/Element/Hidden.php
@@ -16,7 +16,6 @@
  */
 class Hidden extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Numeric.php b/src/Forms/Element/Numeric.php
index ee086919..c7c78675 100644
--- a/src/Forms/Element/Numeric.php
+++ b/src/Forms/Element/Numeric.php
@@ -16,7 +16,6 @@
  */
 class Numeric extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Password.php b/src/Forms/Element/Password.php
index 891dda62..ade36ced 100644
--- a/src/Forms/Element/Password.php
+++ b/src/Forms/Element/Password.php
@@ -16,7 +16,6 @@
  */
 class Password extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Radio.php b/src/Forms/Element/Radio.php
index c9a1d079..e73b5ec8 100644
--- a/src/Forms/Element/Radio.php
+++ b/src/Forms/Element/Radio.php
@@ -16,7 +16,6 @@
  */
 class Radio extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Select.php b/src/Forms/Element/Select.php
index 92b2f9d8..fb3de5fd 100644
--- a/src/Forms/Element/Select.php
+++ b/src/Forms/Element/Select.php
@@ -16,7 +16,6 @@
  */
 class Select extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var object|array|null
      */
diff --git a/src/Forms/Element/Submit.php b/src/Forms/Element/Submit.php
index e1ec6c81..3c28d277 100644
--- a/src/Forms/Element/Submit.php
+++ b/src/Forms/Element/Submit.php
@@ -16,7 +16,6 @@
  */
 class Submit extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Element/Text.php b/src/Forms/Element/Text.php
index 4ed14d6e..719b14ff 100644
--- a/src/Forms/Element/Text.php
+++ b/src/Forms/Element/Text.php
@@ -16,6 +16,4 @@
  */
 class Text extends \Phalcon\Forms\Element\AbstractElement
 {
-
-
 }
diff --git a/src/Forms/Element/TextArea.php b/src/Forms/Element/TextArea.php
index 70d6dbdd..ada3021e 100644
--- a/src/Forms/Element/TextArea.php
+++ b/src/Forms/Element/TextArea.php
@@ -16,7 +16,6 @@
  */
 class TextArea extends \Phalcon\Forms\Element\AbstractElement
 {
-
     /**
      * @var string
      */
diff --git a/src/Forms/Exception.php b/src/Forms/Exception.php
index 3d052029..418777a1 100644
--- a/src/Forms/Exception.php
+++ b/src/Forms/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index af213dd2..f287d7ef 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -28,7 +28,6 @@
  */
 class Form extends Injectable implements \Countable, \Iterator, \Phalcon\Html\Attributes\AttributesInterface
 {
-
     /**
      * @var AttributesInterface|null
      */
@@ -89,20 +88,6 @@ class Form extends Injectable implements \Countable, \Iterator, \Phalcon\Html\At
      */
     protected $whitelist = [];
 
-    /**
-     * @return ValidationInterface|null
-     */
-    public function getValidation()
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getWhitelist(): array
-    {
-    }
-
     /**
      * Phalcon\Forms\Form constructor
      *
@@ -299,6 +284,24 @@ public function getValue(string $name)
     {
     }
 
+    /**
+     * return ValidationInterface|null
+     *
+     * @return ValidationInterface|null
+     */
+    public function getValidation(): ?ValidationInterface
+    {
+    }
+
+    /**
+     * return array
+     *
+     * @return array
+     */
+    public function getWhitelist(): array
+    {
+    }
+
     /**
      * Check if the form contains an element
      *
diff --git a/src/Forms/Manager.php b/src/Forms/Manager.php
index be328fb2..1dd8f5f1 100644
--- a/src/Forms/Manager.php
+++ b/src/Forms/Manager.php
@@ -14,7 +14,6 @@
  */
 class Manager
 {
-
     /**
      * @var array
      */
diff --git a/src/Html/Attributes.php b/src/Html/Attributes.php
index f0c291f6..302410c3 100644
--- a/src/Html/Attributes.php
+++ b/src/Html/Attributes.php
@@ -17,8 +17,6 @@
  */
 class Attributes extends Collection implements \Phalcon\Html\Attributes\RenderInterface
 {
-
-
     /**
      * Render attributes as HTML attributes
      *
diff --git a/src/Html/Attributes/AttributesInterface.php b/src/Html/Attributes/AttributesInterface.php
index e925f04d..401c1dfc 100644
--- a/src/Html/Attributes/AttributesInterface.php
+++ b/src/Html/Attributes/AttributesInterface.php
@@ -18,8 +18,6 @@
  */
 interface AttributesInterface
 {
-
-
     /**
      * Get Attributes
      *
diff --git a/src/Html/Attributes/RenderInterface.php b/src/Html/Attributes/RenderInterface.php
index 13262086..2d65a23a 100644
--- a/src/Html/Attributes/RenderInterface.php
+++ b/src/Html/Attributes/RenderInterface.php
@@ -16,8 +16,6 @@
  */
 interface RenderInterface
 {
-
-
     /**
      * Generate a string represetation
      *
diff --git a/src/Html/Breadcrumbs.php b/src/Html/Breadcrumbs.php
index c5fe9b8d..873524e2 100644
--- a/src/Html/Breadcrumbs.php
+++ b/src/Html/Breadcrumbs.php
@@ -20,7 +20,6 @@
  */
 class Breadcrumbs
 {
-
     /**
      * Keeps all the breadcrumbs
      *
@@ -42,24 +41,6 @@ class Breadcrumbs
      */
     private $template = '<dt><a href=\\\"%link%\\\">%label%</a></dt>';
 
-    /**
-     * Crumb separator
-     *
-     * @return string
-     */
-    public function getSeparator(): string
-    {
-    }
-
-    /**
-     * Crumb separator
-     *
-     * @param string $separator
-     */
-    public function setSeparator(string $separator)
-    {
-    }
-
     /**
      * Adds a new crumb.
      *
@@ -92,6 +73,15 @@ public function clear(): void
     {
     }
 
+    /**
+     * Crumb separator
+     *
+     * @return string
+     */
+    public function getSeparator(): string
+    {
+    }
+
     /**
      * Removes crumb by url.
      *
@@ -122,6 +112,15 @@ public function render(): string
     {
     }
 
+    /**
+     * @param string $separator
+     *
+     * @return Breadcrumbs
+     */
+    public function setSeparator(string $separator): Breadcrumbs
+    {
+    }
+
     /**
      * Returns the internal breadcrumbs array
      *
diff --git a/src/Html/Escaper.php b/src/Html/Escaper.php
index e500e0a8..8d76a301 100644
--- a/src/Html/Escaper.php
+++ b/src/Html/Escaper.php
@@ -30,7 +30,6 @@
  */
 class Escaper implements \Phalcon\Html\Escaper\EscaperInterface
 {
-
     /**
      * @var bool
      */
@@ -49,29 +48,20 @@ class Escaper implements \Phalcon\Html\Escaper\EscaperInterface
     protected $flags = 11;
 
     /**
-     * @return string
-     */
-    public function getEncoding(): string
-    {
-    }
-
-    /**
-     * ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401
+     * Escapes a HTML attribute string or array
      *
-     * @return int
-     */
-    public function getFlags(): int
-    {
-    }
-
-    /**
-     * Escapes a HTML attribute string
+     * If the input is an array, the keys are the attribute names and the
+     * values are attribute values. If a value is boolean (true/false) then
+     * the attribute will have no value:
+     * `['disabled' => true]` -> `'disabled``
      *
-     * @param string $input
+     * The resulting string will have attribute pairs separated by a space.
+     *
+     * @param array|string $input
      *
      * @return string
      */
-    public function attributes(string $input): string
+    public function attributes($input): string
     {
     }
 
@@ -162,6 +152,20 @@ public function escapeUrl(string $input): string
     {
     }
 
+    /**
+     * @return string
+     */
+    public function getEncoding(): string
+    {
+    }
+
+    /**
+     * @return int
+     */
+    public function getFlags(): int
+    {
+    }
+
     /**
      * Escapes a HTML string. Internally uses htmlspecialchars
      *
@@ -232,9 +236,9 @@ public function setEncoding(string $encoding): EscaperInterface
      * ```
      *
      * @param int $flags
-     * @return Escaper
+     * @return EscaperInterface
      */
-    public function setFlags(int $flags): Escaper
+    public function setFlags(int $flags): EscaperInterface
     {
     }
 
@@ -264,6 +268,17 @@ public function url(string $input): string
     {
     }
 
+    /**
+     * Proxy method for testing
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    protected function phpHtmlSpecialChars(string $input): string
+    {
+    }
+
     /**
      * @param string $input
      *
diff --git a/src/Html/Escaper/EscaperInterface.php b/src/Html/Escaper/EscaperInterface.php
index 7c913dc9..7942cdd8 100644
--- a/src/Html/Escaper/EscaperInterface.php
+++ b/src/Html/Escaper/EscaperInterface.php
@@ -14,8 +14,6 @@
  */
 interface EscaperInterface
 {
-
-
     /**
      * Escapes a HTML attribute string
      *
@@ -75,7 +73,7 @@ public function setEncoding(string $encoding): EscaperInterface;
      * @param int $flags
      * @return EscaperInterface
      */
-    public function setHtmlQuoteType(int $flags): EscaperInterface;
+    public function setFlags(int $flags): EscaperInterface;
 
     /**
      * Escapes a URL. Internally uses rawurlencode
diff --git a/src/Html/Escaper/Exception.php b/src/Html/Escaper/Exception.php
index 084e1784..0816474d 100644
--- a/src/Html/Escaper/Exception.php
+++ b/src/Html/Escaper/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Html/EscaperFactory.php b/src/Html/EscaperFactory.php
index 0fe176bf..c1824f58 100644
--- a/src/Html/EscaperFactory.php
+++ b/src/Html/EscaperFactory.php
@@ -14,8 +14,6 @@
  */
 class EscaperFactory
 {
-
-
     /**
      * Create a new instance of the object
      *
diff --git a/src/Html/Exception.php b/src/Html/Exception.php
index 9dfb7bf0..22ebfabc 100644
--- a/src/Html/Exception.php
+++ b/src/Html/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Html/Helper/AbstractHelper.php b/src/Html/Helper/AbstractHelper.php
index 5c9b0051..53ecc8fb 100644
--- a/src/Html/Helper/AbstractHelper.php
+++ b/src/Html/Helper/AbstractHelper.php
@@ -20,7 +20,6 @@
  */
 abstract class AbstractHelper
 {
-
     /**
      * @var string
      */
diff --git a/src/Html/Helper/AbstractList.php b/src/Html/Helper/AbstractList.php
index 09d844d5..5f2c247a 100644
--- a/src/Html/Helper/AbstractList.php
+++ b/src/Html/Helper/AbstractList.php
@@ -16,7 +16,6 @@
  */
 abstract class AbstractList extends \Phalcon\Html\Helper\AbstractHelper
 {
-
     /**
      * @var array
      */
diff --git a/src/Html/Helper/AbstractSeries.php b/src/Html/Helper/AbstractSeries.php
index aca8a5e7..3e89c07b 100644
--- a/src/Html/Helper/AbstractSeries.php
+++ b/src/Html/Helper/AbstractSeries.php
@@ -15,7 +15,6 @@
  */
 abstract class AbstractSeries extends \Phalcon\Html\Helper\AbstractHelper
 {
-
     /**
      * @var array
      */
diff --git a/src/Html/Helper/Anchor.php b/src/Html/Helper/Anchor.php
index 6a1ef96f..343d24a7 100644
--- a/src/Html/Helper/Anchor.php
+++ b/src/Html/Helper/Anchor.php
@@ -16,8 +16,6 @@
  */
 class Anchor extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a <a> tag
      *
diff --git a/src/Html/Helper/Base.php b/src/Html/Helper/Base.php
index 2395adc0..2b7dc357 100644
--- a/src/Html/Helper/Base.php
+++ b/src/Html/Helper/Base.php
@@ -16,8 +16,6 @@
  */
 class Base extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a `<base/>` tag.
      *
diff --git a/src/Html/Helper/Body.php b/src/Html/Helper/Body.php
index d887130e..3c899e07 100644
--- a/src/Html/Helper/Body.php
+++ b/src/Html/Helper/Body.php
@@ -16,8 +16,6 @@
  */
 class Body extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a `<body>` tag.
      *
diff --git a/src/Html/Helper/Button.php b/src/Html/Helper/Button.php
index 299f5e85..f218f63a 100644
--- a/src/Html/Helper/Button.php
+++ b/src/Html/Helper/Button.php
@@ -16,8 +16,6 @@
  */
 class Button extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a `<button>` tag.
      *
diff --git a/src/Html/Helper/Close.php b/src/Html/Helper/Close.php
index 978e143b..d59c19e6 100644
--- a/src/Html/Helper/Close.php
+++ b/src/Html/Helper/Close.php
@@ -14,8 +14,6 @@
  */
 class Close extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a `</...>` tag.
      *
diff --git a/src/Html/Helper/Doctype.php b/src/Html/Helper/Doctype.php
index 3fef2e1f..8529c875 100644
--- a/src/Html/Helper/Doctype.php
+++ b/src/Html/Helper/Doctype.php
@@ -55,9 +55,9 @@ public function __construct()
      *
      * @param int    $flag
      * @param string $delimiter
-     * @return void
+     * @return Doctype
      */
-    public function __invoke(int $flag = self::HTML5, string $delimiter = '\\n'): void
+    public function __invoke(int $flag = self::HTML5, string $delimiter = '\\n'): Doctype
     {
     }
 
diff --git a/src/Html/Helper/Element.php b/src/Html/Helper/Element.php
index 270af796..9e09880a 100644
--- a/src/Html/Helper/Element.php
+++ b/src/Html/Helper/Element.php
@@ -16,8 +16,6 @@
  */
 class Element extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a tag.
      *
diff --git a/src/Html/Helper/Form.php b/src/Html/Helper/Form.php
index 2a189c0a..14ef44d3 100644
--- a/src/Html/Helper/Form.php
+++ b/src/Html/Helper/Form.php
@@ -16,8 +16,6 @@
  */
 class Form extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a `<form>` tag.
      *
diff --git a/src/Html/Helper/Img.php b/src/Html/Helper/Img.php
index 8853ed5c..4d88116c 100644
--- a/src/Html/Helper/Img.php
+++ b/src/Html/Helper/Img.php
@@ -16,8 +16,6 @@
  */
 class Img extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a <img> tag.
      *
diff --git a/src/Html/Helper/Input/AbstractInput.php b/src/Html/Helper/Input/AbstractInput.php
index 79cf22ea..67bd1bae 100644
--- a/src/Html/Helper/Input/AbstractInput.php
+++ b/src/Html/Helper/Input/AbstractInput.php
@@ -20,7 +20,6 @@
  */
 abstract class AbstractInput extends AbstractHelper
 {
-
     /**
      * @var string
      */
diff --git a/src/Html/Helper/Input/Checkbox.php b/src/Html/Helper/Input/Checkbox.php
index f04868fb..56ea7825 100644
--- a/src/Html/Helper/Input/Checkbox.php
+++ b/src/Html/Helper/Input/Checkbox.php
@@ -18,7 +18,6 @@
  */
 class Checkbox extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     /**
      * @var array
      */
diff --git a/src/Html/Helper/Input/Color.php b/src/Html/Helper/Input/Color.php
index d4303302..75ab1063 100644
--- a/src/Html/Helper/Input/Color.php
+++ b/src/Html/Helper/Input/Color.php
@@ -14,6 +14,5 @@
  */
 class Color extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'color';
 }
diff --git a/src/Html/Helper/Input/Date.php b/src/Html/Helper/Input/Date.php
index c3659185..12366855 100644
--- a/src/Html/Helper/Input/Date.php
+++ b/src/Html/Helper/Input/Date.php
@@ -14,6 +14,5 @@
  */
 class Date extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'date';
 }
diff --git a/src/Html/Helper/Input/DateTime.php b/src/Html/Helper/Input/DateTime.php
index 9baefdba..ada1f0a0 100644
--- a/src/Html/Helper/Input/DateTime.php
+++ b/src/Html/Helper/Input/DateTime.php
@@ -14,6 +14,5 @@
  */
 class DateTime extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'datetime';
 }
diff --git a/src/Html/Helper/Input/DateTimeLocal.php b/src/Html/Helper/Input/DateTimeLocal.php
index a7cde6e1..6739bffe 100644
--- a/src/Html/Helper/Input/DateTimeLocal.php
+++ b/src/Html/Helper/Input/DateTimeLocal.php
@@ -14,6 +14,5 @@
  */
 class DateTimeLocal extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'datetime-local';
 }
diff --git a/src/Html/Helper/Input/Email.php b/src/Html/Helper/Input/Email.php
index fedf67ab..4e65729f 100644
--- a/src/Html/Helper/Input/Email.php
+++ b/src/Html/Helper/Input/Email.php
@@ -14,6 +14,5 @@
  */
 class Email extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'email';
 }
diff --git a/src/Html/Helper/Input/File.php b/src/Html/Helper/Input/File.php
index 44eba200..7eec4a15 100644
--- a/src/Html/Helper/Input/File.php
+++ b/src/Html/Helper/Input/File.php
@@ -14,6 +14,5 @@
  */
 class File extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'file';
 }
diff --git a/src/Html/Helper/Input/Hidden.php b/src/Html/Helper/Input/Hidden.php
index bef01342..218fda1a 100644
--- a/src/Html/Helper/Input/Hidden.php
+++ b/src/Html/Helper/Input/Hidden.php
@@ -14,6 +14,5 @@
  */
 class Hidden extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'hidden';
 }
diff --git a/src/Html/Helper/Input/Image.php b/src/Html/Helper/Input/Image.php
index b95b3862..98cacd9c 100644
--- a/src/Html/Helper/Input/Image.php
+++ b/src/Html/Helper/Input/Image.php
@@ -14,6 +14,5 @@
  */
 class Image extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'image';
 }
diff --git a/src/Html/Helper/Input/Input.php b/src/Html/Helper/Input/Input.php
index dd4c21d9..f160acd7 100644
--- a/src/Html/Helper/Input/Input.php
+++ b/src/Html/Helper/Input/Input.php
@@ -14,8 +14,6 @@
  */
 class Input extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
-
     /**
      * Sets the type of the input
      *
diff --git a/src/Html/Helper/Input/Month.php b/src/Html/Helper/Input/Month.php
index 1277695f..1835a7aa 100644
--- a/src/Html/Helper/Input/Month.php
+++ b/src/Html/Helper/Input/Month.php
@@ -14,6 +14,5 @@
  */
 class Month extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'month';
 }
diff --git a/src/Html/Helper/Input/Numeric.php b/src/Html/Helper/Input/Numeric.php
index 7987998f..1b9768d0 100644
--- a/src/Html/Helper/Input/Numeric.php
+++ b/src/Html/Helper/Input/Numeric.php
@@ -14,6 +14,5 @@
  */
 class Numeric extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'number';
 }
diff --git a/src/Html/Helper/Input/Password.php b/src/Html/Helper/Input/Password.php
index 21a41dca..f03f3911 100644
--- a/src/Html/Helper/Input/Password.php
+++ b/src/Html/Helper/Input/Password.php
@@ -14,6 +14,5 @@
  */
 class Password extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'password';
 }
diff --git a/src/Html/Helper/Input/Radio.php b/src/Html/Helper/Input/Radio.php
index ed38bb8a..822cbc0e 100644
--- a/src/Html/Helper/Input/Radio.php
+++ b/src/Html/Helper/Input/Radio.php
@@ -14,7 +14,6 @@
  */
 class Radio extends \Phalcon\Html\Helper\Input\Checkbox
 {
-
     /**
      * @var string
      */
diff --git a/src/Html/Helper/Input/Range.php b/src/Html/Helper/Input/Range.php
index 63af7259..59c8f6d1 100644
--- a/src/Html/Helper/Input/Range.php
+++ b/src/Html/Helper/Input/Range.php
@@ -14,6 +14,5 @@
  */
 class Range extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'range';
 }
diff --git a/src/Html/Helper/Input/Search.php b/src/Html/Helper/Input/Search.php
index a97c1f51..b3908c25 100644
--- a/src/Html/Helper/Input/Search.php
+++ b/src/Html/Helper/Input/Search.php
@@ -14,6 +14,5 @@
  */
 class Search extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'search';
 }
diff --git a/src/Html/Helper/Input/Select.php b/src/Html/Helper/Input/Select.php
index 58918c28..d86b907a 100644
--- a/src/Html/Helper/Input/Select.php
+++ b/src/Html/Helper/Input/Select.php
@@ -20,7 +20,6 @@
  */
 class Select extends AbstractList
 {
-
     /**
      * @var string
      */
diff --git a/src/Html/Helper/Input/Submit.php b/src/Html/Helper/Input/Submit.php
index b378519d..b0f217f8 100644
--- a/src/Html/Helper/Input/Submit.php
+++ b/src/Html/Helper/Input/Submit.php
@@ -14,6 +14,5 @@
  */
 class Submit extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'submit';
 }
diff --git a/src/Html/Helper/Input/Tel.php b/src/Html/Helper/Input/Tel.php
index 5a5678ce..fe347d30 100644
--- a/src/Html/Helper/Input/Tel.php
+++ b/src/Html/Helper/Input/Tel.php
@@ -14,6 +14,5 @@
  */
 class Tel extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'tel';
 }
diff --git a/src/Html/Helper/Input/Text.php b/src/Html/Helper/Input/Text.php
index 7bce8a89..e80d29d2 100644
--- a/src/Html/Helper/Input/Text.php
+++ b/src/Html/Helper/Input/Text.php
@@ -14,6 +14,4 @@
  */
 class Text extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
-
 }
diff --git a/src/Html/Helper/Input/Textarea.php b/src/Html/Helper/Input/Textarea.php
index e111bb4f..e68fe210 100644
--- a/src/Html/Helper/Input/Textarea.php
+++ b/src/Html/Helper/Input/Textarea.php
@@ -16,7 +16,6 @@
  */
 class Textarea extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     /**
      * @var string
      */
diff --git a/src/Html/Helper/Input/Time.php b/src/Html/Helper/Input/Time.php
index a7a1bf8f..a81826c0 100644
--- a/src/Html/Helper/Input/Time.php
+++ b/src/Html/Helper/Input/Time.php
@@ -14,6 +14,5 @@
  */
 class Time extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'time';
 }
diff --git a/src/Html/Helper/Input/Url.php b/src/Html/Helper/Input/Url.php
index ec559e10..434d648b 100644
--- a/src/Html/Helper/Input/Url.php
+++ b/src/Html/Helper/Input/Url.php
@@ -14,6 +14,5 @@
  */
 class Url extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'url';
 }
diff --git a/src/Html/Helper/Input/Week.php b/src/Html/Helper/Input/Week.php
index 0d6246ca..c88ab568 100644
--- a/src/Html/Helper/Input/Week.php
+++ b/src/Html/Helper/Input/Week.php
@@ -14,6 +14,5 @@
  */
 class Week extends \Phalcon\Html\Helper\Input\AbstractInput
 {
-
     protected $type = 'week';
 }
diff --git a/src/Html/Helper/Label.php b/src/Html/Helper/Label.php
index 33658919..a6899604 100644
--- a/src/Html/Helper/Label.php
+++ b/src/Html/Helper/Label.php
@@ -16,8 +16,6 @@
  */
 class Label extends \Phalcon\Html\Helper\AbstractHelper
 {
-
-
     /**
      * Produce a `<label>` tag.
      *
diff --git a/src/Html/Helper/Link.php b/src/Html/Helper/Link.php
index 8b499481..70d9eacb 100644
--- a/src/Html/Helper/Link.php
+++ b/src/Html/Helper/Link.php
@@ -14,8 +14,6 @@
  */
 class Link extends \Phalcon\Html\Helper\Style
 {
-
-
     /**
      * Add an element to the list
      *
diff --git a/src/Html/Helper/Meta.php b/src/Html/Helper/Meta.php
index cdbd645a..673de034 100644
--- a/src/Html/Helper/Meta.php
+++ b/src/Html/Helper/Meta.php
@@ -16,8 +16,6 @@
  */
 class Meta extends \Phalcon\Html\Helper\AbstractSeries
 {
-
-
     /**
      * Add an element to the list
      *
diff --git a/src/Html/Helper/Ol.php b/src/Html/Helper/Ol.php
index 98bc103f..efbe1262 100644
--- a/src/Html/Helper/Ol.php
+++ b/src/Html/Helper/Ol.php
@@ -14,8 +14,6 @@
  */
 class Ol extends \Phalcon\Html\Helper\AbstractList
 {
-
-
     /**
      * Add an element to the list
      *
diff --git a/src/Html/Helper/Script.php b/src/Html/Helper/Script.php
index 1a3fb5b0..b402a652 100644
--- a/src/Html/Helper/Script.php
+++ b/src/Html/Helper/Script.php
@@ -16,8 +16,6 @@
  */
 class Script extends \Phalcon\Html\Helper\AbstractSeries
 {
-
-
     /**
      * Add an element to the list
      *
diff --git a/src/Html/Helper/Style.php b/src/Html/Helper/Style.php
index ec4fbdd1..7a223de2 100644
--- a/src/Html/Helper/Style.php
+++ b/src/Html/Helper/Style.php
@@ -16,7 +16,6 @@
  */
 class Style extends \Phalcon\Html\Helper\AbstractSeries
 {
-
     /**
      * @var bool
      */
diff --git a/src/Html/Helper/Title.php b/src/Html/Helper/Title.php
index 6fa6dd6f..e05ce4c2 100644
--- a/src/Html/Helper/Title.php
+++ b/src/Html/Helper/Title.php
@@ -23,7 +23,6 @@
  */
 class Title extends \Phalcon\Html\Helper\AbstractHelper
 {
-
     /**
      * @var array
      */
@@ -47,12 +46,12 @@ class Title extends \Phalcon\Html\Helper\AbstractHelper
     /**
      * Sets the separator and returns the object back
      *
-     * @param string|null $indent
+     * @param string      $indent
      * @param string|null $delimiter
      *
      * @return Title
      */
-    public function __invoke(string $indent = null, string $delimiter = null): Title
+    public function __invoke(string $indent = '    ', string $delimiter = null): Title
     {
     }
 
diff --git a/src/Html/Helper/Ul.php b/src/Html/Helper/Ul.php
index 7c1a8335..3d41f1fe 100644
--- a/src/Html/Helper/Ul.php
+++ b/src/Html/Helper/Ul.php
@@ -14,8 +14,6 @@
  */
 class Ul extends \Phalcon\Html\Helper\Ol
 {
-
-
     /**
      * @return string
      */
diff --git a/src/Html/Link/AbstractLink.php b/src/Html/Link/AbstractLink.php
index 297d5c37..a8062d43 100644
--- a/src/Html/Link/AbstractLink.php
+++ b/src/Html/Link/AbstractLink.php
@@ -19,7 +19,6 @@
  */
 abstract class AbstractLink
 {
-
     /**
      * @var Collection
      */
@@ -116,8 +115,8 @@ protected function hrefIsTemplated(string $href): bool
     }
 
     /**
-     * @param string $key
-     * @param mixed  $value
+     * @param string       $key
+     * @param string|array $value
      *
      * @return mixed
      */
diff --git a/src/Html/Link/AbstractLinkProvider.php b/src/Html/Link/AbstractLinkProvider.php
index dad34ffb..bbf21b83 100644
--- a/src/Html/Link/AbstractLinkProvider.php
+++ b/src/Html/Link/AbstractLinkProvider.php
@@ -16,7 +16,6 @@
  */
 abstract class AbstractLinkProvider
 {
-
     /**
      * @var array
      */
diff --git a/src/Html/Link/EvolvableLink.php b/src/Html/Link/EvolvableLink.php
index d2658202..9f63fb1a 100644
--- a/src/Html/Link/EvolvableLink.php
+++ b/src/Html/Link/EvolvableLink.php
@@ -21,16 +21,14 @@
  */
 class EvolvableLink extends \Phalcon\Html\Link\Link implements \Phalcon\Html\Link\Interfaces\EvolvableLinkInterface
 {
-
-
     /**
      * Returns an instance with the specified attribute added.
      *
      * If the specified attribute is already present, it will be overwritten
      * with the new value.
      *
-     * @param string $attribute The attribute to include.
-     * @param string $value     The value of the attribute to set.
+     * @param string       $attribute The attribute to include.
+     * @param string|array $value     The value of the attribute to set.
      * @return EvolvableLinkInterface
      */
     public function withAttribute($attribute, $value): EvolvableLinkInterface
diff --git a/src/Html/Link/EvolvableLinkProvider.php b/src/Html/Link/EvolvableLinkProvider.php
index b007995a..a8d8aa51 100644
--- a/src/Html/Link/EvolvableLinkProvider.php
+++ b/src/Html/Link/EvolvableLinkProvider.php
@@ -19,8 +19,6 @@
  */
 class EvolvableLinkProvider extends \Phalcon\Html\Link\LinkProvider implements \Phalcon\Html\Link\Interfaces\EvolvableLinkProviderInterface
 {
-
-
     /**
      * Returns an instance with the specified link included.
      *
diff --git a/src/Html/Link/Interfaces/EvolvableLinkInterface.php b/src/Html/Link/Interfaces/EvolvableLinkInterface.php
index 2b4044e8..ee5b2fc9 100644
--- a/src/Html/Link/Interfaces/EvolvableLinkInterface.php
+++ b/src/Html/Link/Interfaces/EvolvableLinkInterface.php
@@ -14,8 +14,6 @@
  */
 interface EvolvableLinkInterface extends \Phalcon\Html\Link\Interfaces\LinkInterface
 {
-
-
     /**
      * Returns an instance with the specified href.
      *
diff --git a/src/Html/Link/Interfaces/EvolvableLinkProviderInterface.php b/src/Html/Link/Interfaces/EvolvableLinkProviderInterface.php
index 82b1d40a..2628b768 100644
--- a/src/Html/Link/Interfaces/EvolvableLinkProviderInterface.php
+++ b/src/Html/Link/Interfaces/EvolvableLinkProviderInterface.php
@@ -14,8 +14,6 @@
  */
 interface EvolvableLinkProviderInterface extends \Phalcon\Html\Link\Interfaces\LinkProviderInterface
 {
-
-
     /**
      * Returns an instance with the specified link included.
      *
diff --git a/src/Html/Link/Interfaces/LinkInterface.php b/src/Html/Link/Interfaces/LinkInterface.php
index 3c8e576d..611838dc 100644
--- a/src/Html/Link/Interfaces/LinkInterface.php
+++ b/src/Html/Link/Interfaces/LinkInterface.php
@@ -14,8 +14,6 @@
  */
 interface LinkInterface
 {
-
-
     /**
      * Returns a list of attributes that describe the target URI.
      *
diff --git a/src/Html/Link/Interfaces/LinkProviderInterface.php b/src/Html/Link/Interfaces/LinkProviderInterface.php
index 16782713..3bcdd791 100644
--- a/src/Html/Link/Interfaces/LinkProviderInterface.php
+++ b/src/Html/Link/Interfaces/LinkProviderInterface.php
@@ -14,8 +14,6 @@
  */
 interface LinkProviderInterface
 {
-
-
     /**
      * Returns an array of LinkInterface objects.
      *
diff --git a/src/Html/Link/Link.php b/src/Html/Link/Link.php
index ab009683..1fee80f3 100644
--- a/src/Html/Link/Link.php
+++ b/src/Html/Link/Link.php
@@ -23,8 +23,6 @@
  */
 class Link extends \Phalcon\Html\Link\AbstractLink implements \Phalcon\Html\Link\Interfaces\LinkInterface
 {
-
-
     /**
      * Returns a list of attributes that describe the target URI.
      *
diff --git a/src/Html/Link/LinkProvider.php b/src/Html/Link/LinkProvider.php
index 58dd7d61..3c034307 100644
--- a/src/Html/Link/LinkProvider.php
+++ b/src/Html/Link/LinkProvider.php
@@ -17,8 +17,6 @@
  */
 class LinkProvider extends \Phalcon\Html\Link\AbstractLinkProvider implements \Phalcon\Html\Link\Interfaces\LinkProviderInterface
 {
-
-
     /**
      * Returns an iterable of LinkInterface objects.
      *
diff --git a/src/Html/Link/Serializer/Header.php b/src/Html/Link/Serializer/Header.php
index 82f3f525..1c284ddf 100644
--- a/src/Html/Link/Serializer/Header.php
+++ b/src/Html/Link/Serializer/Header.php
@@ -14,8 +14,6 @@
  */
 class Header implements \Phalcon\Html\Link\Serializer\SerializerInterface
 {
-
-
     /**
      * Serializes all the passed links to a HTTP link header
      *
diff --git a/src/Html/Link/Serializer/SerializerInterface.php b/src/Html/Link/Serializer/SerializerInterface.php
index 181c5e3d..aa1a5032 100644
--- a/src/Html/Link/Serializer/SerializerInterface.php
+++ b/src/Html/Link/Serializer/SerializerInterface.php
@@ -14,8 +14,6 @@
  */
 interface SerializerInterface
 {
-
-
     /**
      * Serializer method
      *
diff --git a/src/Html/TagFactory.php b/src/Html/TagFactory.php
index 4ff7f5cc..ab674f04 100644
--- a/src/Html/TagFactory.php
+++ b/src/Html/TagFactory.php
@@ -25,51 +25,50 @@
  * @property EscaperInterface $escaper
  * @property array            $services
  *
- * @method a(string $href, string $text, array $attributes = [], bool $raw = false): string
- * @method base(string $href, array $attributes = []): string
- * @method body(array $attributes = []): string
- * @method button(string $text, array $attributes = [], bool $raw = false): string
- * @method close(string $tag, bool $raw = false): string
- * @method doctype(int $flag, string $delimiter): string
- * @method element(string $tag, string $text, array $attributes = [], bool $raw = false): string
- * @method form(array $attributes = []): string
- * @method img(string $src, array $attributes = []): string
- * @method inputCheckbox(string $name, string $value = null, array $attributes = []): string
- * @method inputColor(string $name, string $value = null, array $attributes = []): string
- * @method inputDate(string $name, string $value = null, array $attributes = []): string
- * @method inputDateTime(string $name, string $value = null, array $attributes = []): string
- * @method inputDateTimeLocal(string $name, string $value = null, array $attributes = []): string
- * @method inputEmail(string $name, string $value = null, array $attributes = []): string
- * @method inputFile(string $name, string $value = null, array $attributes = []): string
- * @method inputHidden(string $name, string $value = null, array $attributes = []): string
- * @method inputImage(string $name, string $value = null, array $attributes = []): string
- * @method inputInput(string $name, string $value = null, array $attributes = []): string
- * @method inputMonth(string $name, string $value = null, array $attributes = []): string
- * @method inputNumeric(string $name, string $value = null, array $attributes = []): string
- * @method inputPassword(string $name, string $value = null, array $attributes = []): string
- * @method inputRadio(string $name, string $value = null, array $attributes = []): string
- * @method inputRange(string $name, string $value = null, array $attributes = []): string
- * @method inputSearch(string $name, string $value = null, array $attributes = []): string
- * @method inputSelect(string $name, string $value = null, array $attributes = []): string
- * @method inputSubmit(string $name, string $value = null, array $attributes = []): string
- * @method inputTel(string $name, string $value = null, array $attributes = []): string
- * @method inputText(string $name, string $value = null, array $attributes = []): string
- * @method inputTextarea(string $name, string $value = null, array $attributes = []): string
- * @method inputTime(string $name, string $value = null, array $attributes = []): string
- * @method inputUrl(string $name, string $value = null, array $attributes = []): string
- * @method inputWeek(string $name, string $value = null, array $attributes = []): string
- * @method label(array $attributes = []): string
- * @method link(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method meta(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method ol(string $text, array $attributes = [], bool $raw = false): string
- * @method script(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method style(string $indent = '    ', string $delimiter = PHP_EOL): string
- * @method title(string $separator = '', string $indent = '', string $delimiter = PHP_EOL): string
- * @method ul(string $text, array $attributes = [], bool $raw = false): string
+ * @method string a(string $href, string $text, array $attributes = [], bool $raw = false)
+ * @method string base(string $href, array $attributes = [])
+ * @method string body(array $attributes = [])
+ * @method string button(string $text, array $attributes = [], bool $raw = false)
+ * @method string close(string $tag, bool $raw = false)
+ * @method string doctype(int $flag, string $delimiter)
+ * @method string element(string $tag, string $text, array $attributes = [], bool $raw = false)
+ * @method string form(array $attributes = [])
+ * @method string img(string $src, array $attributes = [])
+ * @method string inputCheckbox(string $name, string $value = null, array $attributes = [])
+ * @method string inputColor(string $name, string $value = null, array $attributes = [])
+ * @method string inputDate(string $name, string $value = null, array $attributes = [])
+ * @method string inputDateTime(string $name, string $value = null, array $attributes = [])
+ * @method string inputDateTimeLocal(string $name, string $value = null, array $attributes = [])
+ * @method string inputEmail(string $name, string $value = null, array $attributes = [])
+ * @method string inputFile(string $name, string $value = null, array $attributes = [])
+ * @method string inputHidden(string $name, string $value = null, array $attributes = [])
+ * @method string inputImage(string $name, string $value = null, array $attributes = [])
+ * @method string inputInput(string $name, string $value = null, array $attributes = [])
+ * @method string inputMonth(string $name, string $value = null, array $attributes = [])
+ * @method string inputNumeric(string $name, string $value = null, array $attributes = [])
+ * @method string inputPassword(string $name, string $value = null, array $attributes = [])
+ * @method string inputRadio(string $name, string $value = null, array $attributes = [])
+ * @method string inputRange(string $name, string $value = null, array $attributes = [])
+ * @method string inputSearch(string $name, string $value = null, array $attributes = [])
+ * @method string inputSelect(string $name, string $value = null, array $attributes = [])
+ * @method string inputSubmit(string $name, string $value = null, array $attributes = [])
+ * @method string inputTel(string $name, string $value = null, array $attributes = [])
+ * @method string inputText(string $name, string $value = null, array $attributes = [])
+ * @method string inputTextarea(string $name, string $value = null, array $attributes = [])
+ * @method string inputTime(string $name, string $value = null, array $attributes = [])
+ * @method string inputUrl(string $name, string $value = null, array $attributes = [])
+ * @method string inputWeek(string $name, string $value = null, array $attributes = [])
+ * @method string label(string $label, array $attributes = [], bool $raw = false)
+ * @method string link(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string meta(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string ol(string $text, array $attributes = [], bool $raw = false)
+ * @method string script(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string style(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string title(string $indent = '    ', string $delimiter = PHP_EOL)
+ * @method string ul(string $text, array $attributes = [], bool $raw = false)
  */
 class TagFactory extends AbstractFactory
 {
-
     /**
      * @var EscaperInterface
      */
diff --git a/src/Http/Cookie.php b/src/Http/Cookie.php
index 9d7a4c9c..f3e7b36d 100644
--- a/src/Http/Cookie.php
+++ b/src/Http/Cookie.php
@@ -24,7 +24,6 @@
  */
 class Cookie extends AbstractInjectionAware implements \Phalcon\Http\Cookie\CookieInterface
 {
-
     /**
      * @var string
      */
diff --git a/src/Http/Cookie/CookieInterface.php b/src/Http/Cookie/CookieInterface.php
index 1c721616..9d3aecdc 100644
--- a/src/Http/Cookie/CookieInterface.php
+++ b/src/Http/Cookie/CookieInterface.php
@@ -14,8 +14,6 @@
  */
 interface CookieInterface
 {
-
-
     /**
      * Deletes the cookie
      */
diff --git a/src/Http/Cookie/Exception.php b/src/Http/Cookie/Exception.php
index c49334de..d9b2df10 100644
--- a/src/Http/Cookie/Exception.php
+++ b/src/Http/Cookie/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Http/Request.php b/src/Http/Request.php
index 3358f505..903a8a5b 100644
--- a/src/Http/Request.php
+++ b/src/Http/Request.php
@@ -48,7 +48,6 @@
  */
 class Request extends AbstractInjectionAware implements \Phalcon\Http\RequestInterface, \Phalcon\Http\Message\RequestMethodInterface
 {
-
     /**
      * @var FilterInterface|null
      */
@@ -79,20 +78,6 @@ class Request extends AbstractInjectionAware implements \Phalcon\Http\RequestInt
      */
     private $strictHostCheck = false;
 
-    /**
-     * @return bool
-     */
-    public function getHttpMethodParameterOverride(): bool
-    {
-    }
-
-    /**
-     * @param bool $httpMethodParameterOverride
-     */
-    public function setHttpMethodParameterOverride(bool $httpMethodParameterOverride)
-    {
-    }
-
     /**
      * Gets a variable from the $_REQUEST superglobal applying filters if
      * needed. If no parameters are given the $_REQUEST superglobal is returned
@@ -166,6 +151,15 @@ public function getBestLanguage(): string
     {
     }
 
+    /**
+     * Return the HTTP method parameter override flag
+     *
+     * @return bool
+     */
+    public function getHttpMethodParameterOverride(): bool
+    {
+    }
+
     /**
      * Gets the preferred ISO locale variant.
      *
@@ -780,6 +774,17 @@ public function numFiles(bool $onlySuccessful = false): int
     {
     }
 
+    /**
+     * Set the HTTP method parameter override flag
+     *
+     * @param bool $override
+     *
+     * @return Request
+     */
+    public function setHttpMethodParameterOverride(bool $override): Request
+    {
+    }
+
     /**
      * Sets automatic sanitizers/filters for a particular field and for
      * particular methods
diff --git a/src/Http/Request/Exception.php b/src/Http/Request/Exception.php
index 577dea11..5cf4454a 100644
--- a/src/Http/Request/Exception.php
+++ b/src/Http/Request/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Http/Request/File.php b/src/Http/Request/File.php
index 44abbe3b..138aa83f 100644
--- a/src/Http/Request/File.php
+++ b/src/Http/Request/File.php
@@ -34,7 +34,6 @@
  */
 class File implements \Phalcon\Http\Request\FileInterface
 {
-
     /**
      * @var string|null
      */
@@ -75,6 +74,16 @@ class File implements \Phalcon\Http\Request\FileInterface
      */
     protected $type;
 
+    /**
+     * Phalcon\Http\Request\File constructor
+     *
+     * @param array $file
+     * @param mixed $key
+     */
+    public function __construct(array $file, $key = null)
+    {
+    }
+
     /**
      * @return string|null
      */
@@ -96,16 +105,6 @@ public function getKey(): ?string
     {
     }
 
-    /**
-     * Phalcon\Http\Request\File constructor
-     *
-     * @param array $file
-     * @param mixed $key
-     */
-    public function __construct(array $file, $key = null)
-    {
-    }
-
     /**
      * Returns the real name of the uploaded file
      *
diff --git a/src/Http/Request/FileInterface.php b/src/Http/Request/FileInterface.php
index 71e8b029..c380a1a9 100644
--- a/src/Http/Request/FileInterface.php
+++ b/src/Http/Request/FileInterface.php
@@ -10,14 +10,10 @@
 namespace Phalcon\Http\Request;
 
 /**
- * Phalcon\Http\Request\FileInterface
- *
  * Interface for Phalcon\Http\Request\File
  */
 interface FileInterface
 {
-
-
     /**
      * Returns the error if any
      *
diff --git a/src/Http/RequestInterface.php b/src/Http/RequestInterface.php
index 7889267d..f26fe459 100644
--- a/src/Http/RequestInterface.php
+++ b/src/Http/RequestInterface.php
@@ -17,8 +17,6 @@
  */
 interface RequestInterface
 {
-
-
     /**
      * Gets a variable from the $_REQUEST superglobal applying filters if
      * needed. If no parameters are given the $_REQUEST superglobal is returned
diff --git a/src/Http/Response.php b/src/Http/Response.php
index b7a8ec71..592966a5 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -41,7 +41,6 @@
  */
 class Response implements \Phalcon\Http\ResponseInterface, \Phalcon\Di\InjectionAwareInterface, \Phalcon\Events\EventsAwareInterface, \Phalcon\Http\Message\ResponseStatusCodeInterface
 {
-
     /**
      * @var DiInterface|null
      */
diff --git a/src/Http/Response/Cookies.php b/src/Http/Response/Cookies.php
index 570b68c7..fe986b99 100644
--- a/src/Http/Response/Cookies.php
+++ b/src/Http/Response/Cookies.php
@@ -64,7 +64,6 @@
  */
 class Cookies extends AbstractInjectionAware implements \Phalcon\Http\Response\CookiesInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Http/Response/CookiesInterface.php b/src/Http/Response/CookiesInterface.php
index e91712ed..7115e9f5 100644
--- a/src/Http/Response/CookiesInterface.php
+++ b/src/Http/Response/CookiesInterface.php
@@ -18,8 +18,6 @@
  */
 interface CookiesInterface
 {
-
-
     /**
      * Deletes a cookie by its name
      * This method does not removes cookies from the _COOKIE superglobal
diff --git a/src/Http/Response/Exception.php b/src/Http/Response/Exception.php
index f720852f..a3b2b465 100644
--- a/src/Http/Response/Exception.php
+++ b/src/Http/Response/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Http/Response/Headers.php b/src/Http/Response/Headers.php
index f112fdf6..bfc24a82 100644
--- a/src/Http/Response/Headers.php
+++ b/src/Http/Response/Headers.php
@@ -16,7 +16,6 @@
  */
 class Headers implements \Phalcon\Http\Response\HeadersInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Http/Response/HeadersInterface.php b/src/Http/Response/HeadersInterface.php
index 1b18e48d..32948747 100644
--- a/src/Http/Response/HeadersInterface.php
+++ b/src/Http/Response/HeadersInterface.php
@@ -16,8 +16,6 @@
  */
 interface HeadersInterface
 {
-
-
     /**
      * Gets a header value from the internal bag
      *
diff --git a/src/Http/ResponseInterface.php b/src/Http/ResponseInterface.php
index 7948e2f5..137e7083 100644
--- a/src/Http/ResponseInterface.php
+++ b/src/Http/ResponseInterface.php
@@ -19,8 +19,6 @@
  */
 interface ResponseInterface
 {
-
-
     /**
      * Appends a string to the HTTP response body
      *
diff --git a/src/Image/Adapter/AbstractAdapter.php b/src/Image/Adapter/AbstractAdapter.php
index 0a7ad059..252cec91 100644
--- a/src/Image/Adapter/AbstractAdapter.php
+++ b/src/Image/Adapter/AbstractAdapter.php
@@ -17,12 +17,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Image\Adapter\AdapterInterface
 {
-
-    /**
-     * @var bool
-     */
-    protected static $checked = false;
-
     /**
      * @var string
      */
@@ -36,7 +30,7 @@ abstract class AbstractAdapter implements \Phalcon\Image\Adapter\AdapterInterfac
     protected $height;
 
     /**
-     * @var object|null
+     * @var mixed|null
      */
     protected $image = null;
 
@@ -69,122 +63,103 @@ abstract class AbstractAdapter implements \Phalcon\Image\Adapter\AdapterInterfac
     protected $width;
 
     /**
-     * Image height
+     * Set the background color of an image
      *
-     * @return int
-     */
-    public function getHeight(): int
-    {
-    }
-
-    /**
-     * @return object|null
+     * @param string $color
+     * @param int    $opacity
+     *
+     * @return AdapterInterface
      */
-    public function getImage()
+    public function background(string $color, int $opacity = 100): AdapterInterface
     {
     }
 
     /**
-     * Image mime type
+     * Blur image
      *
-     * @return string
+     * @param int $radius
+     *
+     * @return AdapterInterface
      */
-    public function getMime(): string
+    public function blur(int $radius): AdapterInterface
     {
     }
 
     /**
-     * @return string
+     * Crop an image to the given size
+     *
+     * @param int      $width
+     * @param int      $height
+     * @param int|null $offsetX
+     * @param int|null $offsetY
+     *
+     * @return AdapterInterface
      */
-    public function getRealpath(): string
+    public function crop(int $width, int $height, int $offsetX = null, int $offsetY = null): AdapterInterface
     {
     }
 
     /**
-     * Image type
+     * Flip the image along the horizontal or vertical axis
      *
-     * Driver dependent
+     * @param int $direction
      *
-     * @return int
+     * @return AdapterInterface
      */
-    public function getType(): int
+    public function flip(int $direction): AdapterInterface
     {
     }
 
     /**
-     * Image width
-     *
      * @return int
      */
-    public function getWidth(): int
+    public function getHeight(): int
     {
     }
 
     /**
-     * Set the background color of an image
-     *
-     * @param string $color
-     * @param int $opacity
-     * @return AdapterInterface
+     * @return object|null
      */
-    public function background(string $color, int $opacity = 100): AdapterInterface
+    public function getImage()
     {
     }
 
     /**
-     * Blur image
-     *
-     * @param int $radius
-     * @return AdapterInterface
+     * @return string
      */
-    public function blur(int $radius): AdapterInterface
+    public function getMime(): string
     {
     }
 
     /**
-     * Crop an image to the given size
-     *
-     * @param int $width
-     * @param int $height
-     * @param int $offsetX
-     * @param int $offsetY
-     * @return AdapterInterface
+     * @return string
      */
-    public function crop(int $width, int $height, int $offsetX = null, int $offsetY = null): AdapterInterface
+    public function getRealpath(): string
     {
     }
 
     /**
-     * Flip the image along the horizontal or vertical axis
-     *
-     * @param int $direction
-     * @return AdapterInterface
+     * @return int
      */
-    public function flip(int $direction): AdapterInterface
+    public function getType(): int
     {
     }
 
     /**
-     * This method scales the images using liquid rescaling method. Only support
-     * Imagick
-     *
-     * @param int $width   new width
-     * @param int $height  new height
-     * @param int $deltaX How much the seam can traverse on x-axis. Passing 0 causes the seams to be straight.
-     * @param int $rigidity Introduces a bias for non-straight seams. This parameter is typically 0.
-     * @return AbstractAdapter
+     * @return int
      */
-    public function liquidRescale(int $width, int $height, int $deltaX = 0, int $rigidity = 0): AbstractAdapter
+    public function getWidth(): int
     {
     }
 
     /**
      * Composite one image onto another
      *
-     * @param AdapterInterface $watermark
+     * @param AdapterInterface $mask
+     *
      * @return AdapterInterface
      */
-    public function mask(AdapterInterface $watermark): AdapterInterface
+    public function mask(AdapterInterface $mask): AdapterInterface
     {
     }
 
@@ -192,6 +167,7 @@ public function mask(AdapterInterface $watermark): AdapterInterface
      * Pixelate image
      *
      * @param int $amount
+     *
      * @return AdapterInterface
      */
     public function pixelate(int $amount): AdapterInterface
@@ -201,9 +177,10 @@ public function pixelate(int $amount): AdapterInterface
     /**
      * Add a reflection to an image
      *
-     * @param int $height
-     * @param int $opacity
+     * @param int  $height
+     * @param int  $opacity
      * @param bool $fadeIn
+     *
      * @return AdapterInterface
      */
     public function reflection(int $height, int $opacity = 100, bool $fadeIn = false): AdapterInterface
@@ -213,21 +190,24 @@ public function reflection(int $height, int $opacity = 100, bool $fadeIn = false
     /**
      * Render the image and return the binary string
      *
-     * @param string $ext
-     * @param int $quality
+     * @param string|null $extension
+     * @param int         $quality
+     *
      * @return string
      */
-    public function render(string $ext = null, int $quality = 100): string
+    public function render(string $extension = null, int $quality = 100): string
     {
     }
 
     /**
      * Resize the image to the given size
      *
-     * @param int $width
-     * @param int $height
-     * @param int $master
+     * @param int|null $width
+     * @param int|null $height
+     * @param int      $master
+     *
      * @return AdapterInterface
+     * @throws Exception
      */
     public function resize(int $width = null, int $height = null, int $master = Enum::AUTO): AdapterInterface
     {
@@ -237,6 +217,7 @@ public function resize(int $width = null, int $height = null, int $master = Enum
      * Rotate the image by a given amount
      *
      * @param int $degrees
+     *
      * @return AdapterInterface
      */
     public function rotate(int $degrees): AdapterInterface
@@ -246,8 +227,9 @@ public function rotate(int $degrees): AdapterInterface
     /**
      * Save the image
      *
-     * @param string $file
-     * @param int $quality
+     * @param string|null $file
+     * @param int         $quality
+     *
      * @return AdapterInterface
      */
     public function save(string $file = null, int $quality = -1): AdapterInterface
@@ -258,6 +240,7 @@ public function save(string $file = null, int $quality = -1): AdapterInterface
      * Sharpen the image by a given amount
      *
      * @param int $amount
+     *
      * @return AdapterInterface
      */
     public function sharpen(int $amount): AdapterInterface
@@ -267,16 +250,17 @@ public function sharpen(int $amount): AdapterInterface
     /**
      * Add a text to an image with a specified opacity
      *
-     * @param string $text
-     * @param mixed $offsetX
-     * @param mixed $offsetY
-     * @param int $opacity
-     * @param string $color
-     * @param int $size
-     * @param string $fontfile
+     * @param string      $text
+     * @param mixed       $offsetX
+     * @param mixed       $offsetY
+     * @param int         $opacity
+     * @param string      $color
+     * @param int         $size
+     * @param string|null $fontFile
+     *
      * @return AdapterInterface
      */
-    public function text(string $text, $offsetX = false, $offsetY = false, int $opacity = 100, string $color = '000000', int $size = 12, string $fontfile = null): AdapterInterface
+    public function text(string $text, $offsetX = false, $offsetY = false, int $opacity = 100, string $color = '000000', int $size = 12, string $fontFile = null): AdapterInterface
     {
     }
 
@@ -284,12 +268,24 @@ public function text(string $text, $offsetX = false, $offsetY = false, int $opac
      * Add a watermark to an image with the specified opacity
      *
      * @param AdapterInterface $watermark
-     * @param int $offsetX
-     * @param int $offsetY
-     * @param int $opacity
+     * @param int              $offsetX
+     * @param int              $offsetY
+     * @param int              $opacity
+     *
      * @return AdapterInterface
      */
     public function watermark(AdapterInterface $watermark, int $offsetX = 0, int $offsetY = 0, int $opacity = 100): AdapterInterface
     {
     }
+
+    /**
+     * @param int $value
+     * @param int $min
+     * @param int $max
+     *
+     * @return int
+     */
+    protected function checkHighLow(int $value, int $min = 0, int $max = 100): int
+    {
+    }
 }
diff --git a/src/Image/Adapter/AdapterInterface.php b/src/Image/Adapter/AdapterInterface.php
index fbcd6623..f3e6dfc5 100644
--- a/src/Image/Adapter/AdapterInterface.php
+++ b/src/Image/Adapter/AdapterInterface.php
@@ -16,107 +16,147 @@
  */
 interface AdapterInterface
 {
-
-
     /**
+     * Add a background to an image
+     *
      * @param string $color
-     * @param int $opacity
+     * @param int    $opacity
+     *
      * @return AdapterInterface
      */
     public function background(string $color, int $opacity = 100): AdapterInterface;
 
     /**
+     * Blur an image
+     *
      * @param int $radius
+     *
      * @return AdapterInterface
      */
     public function blur(int $radius): AdapterInterface;
 
     /**
-     * @param int $width
-     * @param int $height
-     * @param int $offsetX
-     * @param int $offsetY
+     * Crop an image
+     *
+     * @param int      $width
+     * @param int      $height
+     * @param int|null $offsetX
+     * @param int|null $offsetY
+     *
      * @return AdapterInterface
      */
     public function crop(int $width, int $height, int $offsetX = null, int $offsetY = null): AdapterInterface;
 
     /**
+     * Flip an image
+     *
      * @param int $direction
+     *
      * @return AdapterInterface
      */
     public function flip(int $direction): AdapterInterface;
 
     /**
-     * @param AdapterInterface $watermark
+     * Add a mask to an image
+     *
+     * @param AdapterInterface $mask
+     *
      * @return AdapterInterface
      */
-    public function mask(AdapterInterface $watermark): AdapterInterface;
+    public function mask(AdapterInterface $mask): AdapterInterface;
 
     /**
+     * Pixelate an image
+     *
      * @param int $amount
+     *
      * @return AdapterInterface
      */
     public function pixelate(int $amount): AdapterInterface;
 
     /**
-     * @param int $height
-     * @param int $opacity
+     * Reflect an image
+     *
+     * @param int  $height
+     * @param int  $opacity
      * @param bool $fadeIn
+     *
      * @return AdapterInterface
      */
     public function reflection(int $height, int $opacity = 100, bool $fadeIn = false): AdapterInterface;
 
     /**
-     * @param string $ext
-     * @param int $quality
+     * Render an image
+     *
+     * @param string|null $extension
+     * @param int         $quality
+     *
      * @return string
      */
-    public function render(string $ext = null, int $quality = 100): string;
+    public function render(string $extension = null, int $quality = 100): string;
 
     /**
-     * @param int $width
-     * @param int $height
-     * @param int $master
+     * Resize an image
+     *
+     * @param int|null $width
+     * @param int|null $height
+     * @param int      $master
+     *
      * @return AdapterInterface
      */
     public function resize(int $width = null, int $height = null, int $master = Enum::AUTO): AdapterInterface;
 
     /**
+     * Rotate an image
+     *
      * @param int $degrees
+     *
      * @return AdapterInterface
      */
     public function rotate(int $degrees): AdapterInterface;
 
     /**
-     * @param string $file
-     * @param int $quality
+     * Save an image
+     *
+     * @param string|null $file
+     * @param int         $quality
+     *
      * @return AdapterInterface
      */
     public function save(string $file = null, int $quality = 100): AdapterInterface;
 
     /**
+     * Sharpen an image
+     *
      * @param int $amount
+     *
      * @return AdapterInterface
      */
     public function sharpen(int $amount): AdapterInterface;
 
     /**
-     * @param string $text
-     * @param int $offsetX
-     * @param int $offsetY
-     * @param int $opacity
-     * @param string $color
-     * @param int $size
-     * @param string $fontfile
+     * Adds text on an image
+     *
+     * @param string      $text
+     * @param int         $offsetX
+     * @param int         $offsetY
+     * @param int         $opacity
+     * @param string      $color
+     * @param int         $size
+     * @param string|null $fontFile
+     *
      * @return AdapterInterface
      */
-    public function text(string $text, int $offsetX = 0, int $offsetY = 0, int $opacity = 100, string $color = '000000', int $size = 12, string $fontfile = null): AdapterInterface;
+    public function text(string $text, int $offsetX = 0, int $offsetY = 0, int $opacity = 100, string $color = '000000', int $size = 12, string $fontFile = null): AdapterInterface;
 
     /**
+     * Add a watermark on an image
+     *
      * @param AdapterInterface $watermark
-     * @param int $offsetX
-     * @param int $offsetY
-     * @param int $opacity
+     * @param int              $offsetX
+     * @param int              $offsetY
+     * @param int              $opacity
+     *
      * @return AdapterInterface
      */
     public function watermark(AdapterInterface $watermark, int $offsetX = 0, int $offsetY = 0, int $opacity = 100): AdapterInterface;
diff --git a/src/Image/Adapter/Gd.php b/src/Image/Adapter/Gd.php
index e27c0076..3d0d711a 100644
--- a/src/Image/Adapter/Gd.php
+++ b/src/Image/Adapter/Gd.php
@@ -22,59 +22,58 @@
  */
 class Gd extends \Phalcon\Image\Adapter\AbstractAdapter
 {
-
-    /**
-     * @var bool
-     */
-    protected static $checked = false;
-
     /**
-     * @param string $file
-     * @param int $width
-     * @param int $height
+     * @param string   $file
+     * @param int|null $width
+     * @param int|null $height
+     *
+     * @throws Exception
      */
     public function __construct(string $file, int $width = null, int $height = null)
     {
     }
 
-    public function __destruct()
-    {
-    }
-
     /**
-     * @return bool
+     * Destructor
      */
-    public static function check(): bool
+    public function __destruct()
     {
     }
 
     /**
      * @return string
+     * @throws Exception
      */
-    public static function getVersion(): string
+    public function getVersion(): string
     {
     }
 
     /**
-     * @param int $r
-     * @param int $g
-     * @param int $b
+     * @param int $red
+     * @param int $green
+     * @param int $blue
      * @param int $opacity
+     *
+     * @return void
      */
-    protected function processBackground(int $r, int $g, int $b, int $opacity)
+    protected function processBackground(int $red, int $green, int $blue, int $opacity): void
     {
     }
 
     /**
      * @param int $radius
+     *
+     * @return void
      */
-    protected function processBlur(int $radius)
+    protected function processBlur(int $radius): void
     {
     }
 
     /**
      * @param int $width
      * @param int $height
+     *
+     * @return false|resource
      */
     protected function processCreate(int $width, int $height)
     {
@@ -85,20 +84,26 @@ protected function processCreate(int $width, int $height)
      * @param int $height
      * @param int $offsetX
      * @param int $offsetY
+     *
+     * @return void
      */
-    protected function processCrop(int $width, int $height, int $offsetX, int $offsetY)
+    protected function processCrop(int $width, int $height, int $offsetX, int $offsetY): void
     {
     }
 
     /**
      * @param int $direction
+     *
+     * @return void
      */
-    protected function processFlip(int $direction)
+    protected function processFlip(int $direction): void
     {
     }
 
     /**
      * @param AdapterInterface $mask
+     *
+     * @return void
      */
     protected function processMask(AdapterInterface $mask)
     {
@@ -106,70 +111,89 @@ protected function processMask(AdapterInterface $mask)
 
     /**
      * @param int $amount
+     *
+     * @return void
      */
-    protected function processPixelate(int $amount)
+    protected function processPixelate(int $amount): void
     {
     }
 
     /**
-     * @param int $height
-     * @param int $opacity
+     * @param int  $height
+     * @param int  $opacity
      * @param bool $fadeIn
+     *
+     * @return void
      */
-    protected function processReflection(int $height, int $opacity, bool $fadeIn)
+    protected function processReflection(int $height, int $opacity, bool $fadeIn): void
     {
     }
 
     /**
-     * @param string $ext
-     * @param int $quality
+     * @param string $extension
+     * @param int    $quality
+     *
+     * @return false|string
+     * @throws Exception
      */
-    protected function processRender(string $ext, int $quality)
+    protected function processRender(string $extension, int $quality)
     {
     }
 
     /**
      * @param int $width
      * @param int $height
+     *
+     * @return void
      */
-    protected function processResize(int $width, int $height)
+    protected function processResize(int $width, int $height): void
     {
     }
 
     /**
      * @param int $degrees
+     *
+     * @return void
      */
-    protected function processRotate(int $degrees)
+    protected function processRotate(int $degrees): void
     {
     }
 
     /**
      * @param string $file
-     * @param int $quality
+     * @param int    $quality
+     *
+     * @return bool
+     * @throws Exception
      */
-    protected function processSave(string $file, int $quality)
+    protected function processSave(string $file, int $quality): bool
     {
     }
 
     /**
      * @param int $amount
+     *
+     * @return void
      */
-    protected function processSharpen(int $amount)
+    protected function processSharpen(int $amount): void
     {
     }
 
     /**
-     * @param string $text
-     * @param int $offsetX
-     * @param int $offsetY
-     * @param int $opacity
-     * @param int $r
-     * @param int $g
-     * @param int $b
-     * @param int $size
-     * @param string $fontfile
+     * @param string      $text
+     * @param mixed       $offsetX
+     * @param mixed       $offsetY
+     * @param int         $opacity
+     * @param int         $red
+     * @param int         $green
+     * @param int         $blue
+     * @param int         $size
+     * @param string|null $fontFile
+     *
+     * @return void
+     * @throws Exception
      */
-    protected function processText(string $text, int $offsetX, int $offsetY, int $opacity, int $r, int $g, int $b, int $size, string $fontfile)
+    protected function processText(string $text, $offsetX, $offsetY, int $opacity, int $red, int $green, int $blue, int $size, string $fontFile = null): void
     {
     }
 
@@ -178,8 +202,19 @@ protected function processText(string $text, int $offsetX, int $offsetY, int $op
      * @param int $offsetX
      * @param int $offsetY
      * @param int $opacity
+     * @return void
+     */
+    protected function processWatermark(AdapterInterface $watermark, int $offsetX, int $offsetY, int $opacity): void
+    {
+    }
+
+    /**
+     * Checks the installed version of GD
+     *
+     * @return void
+     * @throws Exception
      */
-    protected function processWatermark(AdapterInterface $watermark, int $offsetX, int $offsetY, int $opacity)
+    private function check(): void
     {
     }
 }
diff --git a/src/Image/Adapter/Imagick.php b/src/Image/Adapter/Imagick.php
index d0fae2cd..d10525e1 100644
--- a/src/Image/Adapter/Imagick.php
+++ b/src/Image/Adapter/Imagick.php
@@ -9,13 +9,19 @@
  */
 namespace Phalcon\Image\Adapter;
 
+use Imagick as ImagickNative;
+use ImagickDraw;
+use ImagickDrawException;
+use ImagickException;
+use ImagickPixel;
+use ImagickPixelException;
 use Phalcon\Image\Enum;
 use Phalcon\Image\Exception;
 
 /**
  * Phalcon\Image\Adapter\Imagick
  *
- * Image manipulation support. Allows images to be resized, cropped, etc.
+ * Image manipulation support. Resize, rotate, crop etc.
  *
  * ```php
  * $image = new \Phalcon\Image\Adapter\Imagick("upload/test.jpg");
@@ -29,23 +35,20 @@
  */
 class Imagick extends \Phalcon\Image\Adapter\AbstractAdapter
 {
-
-    /**
-     * @var bool
-     */
-    protected static $checked = false;
-
     /**
      * @var int
      */
-    protected static $version = 0;
+    protected $version = 0;
 
     /**
-     * \Phalcon\Image\Adapter\Imagick constructor
+     * Constructor
      *
-     * @param string $file
-     * @param int $width
-     * @param int $height
+     * @param string   $file
+     * @param int|null $width
+     * @param int|null $height
+     *
+     * @throws Exception
+     * @throws ImagickException
      */
     public function __construct(string $file, int $width = null, int $height = null)
     {
@@ -59,30 +62,35 @@ public function __destruct()
     }
 
     /**
-     * Checks if Imagick is enabled
+     * This method scales the images using liquid rescaling method. Only support
+     * Imagick
      *
-     * @return bool
-     */
-    public static function check(): bool
-    {
-    }
-
-    /**
-     * Get instance
+     * @param int $width    new width
+     * @param int $height   new height
+     * @param int $deltaX   How much the seam can traverse on x-axis. Passing
+     *                      0 causes the seams to be straight.
+     * @param int $rigidity Introduces a bias for non-straight seams. This
+     *                      parameter is typically 0.
      *
-     * @return \Imagick
+     * @return AbstractAdapter
+     * @throws Exception
+     * @throws ImagickException
      */
-    public function getInternalImInstance(): \Imagick
+    public function liquidRescale(int $width, int $height, int $deltaX = 0, int $rigidity = 0): AbstractAdapter
     {
     }
 
     /**
      * Sets the limit for a particular resource in megabytes
      *
-     * @link http://php.net/manual/ru/imagick.constants.php#imagick.constants.resourcetypes
      * @param int $type
      * @param int $limit
+     *
      * @return void
+     * @throws Exception
+     * @throws ImagickException
+     *
+     * @link https://www.php.net/manual/en/imagick.constants.php#imagick.constants.resourcetypes
      */
     public function setResourceLimit(int $type, int $limit): void
     {
@@ -91,13 +99,17 @@ public function setResourceLimit(int $type, int $limit): void
     /**
      * Execute a background.
      *
-     * @param int $r
-     * @param int $g
-     * @param int $b
+     * @param int $red
+     * @param int $green
+     * @param int $blue
      * @param int $opacity
+     *
      * @return void
+     * @throws Exception
+     * @throws ImagickException
+     * @throws ImagickPixelException
      */
-    protected function processBackground(int $r, int $g, int $b, int $opacity): void
+    protected function processBackground(int $red, int $green, int $blue, int $opacity): void
     {
     }
 
@@ -105,7 +117,9 @@ protected function processBackground(int $r, int $g, int $b, int $opacity): void
      * Blur image
      *
      * @param int $radius Blur radius
+     *
      * @return void
+     * @throws ImagickException
      */
     protected function processBlur(int $radius): void
     {
@@ -118,7 +132,9 @@ protected function processBlur(int $radius): void
      * @param int $height
      * @param int $offsetX
      * @param int $offsetY
+     *
      * @return void
+     * @throws ImagickException
      */
     protected function processCrop(int $width, int $height, int $offsetX, int $offsetY): void
     {
@@ -128,23 +144,11 @@ protected function processCrop(int $width, int $height, int $offsetX, int $offse
      * Execute a flip.
      *
      * @param int $direction
-     * @return void
-     */
-    protected function processFlip(int $direction): void
-    {
-    }
-
-    /**
-     * This method scales the images using liquid rescaling method. Only support
-     * Imagick
      *
-     * @param int $width   new width
-     * @param int $height  new height
-     * @param int $deltaX How much the seam can traverse on x-axis. Passing 0 causes the seams to be straight.
-     * @param int $rigidity Introduces a bias for non-straight seams. This parameter is typically 0.
      * @return void
+     * @throws ImagickException
      */
-    protected function processLiquidRescale(int $width, int $height, int $deltaX, int $rigidity): void
+    protected function processFlip(int $direction): void
     {
     }
 
@@ -152,7 +156,10 @@ protected function processLiquidRescale(int $width, int $height, int $deltaX, in
      * Composite one image onto another
      *
      * @param AdapterInterface $image
+     *
      * @return void
+     * @throws Exception
+     * @throws ImagickException
      */
     protected function processMask(AdapterInterface $image): void
     {
@@ -162,7 +169,9 @@ protected function processMask(AdapterInterface $image): void
      * Pixelate image
      *
      * @param int $amount amount to pixelate
+     *
      * @return void
+     * @throws ImagickException
      */
     protected function processPixelate(int $amount): void
     {
@@ -171,10 +180,13 @@ protected function processPixelate(int $amount): void
     /**
      * Execute a reflection.
      *
-     * @param int $height
-     * @param int $opacity
+     * @param int  $height
+     * @param int  $opacity
      * @param bool $fadeIn
+     *
      * @return void
+     * @throws Exception
+     * @throws ImagickException
      */
     protected function processReflection(int $height, int $opacity, bool $fadeIn): void
     {
@@ -184,8 +196,10 @@ protected function processReflection(int $height, int $opacity, bool $fadeIn): v
      * Execute a render.
      *
      * @param string $extension
-     * @param int $quality
+     * @param int    $quality
+     *
      * @return string
+     * @throws ImagickException
      */
     protected function processRender(string $extension, int $quality): string
     {
@@ -196,7 +210,9 @@ protected function processRender(string $extension, int $quality): string
      *
      * @param int $width
      * @param int $height
+     *
      * @return void
+     * @throws ImagickException
      */
     protected function processResize(int $width, int $height): void
     {
@@ -206,7 +222,9 @@ protected function processResize(int $width, int $height): void
      * Execute a rotation.
      *
      * @param int $degrees
+     *
      * @return void
+     * @throws ImagickException
      */
     protected function processRotate(int $degrees): void
     {
@@ -216,8 +234,10 @@ protected function processRotate(int $degrees): void
      * Execute a save.
      *
      * @param string $file
-     * @param int $quality
+     * @param int    $quality
+     *
      * @return void
+     * @throws ImagickException
      */
     protected function processSave(string $file, int $quality): void
     {
@@ -227,37 +247,59 @@ protected function processSave(string $file, int $quality): void
      * Execute a sharpen.
      *
      * @param int $amount
+     *
+     * @return void
+     * @throws ImagickException
      */
-    protected function processSharpen(int $amount)
+    protected function processSharpen(int $amount): void
     {
     }
 
     /**
      * Execute a text
      *
-     * @param string $text
-     * @param mixed $offsetX
-     * @param mixed $offsetY
-     * @param int $opacity
-     * @param int $r
-     * @param int $g
-     * @param int $b
-     * @param int $size
-     * @param string $fontfile
+     * @param string      $text
+     * @param mixed       $offsetX
+     * @param mixed       $offsetY
+     * @param int         $opacity
+     * @param int         $red
+     * @param int         $green
+     * @param int         $blue
+     * @param int         $size
+     * @param string|null $fontFile
+     *
+     * @return void
+     * @throws ImagickDrawException
+     * @throws ImagickException
+     * @throws ImagickPixelException
      */
-    protected function processText(string $text, $offsetX, $offsetY, int $opacity, int $r, int $g, int $b, int $size, string $fontfile)
+    protected function processText(string $text, $offsetX, $offsetY, int $opacity, int $red, int $green, int $blue, int $size, string $fontFile = null): void
     {
     }
 
     /**
-     * Execute a watermarking.
+     * Add Watermark
      *
      * @param AdapterInterface $image
-     * @param int $offsetX
-     * @param int $offsetY
-     * @param int $opacity
+     * @param int              $offsetX
+     * @param int              $offsetY
+     * @param int              $opacity
+     *
+     * @return void
+     * @throws Exception
+     * @throws ImagickException
+     */
+    protected function processWatermark(AdapterInterface $image, int $offsetX, int $offsetY, int $opacity): void
+    {
+    }
+
+    /**
+     * Checks if Imagick is enabled
+     *
+     * @return void
+     * @throws Exception
      */
-    protected function processWatermark(AdapterInterface $image, int $offsetX, int $offsetY, int $opacity)
+    private function check(): void
     {
     }
 }
diff --git a/src/Image/Exception.php b/src/Image/Exception.php
index c58c65a6..62c40c6e 100644
--- a/src/Image/Exception.php
+++ b/src/Image/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Image/ImageFactory.php b/src/Image/ImageFactory.php
index 9a7a03dd..01482b5e 100644
--- a/src/Image/ImageFactory.php
+++ b/src/Image/ImageFactory.php
@@ -22,8 +22,6 @@
  */
 class ImageFactory extends AbstractFactory
 {
-
-
     /**
      * Constructor
      *
diff --git a/src/Logger/AbstractLogger.php b/src/Logger/AbstractLogger.php
index d2c08e38..22fa9d03 100644
--- a/src/Logger/AbstractLogger.php
+++ b/src/Logger/AbstractLogger.php
@@ -18,13 +18,11 @@
 /**
  * Abstract Logger Class
  *
- * A PSR compatible logger, with various adapters and formatters. A formatter
- * interface is available as well as an adapter one. Adapters can be created
- * easily using the built in AdapterFactory. A LoggerFactory is also available
- * that allows developers to create new instances of the Logger or load them
- * from config files (see Phalcon\Config\Config object).
- *
- * @package Phalcon\Logger
+ * Abstract logger class, providing common functionality. A formatter interface
+ * is available as well as an adapter one. Adapters can be created easily using
+ * the built in AdapterFactory. A LoggerFactory is also available that allows
+ * developers to create new instances of the Logger or load them from config
+ * files (see Phalcon\Config\Config object).
  *
  * @property AdapterInterface[] $adapters
  * @property array              $excluded
diff --git a/src/Logger/Adapter/AbstractAdapter.php b/src/Logger/Adapter/AbstractAdapter.php
index 1a616e38..061c78be 100644
--- a/src/Logger/Adapter/AbstractAdapter.php
+++ b/src/Logger/Adapter/AbstractAdapter.php
@@ -24,7 +24,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Logger\Adapter\AdapterInterface
 {
-
     /**
      * Name of the default formatter class
      *
diff --git a/src/Logger/Adapter/AdapterInterface.php b/src/Logger/Adapter/AdapterInterface.php
index a33709f9..6708603c 100644
--- a/src/Logger/Adapter/AdapterInterface.php
+++ b/src/Logger/Adapter/AdapterInterface.php
@@ -19,8 +19,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Adds a message in the queue
      *
diff --git a/src/Logger/Adapter/Noop.php b/src/Logger/Adapter/Noop.php
index 54995ee7..e8d37ca9 100644
--- a/src/Logger/Adapter/Noop.php
+++ b/src/Logger/Adapter/Noop.php
@@ -18,8 +18,6 @@
  */
 class Noop extends \Phalcon\Logger\Adapter\AbstractAdapter
 {
-
-
     /**
      * Closes the stream
      *
diff --git a/src/Logger/Adapter/Stream.php b/src/Logger/Adapter/Stream.php
index f4da8091..3399b0c7 100644
--- a/src/Logger/Adapter/Stream.php
+++ b/src/Logger/Adapter/Stream.php
@@ -28,21 +28,12 @@
  * $logger->close();
  * ```
  *
- * @property resource|null $handler
  * @property string        $mode
  * @property string        $name
  * @property array         $options
  */
 class Stream extends \Phalcon\Logger\Adapter\AbstractAdapter
 {
-
-    /**
-     * Stream handler resource
-     *
-     * @var resource|null
-     */
-    protected $handler = null;
-
     /**
      * The file open mode. Defaults to 'ab'
      *
@@ -64,15 +55,6 @@ class Stream extends \Phalcon\Logger\Adapter\AbstractAdapter
      */
     protected $options;
 
-    /**
-     * Stream name
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-    }
-
     /**
      * Stream constructor.
      *
@@ -94,6 +76,15 @@ public function close(): bool
     {
     }
 
+    /**
+     * Stream name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+    }
+
     /**
      * Processes the message i.e. writes it to the file
      *
diff --git a/src/Logger/Adapter/Syslog.php b/src/Logger/Adapter/Syslog.php
index cea30f6f..99b81825 100644
--- a/src/Logger/Adapter/Syslog.php
+++ b/src/Logger/Adapter/Syslog.php
@@ -24,7 +24,6 @@
  */
 class Syslog extends \Phalcon\Logger\Adapter\AbstractAdapter
 {
-
     /**
      * @var int
      */
diff --git a/src/Logger/AdapterFactory.php b/src/Logger/AdapterFactory.php
index ba838d18..79211162 100644
--- a/src/Logger/AdapterFactory.php
+++ b/src/Logger/AdapterFactory.php
@@ -18,8 +18,6 @@
  */
 class AdapterFactory extends AbstractFactory
 {
-
-
     /**
      * AdapterFactory constructor.
      *
diff --git a/src/Logger/Exception.php b/src/Logger/Exception.php
index ab9dc1ff..a8140864 100644
--- a/src/Logger/Exception.php
+++ b/src/Logger/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Logger/Formatter/AbstractFormatter.php b/src/Logger/Formatter/AbstractFormatter.php
index be8663b5..b2201695 100644
--- a/src/Logger/Formatter/AbstractFormatter.php
+++ b/src/Logger/Formatter/AbstractFormatter.php
@@ -9,17 +9,15 @@
  */
 namespace Phalcon\Logger\Formatter;
 
+use DateTimeImmutable;
 use Phalcon\Logger\Item;
 use Phalcon\Support\Helper\Str\AbstractStr;
 
 /**
  * Class AbstractFormatter
- *
- * @property string $dateFormat
  */
 abstract class AbstractFormatter extends AbstractStr implements \Phalcon\Logger\Formatter\FormatterInterface
 {
-
     /**
      * Default date format
      *
@@ -28,7 +26,7 @@ abstract class AbstractFormatter extends AbstractStr implements \Phalcon\Logger\
     protected $dateFormat = 'c';
 
     /**
-     * Default date format
+     * Return the default date format
      *
      * @return string
      */
@@ -37,22 +35,24 @@ public function getDateFormat(): string
     }
 
     /**
-     * Default date format
+     * Returns the date formatted for the logger.
+     *
+     * @param Item $item
      *
-     * @param string $dateFormat
+     * @return string
      */
-    public function setDateFormat(string $dateFormat)
+    protected function getFormattedDate(\Phalcon\Logger\Item $item): string
     {
     }
 
     /**
-     * Returns the date formatted for the logger.
+     * Set the default date format
      *
-     * @param Item $item
+     * @param string $format
      *
-     * @return string
+     * @return void
      */
-    protected function getFormattedDate(\Phalcon\Logger\Item $item): string
+    public function setDateFormat(string $format): void
     {
     }
 }
diff --git a/src/Logger/Formatter/FormatterInterface.php b/src/Logger/Formatter/FormatterInterface.php
index 4e301ecc..84304b33 100644
--- a/src/Logger/Formatter/FormatterInterface.php
+++ b/src/Logger/Formatter/FormatterInterface.php
@@ -18,8 +18,6 @@
  */
 interface FormatterInterface
 {
-
-
     /**
      * Applies a format to an item
      *
diff --git a/src/Logger/Formatter/Json.php b/src/Logger/Formatter/Json.php
index 8ce2d13c..7c44bc01 100644
--- a/src/Logger/Formatter/Json.php
+++ b/src/Logger/Formatter/Json.php
@@ -13,14 +13,10 @@
 use Phalcon\Logger\Item;
 
 /**
- * Phalcon\Logger\Formatter\Json
- *
  * Formats messages using JSON encoding
  */
 class Json extends \Phalcon\Logger\Formatter\AbstractFormatter
 {
-
-
     /**
      * Json constructor.
      *
diff --git a/src/Logger/Formatter/Line.php b/src/Logger/Formatter/Line.php
index f6bcbc10..4dc53b39 100644
--- a/src/Logger/Formatter/Line.php
+++ b/src/Logger/Formatter/Line.php
@@ -14,12 +14,9 @@
 
 /**
  * Class Line
- *
- * @property string $format
  */
 class Line extends \Phalcon\Logger\Formatter\AbstractFormatter
 {
-
     /**
      * Format applied to each message
      *
@@ -28,42 +25,44 @@ class Line extends \Phalcon\Logger\Formatter\AbstractFormatter
     protected $format;
 
     /**
-     * Format applied to each message
+     * Line constructor.
      *
-     * @return string
+     * @param string $format
+     * @param string $dateFormat
      */
-    public function getFormat(): string
+    public function __construct(string $format = '[%date%][%level%] %message%', string $dateFormat = 'c')
     {
     }
 
     /**
-     * Format applied to each message
+     * Applies a format to a message before sent it to the internal log
      *
-     * @param string $format
+     * @param Item $item
+     *
+     * @return string
+     * @throws Exception
      */
-    public function setFormat(string $format)
+    public function format(\Phalcon\Logger\Item $item): string
     {
     }
 
     /**
-     * Line constructor.
+     * Return the format applied to each message
      *
-     * @param string $format
-     * @param string $dateFormat
+     * @return string
      */
-    public function __construct(string $format = '[%date%][%level%] %message%', string $dateFormat = 'c')
+    public function getFormat(): string
     {
     }
 
     /**
-     * Applies a format to a message before sent it to the internal log
+     * Set the format applied to each message
      *
-     * @param Item $item
+     * @param string $format
      *
-     * @return string
-     * @throws Exception
+     * @return Line
      */
-    public function format(\Phalcon\Logger\Item $item): string
+    public function setFormat(string $format): Line
     {
     }
 }
diff --git a/src/Logger/Item.php b/src/Logger/Item.php
index 8d56a9e1..22dcbf36 100644
--- a/src/Logger/Item.php
+++ b/src/Logger/Item.php
@@ -24,12 +24,16 @@
  */
 class Item
 {
-
     /**
      * @var array
      */
     protected $context = [];
 
+    /**
+     * @var DateTimeImmutable
+     */
+    protected $dateTime;
+
     /**
      * @var string
      */
@@ -46,56 +50,51 @@ class Item
     protected $levelName;
 
     /**
-     * @var DateTimeImmutable
-     */
-    protected $dateTime;
-
-    /**
-     * @return array
+     * Item constructor.
+     *
+     * @param string            $message
+     * @param string            $levelName
+     * @param int               $level
+     * @param DateTimeImmutable $datetime
+     * @param array             $context
+     * @param \DateTimeImmutable $dateTime
      */
-    public function getContext(): array
+    public function __construct(string $message, string $levelName, int $level, \DateTimeImmutable $dateTime, array $context = [])
     {
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function getMessage(): string
+    public function getContext(): array
     {
     }
 
     /**
-     * @return int
+     * @return DateTimeImmutable
      */
-    public function getLevel(): int
+    public function getDateTime(): DateTimeImmutable
     {
     }
 
     /**
      * @return string
      */
-    public function getLevelName(): string
+    public function getMessage(): string
     {
     }
 
     /**
-     * @return mixed
+     * @return int
      */
-    public function getDateTime()
+    public function getLevel(): int
     {
     }
 
     /**
-     * Item constructor.
-     *
-     * @param string            $message
-     * @param string            $levelName
-     * @param int               $level
-     * @param DateTimeImmutable $datetime
-     * @param array             $context
-     * @param \DateTimeImmutable $dateTime
+     * @return string
      */
-    public function __construct(string $message, string $levelName, int $level, \DateTimeImmutable $dateTime, array $context = [])
+    public function getLevelName(): string
     {
     }
 }
diff --git a/src/Logger/Logger.php b/src/Logger/Logger.php
index 28e235c1..406f55bf 100644
--- a/src/Logger/Logger.php
+++ b/src/Logger/Logger.php
@@ -23,8 +23,6 @@
  */
 class Logger extends \Phalcon\Logger\AbstractLogger implements \Phalcon\Logger\LoggerInterface
 {
-
-
     /**
      * Action must be taken immediately.
      *
diff --git a/src/Logger/LoggerFactory.php b/src/Logger/LoggerFactory.php
index e5666e9e..3a6ee3a3 100644
--- a/src/Logger/LoggerFactory.php
+++ b/src/Logger/LoggerFactory.php
@@ -18,7 +18,6 @@
  */
 class LoggerFactory extends AbstractConfigFactory
 {
-
     /**
      * @var AdapterFactory
      */
diff --git a/src/Logger/LoggerInterface.php b/src/Logger/LoggerInterface.php
index 43d76b75..73f371db 100644
--- a/src/Logger/LoggerInterface.php
+++ b/src/Logger/LoggerInterface.php
@@ -16,8 +16,6 @@
  */
 interface LoggerInterface
 {
-
-
     /**
      * Action must be taken immediately.
      *
diff --git a/src/Messages/Exception.php b/src/Messages/Exception.php
index 2fdcd7dc..d1c77612 100644
--- a/src/Messages/Exception.php
+++ b/src/Messages/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Messages/Message.php b/src/Messages/Message.php
index fbeca888..99f7078a 100644
--- a/src/Messages/Message.php
+++ b/src/Messages/Message.php
@@ -18,7 +18,6 @@
  */
 class Message implements \Phalcon\Messages\MessageInterface, \JsonSerializable
 {
-
     /**
      * @var int
      */
@@ -45,59 +44,59 @@ class Message implements \Phalcon\Messages\MessageInterface, \JsonSerializable
     protected $metaData = [];
 
     /**
-     * @return int
+     * Phalcon\Messages\Message constructor
+     *
+     * @param string $message
+     * @param mixed $field
+     * @param string $type
+     * @param int $code
+     * @param array $metaData
      */
-    public function getCode(): int
+    public function __construct(string $message, $field = '', string $type = '', int $code = 0, array $metaData = [])
     {
     }
 
     /**
+     * Magic __toString method returns verbose message
+     *
      * @return string
      */
-    public function getField(): string
+    public function __toString(): string
     {
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getMessage(): string
+    public function getCode(): int
     {
     }
 
     /**
      * @return string
      */
-    public function getType(): string
+    public function getField(): string
     {
     }
 
     /**
-     * @return array
+     * @return string
      */
-    public function getMetaData(): array
+    public function getMessage(): string
     {
     }
 
     /**
-     * Phalcon\Messages\Message constructor
-     *
-     * @param string $message
-     * @param mixed $field
-     * @param string $type
-     * @param int $code
-     * @param array $metaData
+     * @return string
      */
-    public function __construct(string $message, $field = '', string $type = '', int $code = 0, array $metaData = [])
+    public function getType(): string
     {
     }
 
     /**
-     * Magic __toString method returns verbose message
-     *
-     * @return string
+     * @return array
      */
-    public function __toString(): string
+    public function getMetaData(): array
     {
     }
 
diff --git a/src/Messages/MessageInterface.php b/src/Messages/MessageInterface.php
index 8f933505..8c399289 100644
--- a/src/Messages/MessageInterface.php
+++ b/src/Messages/MessageInterface.php
@@ -16,8 +16,6 @@
  */
 interface MessageInterface
 {
-
-
     /**
      * Magic __toString method returns verbose message
      *
diff --git a/src/Messages/Messages.php b/src/Messages/Messages.php
index e3c16a7f..c8c8dbda 100644
--- a/src/Messages/Messages.php
+++ b/src/Messages/Messages.php
@@ -19,7 +19,6 @@
  */
 class Messages implements \ArrayAccess, \Countable, \Iterator, \JsonSerializable
 {
-
     /**
      * @var int
      */
diff --git a/src/Mvc/Application.php b/src/Mvc/Application.php
index fffd7069..8efa9900 100644
--- a/src/Mvc/Application.php
+++ b/src/Mvc/Application.php
@@ -66,7 +66,6 @@
  */
 class Application extends AbstractApplication
 {
-
     /**
      * @var bool
      */
diff --git a/src/Mvc/Application/Exception.php b/src/Mvc/Application/Exception.php
index 4700108c..6a006020 100644
--- a/src/Mvc/Application/Exception.php
+++ b/src/Mvc/Application/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Phalcon\Application\Exception
 {
-
-
 }
diff --git a/src/Mvc/Controller.php b/src/Mvc/Controller.php
index e176287e..2ecac9fa 100644
--- a/src/Mvc/Controller.php
+++ b/src/Mvc/Controller.php
@@ -53,8 +53,6 @@
  */
 abstract class Controller extends Injectable implements \Phalcon\Mvc\ControllerInterface
 {
-
-
     /**
      * Phalcon\Mvc\Controller constructor
      */
diff --git a/src/Mvc/Controller/BindModelInterface.php b/src/Mvc/Controller/BindModelInterface.php
index ac28883c..79c5028c 100644
--- a/src/Mvc/Controller/BindModelInterface.php
+++ b/src/Mvc/Controller/BindModelInterface.php
@@ -16,8 +16,6 @@
  */
 interface BindModelInterface
 {
-
-
     /**
      * Return the model name associated with this controller
      *
diff --git a/src/Mvc/ControllerInterface.php b/src/Mvc/ControllerInterface.php
index 4f6520f8..751aed4d 100644
--- a/src/Mvc/ControllerInterface.php
+++ b/src/Mvc/ControllerInterface.php
@@ -16,6 +16,4 @@
  */
 interface ControllerInterface
 {
-
-
 }
diff --git a/src/Mvc/Dispatcher.php b/src/Mvc/Dispatcher.php
index 9e72f442..9b0c4b55 100644
--- a/src/Mvc/Dispatcher.php
+++ b/src/Mvc/Dispatcher.php
@@ -36,7 +36,6 @@
  */
 class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phalcon\Mvc\DispatcherInterface
 {
-
     protected $defaultAction = 'index';
 
     protected $defaultHandler = 'index';
diff --git a/src/Mvc/Dispatcher/Exception.php b/src/Mvc/Dispatcher/Exception.php
index 10ef575a..363eed95 100644
--- a/src/Mvc/Dispatcher/Exception.php
+++ b/src/Mvc/Dispatcher/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Phalcon\Dispatcher\Exception
 {
-
-
 }
diff --git a/src/Mvc/DispatcherInterface.php b/src/Mvc/DispatcherInterface.php
index 64873c82..7baca38c 100644
--- a/src/Mvc/DispatcherInterface.php
+++ b/src/Mvc/DispatcherInterface.php
@@ -18,8 +18,6 @@
  */
 interface DispatcherInterface extends DispatcherInterfaceBase
 {
-
-
     /**
      * Returns the active controller in the dispatcher
      *
diff --git a/src/Mvc/EntityInterface.php b/src/Mvc/EntityInterface.php
index eb7885f4..1acac67c 100644
--- a/src/Mvc/EntityInterface.php
+++ b/src/Mvc/EntityInterface.php
@@ -16,8 +16,6 @@
  */
 interface EntityInterface
 {
-
-
     /**
      * Reads an attribute value by its name
      *
diff --git a/src/Mvc/Micro.php b/src/Mvc/Micro.php
index 5df79853..53f157e9 100644
--- a/src/Mvc/Micro.php
+++ b/src/Mvc/Micro.php
@@ -50,7 +50,6 @@
  */
 class Micro extends Injectable implements \ArrayAccess, \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var callable|null
      */
@@ -528,8 +527,10 @@ public function setService(string $serviceName, $definition, bool $shared = fals
     /**
      * Stops the middleware execution avoiding than other middlewares be
      * executed
+     *
+     * @return void
      */
-    public function stop()
+    public function stop(): void
     {
     }
 }
diff --git a/src/Mvc/Micro/Collection.php b/src/Mvc/Micro/Collection.php
index 403eab1d..1344e3fc 100644
--- a/src/Mvc/Micro/Collection.php
+++ b/src/Mvc/Micro/Collection.php
@@ -30,7 +30,6 @@
  */
 class Collection implements \Phalcon\Mvc\Micro\CollectionInterface
 {
-
     /**
      * @var callable
      */
diff --git a/src/Mvc/Micro/CollectionInterface.php b/src/Mvc/Micro/CollectionInterface.php
index d85dc9e8..d85c4575 100644
--- a/src/Mvc/Micro/CollectionInterface.php
+++ b/src/Mvc/Micro/CollectionInterface.php
@@ -16,8 +16,6 @@
  */
 interface CollectionInterface
 {
-
-
     /**
      * Maps a route to a handler that only matches if the HTTP method is DELETE
      *
@@ -130,7 +128,8 @@ public function put(string $routePattern, $handler, string $name = null): Collec
      * Sets the main handler
      *
      * @param mixed $handler
-     * @param bool $lazy *
+     * @param bool  $lazy
+     *
      * @return CollectionInterface
      */
     public function setHandler($handler, bool $lazy = false): CollectionInterface;
diff --git a/src/Mvc/Micro/Exception.php b/src/Mvc/Micro/Exception.php
index c7e4af7a..0f0a90e9 100644
--- a/src/Mvc/Micro/Exception.php
+++ b/src/Mvc/Micro/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Mvc/Micro/LazyLoader.php b/src/Mvc/Micro/LazyLoader.php
index 4a337257..f28b691c 100644
--- a/src/Mvc/Micro/LazyLoader.php
+++ b/src/Mvc/Micro/LazyLoader.php
@@ -18,30 +18,15 @@
  */
 class LazyLoader
 {
-
-    /**
-     * @var object|null
-     */
-    protected $handler = null;
-
     /**
      * @var string
      */
     protected $definition;
 
     /**
-     * @return object|null
-     */
-    public function getHandler()
-    {
-    }
-
-    /**
-     * @return string
+     * @var object|null
      */
-    public function getDefinition(): string
-    {
-    }
+    protected $handler = null;
 
     /**
      * Phalcon\Mvc\Micro\LazyLoader constructor
@@ -63,4 +48,18 @@ public function __construct(string $definition)
     public function callMethod(string $method, $arguments, \Phalcon\Mvc\Model\BinderInterface $modelBinder = null)
     {
     }
+
+    /**
+     * @return string
+     */
+    public function getDefinition(): string
+    {
+    }
+
+    /**
+     * @return object|null
+     */
+    public function getHandler()
+    {
+    }
 }
diff --git a/src/Mvc/Micro/MiddlewareInterface.php b/src/Mvc/Micro/MiddlewareInterface.php
index 2eed70c1..d5525383 100644
--- a/src/Mvc/Micro/MiddlewareInterface.php
+++ b/src/Mvc/Micro/MiddlewareInterface.php
@@ -16,8 +16,6 @@
  */
 interface MiddlewareInterface
 {
-
-
     /**
      * Calls the middleware
      *
diff --git a/src/Mvc/Model.php b/src/Mvc/Model.php
index ee5f0f7a..6efdc14f 100644
--- a/src/Mvc/Model.php
+++ b/src/Mvc/Model.php
@@ -163,17 +163,9 @@ abstract class Model extends AbstractInjectionAware implements \Phalcon\Mvc\Enti
     protected $uniqueParams = [];
 
     /**
-     * @var array|null
-     * TODO: Make it always array in code
-     */
-    protected $uniqueTypes = null;
-
-    /**
-     * @return TransactionInterface|null
+     * @var array
      */
-    public function getTransaction()
-    {
-    }
+    protected $uniqueTypes = [];
 
     /**
      * Phalcon\Mvc\Model constructor
@@ -231,6 +223,15 @@ public function __isset(string $property): bool
     {
     }
 
+    /**
+     * Serializes a model
+     *
+     * @return array
+     */
+    public function __serialize(): array
+    {
+    }
+
     /**
      * Magic method to assign values to the the model
      *
@@ -241,6 +242,16 @@ public function __set(string $property, $value)
     {
     }
 
+    /**
+     * Unserializes an array to the model
+     *
+     * @param array $data
+     * @return void
+     */
+    public function __unserialize(array $data): void
+    {
+    }
+
     /**
      * Setups a behavior in a model
      *
@@ -1412,6 +1423,13 @@ public function setTransaction(\Phalcon\Mvc\Model\TransactionInterface $transact
     {
     }
 
+    /**
+     * @return TransactionInterface|null
+     */
+    public function getTransaction(): ?TransactionInterface
+    {
+    }
+
     /**
      * Enables/disables options in the ORM
      *
@@ -2039,8 +2057,9 @@ final protected function setSource(string $source): ModelInterface
      * ```
      *
      * @param array $attributes
+     * @return void
      */
-    protected function skipAttributes(array $attributes)
+    protected function skipAttributes(array $attributes): void
     {
     }
 
@@ -2201,19 +2220,4 @@ public function validationHasFailed(): bool
     private static function caseInsensitiveColumnMap($columnMap, $key): string
     {
     }
-
-    /**
-     * @return array
-     */
-    public function __serialize(): array
-    {
-    }
-
-    /**
-     * @param array $data
-     * @return void
-     */
-    public function __unserialize(array $data): void
-    {
-    }
 }
diff --git a/src/Mvc/Model/Behavior.php b/src/Mvc/Model/Behavior.php
index 5ed8e81c..7f7ddf50 100644
--- a/src/Mvc/Model/Behavior.php
+++ b/src/Mvc/Model/Behavior.php
@@ -18,7 +18,6 @@
  */
 abstract class Behavior implements \Phalcon\Mvc\Model\BehaviorInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Mvc/Model/Behavior/SoftDelete.php b/src/Mvc/Model/Behavior/SoftDelete.php
index 01b4d601..310c684e 100644
--- a/src/Mvc/Model/Behavior/SoftDelete.php
+++ b/src/Mvc/Model/Behavior/SoftDelete.php
@@ -21,8 +21,6 @@
  */
 class SoftDelete extends Behavior
 {
-
-
     /**
      * Listens for notifications from the models manager
      *
diff --git a/src/Mvc/Model/Behavior/Timestampable.php b/src/Mvc/Model/Behavior/Timestampable.php
index 77c8f44f..d016bd38 100644
--- a/src/Mvc/Model/Behavior/Timestampable.php
+++ b/src/Mvc/Model/Behavior/Timestampable.php
@@ -22,8 +22,6 @@
  */
 class Timestampable extends Behavior
 {
-
-
     /**
      * Listens for notifications from the models manager
      *
diff --git a/src/Mvc/Model/BehaviorInterface.php b/src/Mvc/Model/BehaviorInterface.php
index 61f5b44d..81567892 100644
--- a/src/Mvc/Model/BehaviorInterface.php
+++ b/src/Mvc/Model/BehaviorInterface.php
@@ -18,8 +18,6 @@
  */
 interface BehaviorInterface
 {
-
-
     /**
      * Calls a method when it's missing in the model
      *
diff --git a/src/Mvc/Model/Binder.php b/src/Mvc/Model/Binder.php
index 663a6146..dcbe2880 100644
--- a/src/Mvc/Model/Binder.php
+++ b/src/Mvc/Model/Binder.php
@@ -23,7 +23,6 @@
  */
 class Binder implements \Phalcon\Mvc\Model\BinderInterface
 {
-
     /**
      * Array for storing active bound models
      *
@@ -52,24 +51,6 @@ class Binder implements \Phalcon\Mvc\Model\BinderInterface
      */
     protected $originalValues = [];
 
-    /**
-     * Array for storing active bound models
-     *
-     * @return array
-     */
-    public function getBoundModels(): array
-    {
-    }
-
-    /**
-     * Array for original values
-     *
-     * @return array
-     */
-    public function getOriginalValues(): array
-    {
-    }
-
     /**
      * Phalcon\Mvc\Model\Binder constructor
      *
@@ -103,6 +84,24 @@ protected function findBoundModel($paramValue, string $className)
     {
     }
 
+    /**
+     * Return the active bound models
+     *
+     * @return array
+     */
+    public function getBoundModels(): array
+    {
+    }
+
+    /**
+     * Return the array for original values
+     *
+     * @return array
+     */
+    public function getOriginalValues(): array
+    {
+    }
+
     /**
      * Sets cache instance
      *
diff --git a/src/Mvc/Model/Binder/BindableInterface.php b/src/Mvc/Model/Binder/BindableInterface.php
index f89f2d1a..9ce9cbb8 100644
--- a/src/Mvc/Model/Binder/BindableInterface.php
+++ b/src/Mvc/Model/Binder/BindableInterface.php
@@ -16,8 +16,6 @@
  */
 interface BindableInterface
 {
-
-
     /**
      * Return the model name or models names and parameters keys associated with
      * this class
diff --git a/src/Mvc/Model/BinderInterface.php b/src/Mvc/Model/BinderInterface.php
index 1f5fd285..7140d8d2 100644
--- a/src/Mvc/Model/BinderInterface.php
+++ b/src/Mvc/Model/BinderInterface.php
@@ -18,8 +18,6 @@
  */
 interface BinderInterface
 {
-
-
     /**
      * Bind models into params in proper handler
      *
diff --git a/src/Mvc/Model/Criteria.php b/src/Mvc/Model/Criteria.php
index 02a99acd..c170f234 100644
--- a/src/Mvc/Model/Criteria.php
+++ b/src/Mvc/Model/Criteria.php
@@ -34,7 +34,6 @@
  */
 class Criteria implements \Phalcon\Mvc\Model\CriteriaInterface, \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Mvc/Model/CriteriaInterface.php b/src/Mvc/Model/CriteriaInterface.php
index d3e6a0c5..196c32fe 100644
--- a/src/Mvc/Model/CriteriaInterface.php
+++ b/src/Mvc/Model/CriteriaInterface.php
@@ -18,8 +18,6 @@
  */
 interface CriteriaInterface
 {
-
-
     /**
      * Appends a condition to the current conditions using an AND operator
      *
diff --git a/src/Mvc/Model/Exception.php b/src/Mvc/Model/Exception.php
index f14231cd..0f78f783 100644
--- a/src/Mvc/Model/Exception.php
+++ b/src/Mvc/Model/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Mvc/Model/Manager.php b/src/Mvc/Model/Manager.php
index ab0b7823..ba65c1f1 100644
--- a/src/Mvc/Model/Manager.php
+++ b/src/Mvc/Model/Manager.php
@@ -48,7 +48,6 @@
  */
 class Manager implements \Phalcon\Mvc\Model\ManagerInterface, \Phalcon\Di\InjectionAwareInterface, \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var array
      */
@@ -75,6 +74,11 @@ class Manager implements \Phalcon\Mvc\Model\ManagerInterface, \Phalcon\Di\Inject
      */
     protected $belongsToSingle = [];
 
+    /**
+     * @var BuilderInterface|null
+     */
+    protected $builder = null;
+
     /**
      * @var DiInterface|null
      */
@@ -217,575 +221,569 @@ class Manager implements \Phalcon\Mvc\Model\ManagerInterface, \Phalcon\Di\Inject
     protected $reusable = [];
 
     /**
-     * Sets the DependencyInjector container
-     *
-     * @param \Phalcon\Di\DiInterface $container
-     * @return void
+     * Destroys the current PHQL cache
      */
-    public function setDI(\Phalcon\Di\DiInterface $container): void
+    public function __destruct()
     {
     }
 
     /**
-     * Returns the DependencyInjector container
+     * Binds a behavior to a model
      *
-     * @return DiInterface
+     * @param ModelInterface    $model
+     * @param BehaviorInterface $behavior
+     * @return void
      */
-    public function getDI(): DiInterface
+    public function addBehavior(\Phalcon\Mvc\ModelInterface $model, BehaviorInterface $behavior): void
     {
     }
 
     /**
-     * Sets a global events manager
+     * Setup a relation reverse many to one between two models
      *
-     * @param \Phalcon\Events\ManagerInterface $eventsManager
-     * @return void
+     * @param ModelInterface $model
+     * @param mixed          $fields
+     * @param string         $referencedModel
+     * @param mixed          $referencedFields
+     * @param array          $options
+     *
+     * @return RelationInterface
      */
-    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager): void
+    public function addBelongsTo(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
     {
     }
 
     /**
-     * Returns the internal event manager
+     * Setup a relation 1-n between two models
      *
-     * @return EventsManagerInterface|null
+     * @param ModelInterface $model
+     * @param mixed          $fields
+     * @param string         $referencedModel
+     * @param mixed          $referencedFields
+     * @param array          $options
+     *
+     * @return RelationInterface
      */
-    public function getEventsManager(): ?EventsManagerInterface
+    public function addHasMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
     {
     }
 
     /**
-     * Sets a custom events manager for a specific model
+     * Setups a relation n-m between two models
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param \Phalcon\Events\ManagerInterface $eventsManager
-     * @return void
+     * @param ModelInterface $model
+     * @param mixed          $fields
+     * @param string         $intermediateModel
+     * @param mixed          $intermediateFields
+     * @param mixed          $intermediateReferencedFields
+     * @param string         $referencedModel
+     * @param mixed          $referencedFields
+     * @param array          $options
+     *
+     * @return RelationInterface
      */
-    public function setCustomEventsManager(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Events\ManagerInterface $eventsManager): void
+    public function addHasManyToMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
     {
     }
 
     /**
-     * Returns a custom events manager related to a model or null if there is no related events manager
+     * Setup a 1-1 relation between two models
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return EventsManagerInterface|null
+     * @param ModelInterface $model
+     * @param mixed          $fields
+     * @param string         $referencedModel
+     * @param mixed          $referencedFields
+     * @param array          $options
+     *
+     * @return RelationInterface
      */
-    public function getCustomEventsManager(\Phalcon\Mvc\ModelInterface $model): ?EventsManagerInterface
+    public function addHasOne(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
     {
     }
 
     /**
-     * Initializes a model in the model manager
+     * Setups a relation 1-1 between two models using an intermediate model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return bool
+     * @param ModelInterface $model
+     * @param mixed          $fields
+     * @param string         $intermediateModel
+     * @param mixed          $intermediateFields
+     * @param mixed          $intermediateReferencedFields
+     * @param string         $referencedModel
+     * @param mixed          $referencedFields
+     * @param array          $options
+     *
+     * @return RelationInterface
      */
-    public function initialize(\Phalcon\Mvc\ModelInterface $model): bool
+    public function addHasOneThrough(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
     {
     }
 
     /**
-     * Check whether a model is already initialized
+     * Clears the internal reusable list
      *
-     * @param string $className
-     * @return bool
+     * @return void
      */
-    public function isInitialized(string $className): bool
+    public function clearReusableObjects(): void
     {
     }
 
     /**
-     * Get last initialized model
+     * Creates a Phalcon\Mvc\Model\Query\Builder
      *
-     * @return ModelInterface
+     * @param array|string|null $params
+     * @return BuilderInterface
      */
-    public function getLastInitialized(): ModelInterface
+    public function createBuilder($params = null): BuilderInterface
     {
     }
 
     /**
-     * Loads a model throwing an exception if it doesn't exist
+     * Creates a Phalcon\Mvc\Model\Query without execute it
      *
-     * @param string $modelName
-     * @return ModelInterface
+     * @param string $phql
+     *
+     * @return QueryInterface
      */
-    public function load(string $modelName): ModelInterface
+    public function createQuery(string $phql): QueryInterface
     {
     }
 
     /**
-     * Sets the prefix for all model sources.
+     * Creates a Phalcon\Mvc\Model\Query and execute it
      *
      * ```php
-     * use Phalcon\Mvc\Model\Manager;
+     * $model = new Robots();
+     * $manager = $model->getModelsManager();
      *
-     * $di->set(
-     *     "modelsManager",
-     *     function () {
-     *         $modelsManager = new Manager();
+     * // \Phalcon\Mvc\Model\Resultset\Simple
+     * $manager->executeQuery('SELECT FROM Robots');
      *
-     *         $modelsManager->setModelPrefix("wp_");
+     * // \Phalcon\Mvc\Model\Resultset\Complex
+     * $manager->executeQuery('SELECT COUNT(type) FROM Robots GROUP BY type');
      *
-     *         return $modelsManager;
-     *     }
-     * );
+     * // \Phalcon\Mvc\Model\Query\StatusInterface
+     * $manager->executeQuery('INSERT INTO Robots (id) VALUES (1)');
      *
-     * $robots = new Robots();
+     * // \Phalcon\Mvc\Model\Query\StatusInterface
+     * $manager->executeQuery('UPDATE Robots SET id = 0 WHERE id = :id:', ['id' => 1]);
      *
-     * echo $robots->getSource(); // wp_robots
+     * // \Phalcon\Mvc\Model\Query\StatusInterface
+     * $manager->executeQuery('DELETE FROM Robots WHERE id = :id:', ['id' => 1]);
      * ```
      *
-     * @param string $prefix
-     * @return void
+     * @param string     $phql
+     * @param array|null $placeholders
+     * @param array|null $types
+     *
+     * @return ResultsetInterface|StatusInterface
      */
-    public function setModelPrefix(string $prefix): void
+    public function executeQuery(string $phql, $placeholders = null, $types = null)
     {
     }
 
     /**
-     * Returns the prefix for all model sources.
+     * Checks whether a model has a belongsTo relation with another model
      *
-     * @return string
+     * @deprecated
+     * @param string $modelName
+     * @param string $modelRelation
+     * @return bool
      */
-    public function getModelPrefix(): string
+    public function existsBelongsTo(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Sets the mapped source for a model
+     * Checks whether a model has a hasMany relation with another model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $source
-     * @return void
+     * @deprecated
+     * @param string $modelName
+     * @param string $modelRelation
+     * @return bool
      */
-    public function setModelSource(\Phalcon\Mvc\ModelInterface $model, string $source): void
+    public function existsHasMany(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Check whether a model property is declared as public.
-     *
-     * ```php
-     * $isPublic = $manager->isVisibleModelProperty(
-     *     new Robots(),
-     *     "name"
-     * );
-     * ```
+     * Checks whether a model has a hasManyToMany relation with another model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $property
+     * @deprecated
+     * @param string $modelName
+     * @param string $modelRelation
      * @return bool
      */
-    final public function isVisibleModelProperty(\Phalcon\Mvc\ModelInterface $model, string $property): bool
+    public function existsHasManyToMany(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Returns the mapped source for a model
+     * Checks whether a model has a hasOne relation with another model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return string
+     * @deprecated
+     * @param string $modelName
+     * @param string $modelRelation
+     * @return bool
      */
-    public function getModelSource(\Phalcon\Mvc\ModelInterface $model): string
+    public function existsHasOne(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Sets the mapped schema for a model
+     * Checks whether a model has a hasOneThrough relation with another model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $schema
-     * @return void
+     * @deprecated
+     * @param string $modelName
+     * @param string $modelRelation
+     * @return bool
      */
-    public function setModelSchema(\Phalcon\Mvc\ModelInterface $model, string $schema): void
+    public function existsHasOneThrough(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Returns the mapped schema for a model
+     * Gets all the belongsTo relations defined in a model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return string|null
+     * ```php
+     * $relations = $modelsManager->getBelongsTo(
+     *     new Robots()
+     * );
+     * ```
+     *
+     * @param ModelInterface $model
+     *
+     * @return RelationInterface[] | array
      */
-    public function getModelSchema(\Phalcon\Mvc\ModelInterface $model): ?string
+    public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array
     {
     }
 
     /**
-     * Sets both write and read connection service for a model
+     * Gets belongsTo related records from a model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $connectionService
-     * @return void
+     * @param string         $modelName
+     * @param string         $modelRelation
+     * @param ModelInterface $record
+     * @param mixed|null     $parameters
+     * @param string|null    $method
+     *
+     * @return ResultsetInterface | bool
      */
-    public function setConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService): void
+    public function getBelongsToRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
     {
     }
 
     /**
-     * Sets write connection service for a model
+     * Returns the newly created Phalcon\Mvc\Model\Query\Builder or null
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $connectionService
-     * @return void
+     * @return BuilderInterface | null
      */
-    public function setWriteConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService): void
+    public function getBuilder(): ?BuilderInterface
     {
     }
 
     /**
-     * Sets read connection service for a model
+     * Returns the connection service name used to read or write data related to
+     * a model depending on the connection services
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $connectionService
-     * @return void
+     * @param ModelInterface $model
+     * @param array          $connectionServices
+     *
+     * @return string
      */
-    public function setReadConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService): void
+    public function getConnectionService(\Phalcon\Mvc\ModelInterface $model, array $connectionServices): string
     {
     }
 
     /**
-     * Returns the connection to read data related to a model
+     * Returns a custom events manager related to a model or null if there is
+     * no related events manager
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return AdapterInterface
+     * @param ModelInterface $model
+     *
+     * @return EventsManagerInterface | null
      */
-    public function getReadConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface
+    public function getCustomEventsManager(\Phalcon\Mvc\ModelInterface $model): ?EventsManagerInterface
     {
     }
 
     /**
-     * Returns the connection to write data related to a model
+     * Returns the DependencyInjector container
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return AdapterInterface
+     * @return DiInterface
      */
-    public function getWriteConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface
+    public function getDI(): DiInterface
     {
     }
 
     /**
-     * Returns the connection to read or write data related to a model depending on the connection services.
+     * Returns the internal event manager
      *
-     * @return AdapterInterface
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param mixed $connectionServices
+     * @return EventsManagerInterface|null
      */
-    protected function getConnection(\Phalcon\Mvc\ModelInterface $model, $connectionServices): AdapterInterface
+    public function getEventsManager(): ?EventsManagerInterface
     {
     }
 
     /**
-     * Returns the connection service name used to read data related to a model
+     * Gets hasMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return string
+     * @return array|RelationInterface[]
      */
-    public function getReadConnectionService(\Phalcon\Mvc\ModelInterface $model): string
+    public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array
     {
     }
 
     /**
-     * Returns the connection service name used to write data related to a model
+     * Gets hasMany related records from a model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return string
+     * @param string $modelName
+     * @param string $modelRelation
+     * @param \Phalcon\Mvc\ModelInterface $record
+     * @param mixed $parameters
+     * @param string $method
+     * @return bool|ResultsetInterface
      */
-    public function getWriteConnectionService(\Phalcon\Mvc\ModelInterface $model): string
+    public function getHasManyRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
     {
     }
 
     /**
-     * Returns the connection service name used to read or write data related to
-     * a model depending on the connection services
+     * Gets hasManyToMany relations defined on a model
      *
-     * @return string
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @param mixed $connectionServices
+     * @return array|RelationInterface[]
      */
-    public function getConnectionService(\Phalcon\Mvc\ModelInterface $model, $connectionServices): string
+    public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array
     {
     }
 
     /**
-     * Receives events generated in the models and dispatches them to an
-     * events-manager if available. Notify the behaviors that are listening in
-     * the model
+     * Gets hasOne relations defined on a model
      *
-     * @param string $eventName
      * @param \Phalcon\Mvc\ModelInterface $model
+     * @return array
      */
-    public function notifyEvent(string $eventName, \Phalcon\Mvc\ModelInterface $model)
+    public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array
     {
     }
 
     /**
-     * Dispatch an event to the listeners and behaviors
-     * This method expects that the endpoint listeners/behaviors returns true
-     * meaning that a least one was implemented
+     * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $eventName
-     * @param mixed $data
+     * @return array|RelationInterface[]
      */
-    public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $eventName, $data)
+    public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array
     {
     }
 
     /**
-     * Binds a behavior to a model
+     * Gets belongsTo related records from a model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param BehaviorInterface $behavior
-     * @return void
-     */
-    public function addBehavior(\Phalcon\Mvc\ModelInterface $model, BehaviorInterface $behavior): void
-    {
-    }
-
-    /**
-     * Sets if a model must keep snapshots
-     *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param bool $keepSnapshots
-     * @return void
+     * @param string $modelName
+     * @param string $modelRelation
+     * @param \Phalcon\Mvc\ModelInterface $record
+     * @param mixed $parameters
+     * @param string $method
+     * @return bool|ModelInterface
      */
-    public function keepSnapshots(\Phalcon\Mvc\ModelInterface $model, bool $keepSnapshots): void
+    public function getHasOneRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
     {
     }
 
     /**
-     * Checks if a model is keeping snapshots for the queried records
+     * Gets hasOneThrough relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return bool
+     * @return array|RelationInterface[]
      */
-    public function isKeepingSnapshots(\Phalcon\Mvc\ModelInterface $model): bool
+    public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array
     {
     }
 
     /**
-     * Sets if a model must use dynamic update instead of the all-field update
+     * Get last initialized model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param bool $dynamicUpdate
-     * @return void
+     * @return ModelInterface
      */
-    public function useDynamicUpdate(\Phalcon\Mvc\ModelInterface $model, bool $dynamicUpdate): void
+    public function getLastInitialized(): ModelInterface
     {
     }
 
     /**
-     * Checks if a model is using dynamic update instead of all-field update
+     * Returns the last query created or executed in the models manager
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return bool
+     * @return QueryInterface
      */
-    public function isUsingDynamicUpdate(\Phalcon\Mvc\ModelInterface $model): bool
+    public function getLastQuery(): QueryInterface
     {
     }
 
     /**
-     * Setup a 1-1 relation between two models
+     * Returns the prefix for all model sources.
      *
-     * @param array $options
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @param mixed $fields
-     * @param string $referencedModel
-     * @param mixed $referencedFields
-     * @return RelationInterface
+     * @return string
      */
-    public function addHasOne(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
+    public function getModelPrefix(): string
     {
     }
 
     /**
-     * Setups a relation 1-1 between two models using an intermediate model
+     * Returns the mapped schema for a model
      *
-     * @param string $fields
-     * @param string $intermediateFields
-     * @param string $intermediateReferencedFields
-     * @param string $referencedFields
-     * @param array $options
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $intermediateModel
-     * @param string $referencedModel
-     * @return RelationInterface
+     * @return string|null
      */
-    public function addHasOneThrough(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
+    public function getModelSchema(\Phalcon\Mvc\ModelInterface $model): ?string
     {
     }
 
     /**
-     * Setup a relation reverse many to one between two models
+     * Returns the mapped source for a model
      *
-     * @param array $options
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @param mixed $fields
-     * @param string $referencedModel
-     * @param mixed $referencedFields
-     * @return RelationInterface
+     * @return string
      */
-    public function addBelongsTo(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
+    public function getModelSource(\Phalcon\Mvc\ModelInterface $model): string
     {
     }
 
     /**
-     * Setup a relation 1-n between two models
+     * Returns the connection to read data related to a model
      *
-     * @param mixed $referencedFields
-     * @param array $options
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @param mixed $fields
-     * @param string $referencedModel
-     * @return RelationInterface
+     * @return AdapterInterface
      */
-    public function addHasMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
+    public function getReadConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface
     {
     }
 
     /**
-     * Setups a relation n-m between two models
+     * Returns the connection service name used to read data related to a model
      *
-     * @param string $fields
-     * @param string $intermediateFields
-     * @param string $intermediateReferencedFields
-     * @param string $referencedFields
-     * @param array $options
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @param string $intermediateModel
-     * @param string $referencedModel
-     * @return RelationInterface
+     * @return string
      */
-    public function addHasManyToMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, array $options = []): RelationInterface
+    public function getReadConnectionService(\Phalcon\Mvc\ModelInterface $model): string
     {
     }
 
     /**
-     * Checks whether a model has a belongsTo relation with another model
+     * Returns a relation by its alias
      *
-     * @deprecated
      * @param string $modelName
-     * @param string $modelRelation
-     * @return bool
+     * @param string $alias *
+     * @return RelationInterface|bool
      */
-    public function existsBelongsTo(string $modelName, string $modelRelation): bool
+    public function getRelationByAlias(string $modelName, string $alias)
     {
     }
 
     /**
-     * Checks whether a model has a hasMany relation with another model
+     * Helper method to query records based on a relation definition
      *
-     * @deprecated
-     * @param string $modelName
-     * @param string $modelRelation
-     * @return bool
-     */
-    public function existsHasMany(string $modelName, string $modelRelation): bool
-    {
-    }
-
-    /**
-     * Checks whether a model has a hasOne relation with another model
+     * @param RelationInterface $relation
+     * @param ModelInterface    $record
+     * @param mixed|null        $parameters
+     * @param string|null       $method
      *
-     * @deprecated
-     * @param string $modelName
-     * @param string $modelRelation
-     * @return bool
+     * @return \Phalcon\Mvc\Model\Resultset\Simple|int|false
      */
-    public function existsHasOne(string $modelName, string $modelRelation): bool
+    public function getRelationRecords(RelationInterface $relation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
     {
     }
 
     /**
-     * Checks whether a model has a hasOneThrough relation with another model
+     * Query all the relationships defined on a model
      *
-     * @deprecated
      * @param string $modelName
-     * @param string $modelRelation
-     * @return bool
+     *
+     * @return RelationInterface[]
      */
-    public function existsHasOneThrough(string $modelName, string $modelRelation): bool
+    public function getRelations(string $modelName): array
     {
     }
 
     /**
-     * Checks whether a model has a hasManyToMany relation with another model
+     * Query the first relationship defined between two models
      *
-     * @deprecated
-     * @param string $modelName
-     * @param string $modelRelation
-     * @return bool
+     * @param string $first
+     * @param string $second
+     *
+     * @return RelationInterface[] | bool
      */
-    public function existsHasManyToMany(string $modelName, string $modelRelation): bool
+    public function getRelationsBetween(string $first, string $second)
     {
     }
 
     /**
-     * Returns a relation by its alias
+     * Returns a reusable object from the internal list
      *
      * @param string $modelName
-     * @param string $alias *
-     * @return RelationInterface|bool
+     * @param string $key
      */
-    public function getRelationByAlias(string $modelName, string $alias)
+    public function getReusableRecords(string $modelName, string $key)
     {
     }
 
     /**
-     * Merge two arrays of find parameters
+     * Returns the connection to write data related to a model
      *
-     * @param mixed $findParamsOne
-     * @param mixed $findParamsTwo
-     * @return array
+     * @param ModelInterface $model
+     *
+     * @return AdapterInterface
      */
-    final protected function _mergeFindParameters($findParamsOne, $findParamsTwo): array
+    public function getWriteConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface
     {
     }
 
     /**
-     * Helper method to query records based on a relation definition
+     * Returns the connection service name used to write data related to a model
      *
-     * @return \Phalcon\Mvc\Model\Resultset\Simple|int|false
-     * @param RelationInterface $relation
-     * @param \Phalcon\Mvc\ModelInterface $record
-     * @param mixed $parameters
-     * @param string $method
+     * @param ModelInterface $model
+     *
+     * @return string
      */
-    public function getRelationRecords(RelationInterface $relation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
+    public function getWriteConnectionService(\Phalcon\Mvc\ModelInterface $model): string
     {
     }
 
     /**
-     * Returns a reusable object from the internal list
+     * Checks whether a model has a belongsTo relation with another model
      *
      * @param string $modelName
-     * @param string $key
+     * @param string $modelRelation
+     *
+     * @return bool
      */
-    public function getReusableRecords(string $modelName, string $key)
+    public function hasBelongsTo(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Checks whether a model has a belongsTo relation with another model
+     * Checks whether a model has a hasMany relation with another model
      *
      * @param string $modelName
      * @param string $modelRelation
+     *
      * @return bool
      */
-    public function hasBelongsTo(string $modelName, string $modelRelation): bool
+    public function hasHasMany(string $modelName, string $modelRelation): bool
     {
     }
 
     /**
-     * Checks whether a model has a hasMany relation with another model
+     * Checks whether a model has a hasManyToMany relation with another model
      *
      * @param string $modelName
      * @param string $modelRelation
+     *
      * @return bool
      */
-    public function hasHasMany(string $modelName, string $modelRelation): bool
+    public function hasHasManyToMany(string $modelName, string $modelRelation): bool
     {
     }
 
@@ -794,6 +792,7 @@ public function hasHasMany(string $modelName, string $modelRelation): bool
      *
      * @param string $modelName
      * @param string $modelRelation
+     *
      * @return bool
      */
     public function hasHasOne(string $modelName, string $modelRelation): bool
@@ -805,6 +804,7 @@ public function hasHasOne(string $modelName, string $modelRelation): bool
      *
      * @param string $modelName
      * @param string $modelRelation
+     *
      * @return bool
      */
     public function hasHasOneThrough(string $modelName, string $modelRelation): bool
@@ -812,231 +812,289 @@ public function hasHasOneThrough(string $modelName, string $modelRelation): bool
     }
 
     /**
-     * Checks whether a model has a hasManyToMany relation with another model
+     * Initializes a model in the model manager
+     *
+     * @param ModelInterface $model
      *
-     * @param string $modelName
-     * @param string $modelRelation
      * @return bool
      */
-    public function hasHasManyToMany(string $modelName, string $modelRelation): bool
+    public function initialize(\Phalcon\Mvc\ModelInterface $model): bool
     {
     }
 
     /**
-     * Stores a reusable record in the internal list
+     * Check whether a model is already initialized
      *
-     * @param string $modelName
-     * @param string $key
-     * @param mixed $records
-     * @return void
+     * @param string $className
+     *
+     * @return bool
      */
-    public function setReusableRecords(string $modelName, string $key, $records): void
+    public function isInitialized(string $className): bool
     {
     }
 
     /**
-     * Clears the internal reusable list
+     * Checks if a model is keeping snapshots for the queried records
      *
-     * @return void
+     * @param ModelInterface $model
+     *
+     * @return bool
      */
-    public function clearReusableObjects(): void
+    public function isKeepingSnapshots(\Phalcon\Mvc\ModelInterface $model): bool
     {
     }
 
     /**
-     * Gets belongsTo related records from a model
+     * Checks if a model is using dynamic update instead of all-field update
      *
-     * @param string $modelName
-     * @param string $modelRelation
-     * @param \Phalcon\Mvc\ModelInterface $record
-     * @param mixed $parameters
-     * @param string $method
-     * @return bool|ResultsetInterface
+     * @param ModelInterface $model
+     *
+     * @return bool
      */
-    public function getBelongsToRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
+    public function isUsingDynamicUpdate(\Phalcon\Mvc\ModelInterface $model): bool
     {
     }
 
     /**
-     * Gets hasMany related records from a model
+     * Check whether a model property is declared as public.
      *
-     * @param string $modelName
-     * @param string $modelRelation
-     * @param \Phalcon\Mvc\ModelInterface $record
-     * @param mixed $parameters
-     * @param string $method
-     * @return bool|ResultsetInterface
+     * ```php
+     * $isPublic = $manager->isVisibleModelProperty(
+     *     new Robots(),
+     *     "name"
+     * );
+     * ```
+     *
+     * @param ModelInterface $model
+     * @param string         $property
+     *
+     * @return bool
      */
-    public function getHasManyRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
+    final public function isVisibleModelProperty(\Phalcon\Mvc\ModelInterface $model, string $property): bool
     {
     }
 
     /**
-     * Gets belongsTo related records from a model
+     * Sets if a model must keep snapshots
      *
-     * @param string $modelName
-     * @param string $modelRelation
-     * @param \Phalcon\Mvc\ModelInterface $record
-     * @param mixed $parameters
-     * @param string $method
-     * @return bool|ModelInterface
+     * @param ModelInterface $model
+     * @param bool           $keepSnapshots
+     *
+     * @return void
      */
-    public function getHasOneRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
+    public function keepSnapshots(\Phalcon\Mvc\ModelInterface $model, bool $keepSnapshots): void
     {
     }
 
     /**
-     * Gets all the belongsTo relations defined in a model
+     * Loads a model throwing an exception if it doesn't exist
      *
-     * ```php
-     * $relations = $modelsManager->getBelongsTo(
-     *     new Robots()
-     * );
-     * ```
+     * @param string $modelName
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return ModelInterface
      */
-    public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array
+    public function load(string $modelName): ModelInterface
     {
     }
 
     /**
-     * Gets hasMany relations defined on a model
+     * Receives events generated in the models and dispatches them to an
+     * events-manager if available. Notify the behaviors that are listening in
+     * the model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @param string         $eventName
+     * @param ModelInterface $model
      */
-    public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array
+    public function notifyEvent(string $eventName, \Phalcon\Mvc\ModelInterface $model)
     {
     }
 
     /**
-     * Gets hasOne relations defined on a model
+     * Dispatch an event to the listeners and behaviors
+     * This method expects that the endpoint listeners/behaviors returns true
+     * meaning that a least one was implemented
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @param ModelInterface $model
+     * @param string         $eventName
+     * @param mixed          $data
      */
-    public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array
+    public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $eventName, $data)
     {
     }
 
     /**
-     * Gets hasOneThrough relations defined on a model
+     * Sets both write and read connection service for a model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @param ModelInterface $model
+     * @param string         $connectionService
+     *
+     * @return void
      */
-    public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array
+    public function setConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService): void
     {
     }
 
     /**
-     * Gets hasManyToMany relations defined on a model
+     * Sets a custom events manager for a specific model
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @param ModelInterface         $model
+     * @param EventsManagerInterface $eventsManager
+     *
+     * @return void
      */
-    public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array
+    public function setCustomEventsManager(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Events\ManagerInterface $eventsManager): void
     {
     }
 
     /**
-     * Gets hasOne relations defined on a model
+     * Sets the DependencyInjector container
      *
-     * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @param DiInterface $container
+     *
+     * @return void
      */
-    public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array
+    public function setDI(\Phalcon\Di\DiInterface $container): void
     {
     }
 
     /**
-     * Query all the relationships defined on a model
+     * Sets a global events manager
      *
-     * @param string $modelName
-     * @return array|RelationInterface[]
+     * @param EventsManagerInterface $eventsManager
+     *
+     * @return void
      */
-    public function getRelations(string $modelName): array
+    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager): void
     {
     }
 
     /**
-     * Query the first relationship defined between two models
+     * Sets the prefix for all model sources.
      *
-     * @param string $first
-     * @param string $second
-     * @return array|bool|RelationInterface[]
+     * ```php
+     * use Phalcon\Mvc\Model\Manager;
+     *
+     * $di->set(
+     *     "modelsManager",
+     *     function () {
+     *         $modelsManager = new Manager();
+     *
+     *         $modelsManager->setModelPrefix("wp_");
+     *
+     *         return $modelsManager;
+     *     }
+     * );
+     *
+     * $robots = new Robots();
+     *
+     * echo $robots->getSource(); // wp_robots
+     * ```
+     *
+     * $param string $prefix
+     *
+     * @return void
+     * @param string $prefix
      */
-    public function getRelationsBetween(string $first, string $second)
+    public function setModelPrefix(string $prefix): void
     {
     }
 
     /**
-     * Creates a Phalcon\Mvc\Model\Query without execute it
+     * Sets the mapped schema for a model
      *
-     * @param string $phql
-     * @return QueryInterface
+     * @param ModelInterface $model
+     * @param string         $schema
+     *
+     * @return void
      */
-    public function createQuery(string $phql): QueryInterface
+    public function setModelSchema(\Phalcon\Mvc\ModelInterface $model, string $schema): void
     {
     }
 
     /**
-     * Creates a Phalcon\Mvc\Model\Query and execute it
+     * Sets the mapped source for a model
      *
-     * ```php
-     * $model = new Robots();
-     * $manager = $model->getModelsManager();
+     * @param ModelInterface $model
+     * @param string         $source
      *
-     * // \Phalcon\Mvc\Model\Resultset\Simple
-     * $manager->executeQuery('SELECT FROM Robots');
+     * @return void
+     */
+    public function setModelSource(\Phalcon\Mvc\ModelInterface $model, string $source): void
+    {
+    }
+
+    /**
+     * Sets read connection service for a model
      *
-     * // \Phalcon\Mvc\Model\Resultset\Complex
-     * $manager->executeQuery('SELECT COUNT(type) FROM Robots GROUP BY type');
+     * @param ModelInterface $model
+     * @param string         $connectionService
      *
-     * // \Phalcon\Mvc\Model\Query\StatusInterface
-     * $manager->executeQuery('INSERT INTO Robots (id) VALUES (1)');
+     * @return void
+     */
+    public function setReadConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService): void
+    {
+    }
+
+    /**
+     * Stores a reusable record in the internal list
      *
-     * // \Phalcon\Mvc\Model\Query\StatusInterface
-     * $manager->executeQuery('UPDATE Robots SET id = 0 WHERE id = :id:', ['id' => 1]);
+     * @param ModelInterface $model
+     * @param string         $key
+     * @param mixed          $records
      *
-     * // \Phalcon\Mvc\Model\Query\StatusInterface
-     * $manager->executeQuery('DELETE FROM Robots WHERE id = :id:', ['id' => 1]);
-     * ```
+     * @return void
+     * @param string $modelName
+     */
+    public function setReusableRecords(string $modelName, string $key, $records): void
+    {
+    }
+
+    /**
+     * Sets write connection service for a model
      *
-     * @param array|null $placeholders
-     * @param array|null $types
-     * @return ResultsetInterface|StatusInterface
-     * @param string $phql
+     * @param ModelInterface $model
+     * @param string         $connectionService
+     *
+     * @return void
      */
-    public function executeQuery(string $phql, $placeholders = null, $types = null)
+    public function setWriteConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService): void
     {
     }
 
     /**
-     * Creates a Phalcon\Mvc\Model\Query\Builder
+     * Sets if a model must use dynamic update instead of the all-field update
      *
-     * @param array|string|null $params
-     * @return BuilderInterface
+     * @param ModelInterface $model
+     * @param bool           $dynamicUpdate
+     *
+     * @return void
      */
-    public function createBuilder($params = null): BuilderInterface
+    public function useDynamicUpdate(\Phalcon\Mvc\ModelInterface $model, bool $dynamicUpdate): void
     {
     }
 
     /**
-     * Returns the last query created or executed in the models manager
+     * Returns the connection to read or write data related to a model
+     * depending on the connection services.
      *
-     * @return QueryInterface
+     * @param ModelInterface $model
+     * @param array          $connectionServices
+     *
+     * @return AdapterInterface
      */
-    public function getLastQuery(): QueryInterface
+    protected function getConnection(\Phalcon\Mvc\ModelInterface $model, array $connectionServices): AdapterInterface
     {
     }
 
     /**
-     * Destroys the current PHQL cache
+     * Merge two arrays of find parameters
+     *
+     * @param mixed $findParamsOne
+     * @param mixed $findParamsTwo
+     *
+     * @return array
      */
-    public function __destruct()
+    final protected function mergeFindParameters($findParamsOne, $findParamsTwo): array
     {
     }
 
@@ -1044,6 +1102,7 @@ public function __destruct()
      * @param string $collection
      * @param string $modelName
      * @param string $modelRelation
+     *
      * @return bool
      */
     private function checkHasRelationship(string $collection, string $modelName, string $modelRelation): bool
diff --git a/src/Mvc/Model/ManagerInterface.php b/src/Mvc/Model/ManagerInterface.php
index f857fc89..a77aa767 100644
--- a/src/Mvc/Model/ManagerInterface.php
+++ b/src/Mvc/Model/ManagerInterface.php
@@ -21,8 +21,6 @@
  */
 interface ManagerInterface
 {
-
-
     /**
      * Binds a behavior to a model
      *
@@ -144,6 +142,13 @@ public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array;
      */
     public function getBelongsToRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null);
 
+    /**
+     * Returns the newly created Phalcon\Mvc\Model\Query\Builder or null
+     *
+     * @return BuilderInterface|null
+     */
+    public function getBuilder(): ?BuilderInterface;
+
     /**
      * Gets hasMany relations defined on a model
      *
diff --git a/src/Mvc/Model/MetaData/Apcu.php b/src/Mvc/Model/MetaData/Apcu.php
index dda8cef1..71930afd 100644
--- a/src/Mvc/Model/MetaData/Apcu.php
+++ b/src/Mvc/Model/MetaData/Apcu.php
@@ -33,8 +33,6 @@
  */
 class Apcu extends MetaData
 {
-
-
     /**
      * Phalcon\Mvc\Model\MetaData\Apcu constructor
      *
diff --git a/src/Mvc/Model/MetaData/Libmemcached.php b/src/Mvc/Model/MetaData/Libmemcached.php
index edd1e198..b1baf574 100644
--- a/src/Mvc/Model/MetaData/Libmemcached.php
+++ b/src/Mvc/Model/MetaData/Libmemcached.php
@@ -22,8 +22,6 @@
  */
 class Libmemcached extends MetaData
 {
-
-
     /**
      * Phalcon\Mvc\Model\MetaData\Libmemcached constructor
      *
diff --git a/src/Mvc/Model/MetaData/Memory.php b/src/Mvc/Model/MetaData/Memory.php
index 5b76a340..d96e6081 100644
--- a/src/Mvc/Model/MetaData/Memory.php
+++ b/src/Mvc/Model/MetaData/Memory.php
@@ -19,8 +19,6 @@
  */
 class Memory extends MetaData
 {
-
-
     /**
      * Phalcon\Mvc\Model\MetaData\Memory constructor
      *
diff --git a/src/Mvc/Model/MetaData/Redis.php b/src/Mvc/Model/MetaData/Redis.php
index a68f0011..3a78b27c 100644
--- a/src/Mvc/Model/MetaData/Redis.php
+++ b/src/Mvc/Model/MetaData/Redis.php
@@ -35,8 +35,6 @@
  */
 class Redis extends MetaData
 {
-
-
     /**
      * Phalcon\Mvc\Model\MetaData\Redis constructor
      *
diff --git a/src/Mvc/Model/MetaData/Strategy/Annotations.php b/src/Mvc/Model/MetaData/Strategy/Annotations.php
index 6ca70766..b8a45a0d 100644
--- a/src/Mvc/Model/MetaData/Strategy/Annotations.php
+++ b/src/Mvc/Model/MetaData/Strategy/Annotations.php
@@ -25,8 +25,6 @@
  */
 class Annotations implements \Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface
 {
-
-
     /**
      * Read the model's column map, this can't be inferred
      *
diff --git a/src/Mvc/Model/MetaData/Strategy/Introspection.php b/src/Mvc/Model/MetaData/Strategy/Introspection.php
index 44e68cc5..b5edfecf 100644
--- a/src/Mvc/Model/MetaData/Strategy/Introspection.php
+++ b/src/Mvc/Model/MetaData/Strategy/Introspection.php
@@ -23,8 +23,6 @@
  */
 class Introspection implements \Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface
 {
-
-
     /**
      * Read the model's column map, this can't be inferred
      *
diff --git a/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php b/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php
index c79e42c6..fe6a8b18 100644
--- a/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php
+++ b/src/Mvc/Model/MetaData/Strategy/StrategyInterface.php
@@ -22,8 +22,6 @@
  */
 interface StrategyInterface
 {
-
-
     /**
      * Read the model's column map, this can't be inferred
      *
diff --git a/src/Mvc/Model/MetaData/Stream.php b/src/Mvc/Model/MetaData/Stream.php
index 2da927dc..724f130c 100644
--- a/src/Mvc/Model/MetaData/Stream.php
+++ b/src/Mvc/Model/MetaData/Stream.php
@@ -27,7 +27,6 @@
  */
 class Stream extends MetaData
 {
-
     /**
      * @var string
      */
diff --git a/src/Mvc/Model/MetaDataInterface.php b/src/Mvc/Model/MetaDataInterface.php
index d19b6c38..41db4a75 100644
--- a/src/Mvc/Model/MetaDataInterface.php
+++ b/src/Mvc/Model/MetaDataInterface.php
@@ -19,8 +19,6 @@
  */
 interface MetaDataInterface
 {
-
-
     /**
      * Returns table attributes names (fields)
      *
diff --git a/src/Mvc/Model/Query.php b/src/Mvc/Model/Query.php
index 91e675b2..7556b344 100644
--- a/src/Mvc/Model/Query.php
+++ b/src/Mvc/Model/Query.php
@@ -203,26 +203,13 @@ class Query implements \Phalcon\Mvc\Model\QueryInterface, \Phalcon\Di\InjectionA
      *
      * @var TransactionInterface|null
      */
-    protected $transaction;
+    protected $transaction = null;
 
     /**
      * @var array|null
      */
     protected static $internalPhqlCache;
 
-    /**
-     * TransactionInterface so that the query can wrap a transaction
-     *
-     * around batch updates and intermediate selects within the transaction.
-     * however if a model got a transaction set inside it will use the local
-     * transaction instead of this one
-     *
-     * @return TransactionInterface|null
-     */
-    public function getTransaction()
-    {
-    }
-
     /**
      * Phalcon\Mvc\Model\Query constructor
      *
@@ -358,6 +345,13 @@ public function getUniqueRow(): bool
     {
     }
 
+    /**
+     * @return TransactionInterface|null
+     */
+    public function getTransaction(): ?TransactionInterface
+    {
+    }
+
     /**
      * Parses the intermediate code produced by Phalcon\Mvc\Model\Query\Lang
      * generating another intermediate representation that could be executed by
diff --git a/src/Mvc/Model/Query/Builder.php b/src/Mvc/Model/Query/Builder.php
index 6953b23b..d2725cd0 100644
--- a/src/Mvc/Model/Query/Builder.php
+++ b/src/Mvc/Model/Query/Builder.php
@@ -54,7 +54,6 @@
  */
 class Builder implements \Phalcon\Mvc\Model\Query\BuilderInterface, \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Mvc/Model/Query/BuilderInterface.php b/src/Mvc/Model/Query/BuilderInterface.php
index 0ddae4d5..b8c01135 100644
--- a/src/Mvc/Model/Query/BuilderInterface.php
+++ b/src/Mvc/Model/Query/BuilderInterface.php
@@ -204,9 +204,11 @@ public function groupBy($group): BuilderInterface;
      * Sets a HAVING condition clause
      *
      * @param string $conditions
+     * @param array $bindParams
+     * @param array $bindTypes
      * @return BuilderInterface
      */
-    public function having(string $conditions): BuilderInterface;
+    public function having(string $conditions, array $bindParams = [], array $bindTypes = []): BuilderInterface;
 
     /**
      * Adds an INNER join to the query
diff --git a/src/Mvc/Model/Query/Lang.php b/src/Mvc/Model/Query/Lang.php
index 7db8b339..92328bac 100644
--- a/src/Mvc/Model/Query/Lang.php
+++ b/src/Mvc/Model/Query/Lang.php
@@ -32,8 +32,6 @@
  */
 abstract class Lang
 {
-
-
     /**
      * Parses a PHQL statement returning an intermediate representation (IR)
      *
diff --git a/src/Mvc/Model/Query/Status.php b/src/Mvc/Model/Query/Status.php
index a3afd238..353bd3ea 100644
--- a/src/Mvc/Model/Query/Status.php
+++ b/src/Mvc/Model/Query/Status.php
@@ -41,7 +41,6 @@
  */
 class Status implements \Phalcon\Mvc\Model\Query\StatusInterface
 {
-
     /**
      * @var ModelInterface|null
      */
diff --git a/src/Mvc/Model/Query/StatusInterface.php b/src/Mvc/Model/Query/StatusInterface.php
index 71e5469c..2122784a 100644
--- a/src/Mvc/Model/Query/StatusInterface.php
+++ b/src/Mvc/Model/Query/StatusInterface.php
@@ -19,8 +19,6 @@
  */
 interface StatusInterface
 {
-
-
     /**
      * Returns the messages produced by an operation failed
      *
diff --git a/src/Mvc/Model/QueryInterface.php b/src/Mvc/Model/QueryInterface.php
index af823956..86ebca37 100644
--- a/src/Mvc/Model/QueryInterface.php
+++ b/src/Mvc/Model/QueryInterface.php
@@ -18,8 +18,6 @@
  */
 interface QueryInterface
 {
-
-
     /**
      * Sets the cache parameters of the query
      *
diff --git a/src/Mvc/Model/RelationInterface.php b/src/Mvc/Model/RelationInterface.php
index 34fcb243..a2c2baa2 100644
--- a/src/Mvc/Model/RelationInterface.php
+++ b/src/Mvc/Model/RelationInterface.php
@@ -16,8 +16,6 @@
  */
 interface RelationInterface
 {
-
-
     /**
      * Returns the fields
      *
diff --git a/src/Mvc/Model/ResultInterface.php b/src/Mvc/Model/ResultInterface.php
index ba392d87..2cbe045e 100644
--- a/src/Mvc/Model/ResultInterface.php
+++ b/src/Mvc/Model/ResultInterface.php
@@ -18,8 +18,6 @@
  */
 interface ResultInterface
 {
-
-
     /**
      * Sets the object's state
      *
diff --git a/src/Mvc/Model/Resultset/Complex.php b/src/Mvc/Model/Resultset/Complex.php
index ba61a9d3..ecbbe80f 100644
--- a/src/Mvc/Model/Resultset/Complex.php
+++ b/src/Mvc/Model/Resultset/Complex.php
@@ -29,7 +29,6 @@
  */
 class Complex extends Resultset implements \Phalcon\Mvc\Model\ResultsetInterface
 {
-
     /**
      * @var array
      */
diff --git a/src/Mvc/Model/Resultset/Simple.php b/src/Mvc/Model/Resultset/Simple.php
index c9e651e8..10f7bb97 100644
--- a/src/Mvc/Model/Resultset/Simple.php
+++ b/src/Mvc/Model/Resultset/Simple.php
@@ -26,7 +26,6 @@
  */
 class Simple extends Resultset
 {
-
     /**
      * @var array|string
      */
diff --git a/src/Mvc/Model/ResultsetInterface.php b/src/Mvc/Model/ResultsetInterface.php
index ffe12593..8477d9a4 100644
--- a/src/Mvc/Model/ResultsetInterface.php
+++ b/src/Mvc/Model/ResultsetInterface.php
@@ -20,8 +20,6 @@
  */
 interface ResultsetInterface
 {
-
-
     /**
      * Deletes every record in the resultset
      *
diff --git a/src/Mvc/Model/Row.php b/src/Mvc/Model/Row.php
index 0086efda..b65161d7 100644
--- a/src/Mvc/Model/Row.php
+++ b/src/Mvc/Model/Row.php
@@ -20,8 +20,6 @@
  */
 class Row implements \Phalcon\Mvc\EntityInterface, \Phalcon\Mvc\Model\ResultInterface, \ArrayAccess, \JsonSerializable
 {
-
-
     /**
      * Serializes the object for json_encode
      *
diff --git a/src/Mvc/Model/Transaction.php b/src/Mvc/Model/Transaction.php
index b447fe7b..2659a921 100644
--- a/src/Mvc/Model/Transaction.php
+++ b/src/Mvc/Model/Transaction.php
@@ -62,7 +62,6 @@
  */
 class Transaction implements \Phalcon\Mvc\Model\TransactionInterface
 {
-
     /**
      * @var bool
      */
diff --git a/src/Mvc/Model/Transaction/Exception.php b/src/Mvc/Model/Transaction/Exception.php
index 846d4d4d..b4614327 100644
--- a/src/Mvc/Model/Transaction/Exception.php
+++ b/src/Mvc/Model/Transaction/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Phalcon\Mvc\Model\Exception
 {
-
-
 }
diff --git a/src/Mvc/Model/Transaction/Failed.php b/src/Mvc/Model/Transaction/Failed.php
index f59b8ca7..4af00945 100644
--- a/src/Mvc/Model/Transaction/Failed.php
+++ b/src/Mvc/Model/Transaction/Failed.php
@@ -19,7 +19,6 @@
  */
 class Failed extends \Phalcon\Mvc\Model\Transaction\Exception
 {
-
     /**
      * @var ModelInterface|null
      */
diff --git a/src/Mvc/Model/Transaction/Manager.php b/src/Mvc/Model/Transaction/Manager.php
index b952a9fe..5abfd737 100644
--- a/src/Mvc/Model/Transaction/Manager.php
+++ b/src/Mvc/Model/Transaction/Manager.php
@@ -64,7 +64,6 @@
  */
 class Manager implements \Phalcon\Mvc\Model\Transaction\ManagerInterface, \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * @var DiInterface|null
      */
diff --git a/src/Mvc/Model/Transaction/ManagerInterface.php b/src/Mvc/Model/Transaction/ManagerInterface.php
index d553dc47..8e259dc1 100644
--- a/src/Mvc/Model/Transaction/ManagerInterface.php
+++ b/src/Mvc/Model/Transaction/ManagerInterface.php
@@ -18,8 +18,6 @@
  */
 interface ManagerInterface
 {
-
-
     /**
      * Remove all the transactions from the manager
      *
diff --git a/src/Mvc/Model/TransactionInterface.php b/src/Mvc/Model/TransactionInterface.php
index 90441fff..70846b52 100644
--- a/src/Mvc/Model/TransactionInterface.php
+++ b/src/Mvc/Model/TransactionInterface.php
@@ -19,8 +19,6 @@
  */
 interface TransactionInterface
 {
-
-
     /**
      * Starts the transaction
      *
diff --git a/src/Mvc/Model/ValidationFailed.php b/src/Mvc/Model/ValidationFailed.php
index 81a03731..b1248909 100644
--- a/src/Mvc/Model/ValidationFailed.php
+++ b/src/Mvc/Model/ValidationFailed.php
@@ -20,7 +20,6 @@
  */
 class ValidationFailed extends \Phalcon\Mvc\Model\Exception
 {
-
     /**
      * @var array
      */
diff --git a/src/Mvc/ModelInterface.php b/src/Mvc/ModelInterface.php
index a5aab85d..7a0f2ed3 100644
--- a/src/Mvc/ModelInterface.php
+++ b/src/Mvc/ModelInterface.php
@@ -24,8 +24,6 @@
  */
 interface ModelInterface
 {
-
-
     /**
      * Appends a customized message on the validation process
      *
diff --git a/src/Mvc/ModuleDefinitionInterface.php b/src/Mvc/ModuleDefinitionInterface.php
index 1d21552b..3ce81b33 100644
--- a/src/Mvc/ModuleDefinitionInterface.php
+++ b/src/Mvc/ModuleDefinitionInterface.php
@@ -18,8 +18,6 @@
  */
 interface ModuleDefinitionInterface
 {
-
-
     /**
      * Registers an autoloader related to the module
      *
diff --git a/src/Mvc/Router.php b/src/Mvc/Router.php
index d09beb9f..dc88de03 100644
--- a/src/Mvc/Router.php
+++ b/src/Mvc/Router.php
@@ -148,34 +148,6 @@ class Router extends AbstractInjectionAware implements \Phalcon\Mvc\RouterInterf
      */
     protected $wasMatched = false;
 
-    /**
-     * @return array
-     */
-    public function getKeyRouteNames(): array
-    {
-    }
-
-    /**
-     * @param array $keyRouteNames
-     */
-    public function setKeyRouteNames(array $keyRouteNames)
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getKeyRouteIds(): array
-    {
-    }
-
-    /**
-     * @param array $keyRouteIds
-     */
-    public function setKeyRouteIds(array $keyRouteIds)
-    {
-    }
-
     /**
      * Phalcon\Mvc\Router constructor
      *
@@ -458,12 +430,35 @@ public function getControllerName(): string
     {
     }
 
+    /**
+     * Returns an array of default parameters
+     *
+     * @return array
+     */
+    public function getDefaults(): array
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public function getKeyRouteNames(): array
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public function getKeyRouteIds(): array
+    {
+    }
+
     /**
      * Returns the route that matches the handled URI
      *
-     * @return RouteInterface
+     * @return RouteInterface|null
      */
-    public function getMatchedRoute(): RouteInterface
+    public function getMatchedRoute(): ?RouteInterface
     {
     }
 
@@ -651,21 +646,30 @@ public function setDefaults(array $defaults): RouterInterface
     }
 
     /**
-     * Returns an array of default parameters
+     * Sets the events manager
      *
-     * @return array
+     * @param ManagerInterface $eventsManager *
+     * @return void
      */
-    public function getDefaults(): array
+    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager): void
     {
     }
 
     /**
-     * Sets the events manager
+     * @param array $routeNames
      *
-     * @param ManagerInterface $eventsManager *
-     * @return void
+     * @return Router
      */
-    public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager): void
+    public function setKeyRouteNames(array $routeNames): Router
+    {
+    }
+
+    /**
+     * @param array $routeIds
+     *
+     * @return Router
+     */
+    public function setKeyRouteIds(array $routeIds): Router
     {
     }
 
diff --git a/src/Mvc/Router/Annotations.php b/src/Mvc/Router/Annotations.php
index b8524d72..98bbc18f 100644
--- a/src/Mvc/Router/Annotations.php
+++ b/src/Mvc/Router/Annotations.php
@@ -37,7 +37,6 @@
  */
 class Annotations extends Router
 {
-
     /**
      * @var string
      */
diff --git a/src/Mvc/Router/Exception.php b/src/Mvc/Router/Exception.php
index d873a45c..984c2f6e 100644
--- a/src/Mvc/Router/Exception.php
+++ b/src/Mvc/Router/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Mvc/Router/Group.php b/src/Mvc/Router/Group.php
index 3aa02f40..2532f8fb 100644
--- a/src/Mvc/Router/Group.php
+++ b/src/Mvc/Router/Group.php
@@ -59,7 +59,6 @@
  */
 class Group implements \Phalcon\Mvc\Router\GroupInterface
 {
-
     /**
      * @var callable|null
      */
diff --git a/src/Mvc/Router/GroupInterface.php b/src/Mvc/Router/GroupInterface.php
index bf2515e8..f8048fe9 100644
--- a/src/Mvc/Router/GroupInterface.php
+++ b/src/Mvc/Router/GroupInterface.php
@@ -57,8 +57,6 @@
  */
 interface GroupInterface
 {
-
-
     /**
      * Adds a route to the router on any HTTP method
      *
diff --git a/src/Mvc/Router/Route.php b/src/Mvc/Router/Route.php
index 57f45ed7..1614cde9 100644
--- a/src/Mvc/Router/Route.php
+++ b/src/Mvc/Router/Route.php
@@ -16,7 +16,6 @@
  */
 class Route implements \Phalcon\Mvc\Router\RouteInterface
 {
-
     /**
      * @var callable|null
      */
@@ -77,13 +76,6 @@ class Route implements \Phalcon\Mvc\Router\RouteInterface
      */
     protected static $uniqueId = 0;
 
-    /**
-     * @return string|null
-     */
-    public function getId(): ?string
-    {
-    }
-
     /**
      * Phalcon\Mvc\Router\Route constructor
      *
@@ -211,6 +203,13 @@ public function getHostname(): ?string
     {
     }
 
+    /**
+     * @return string | null
+     */
+    public function getId(): ?string
+    {
+    }
+
     /**
      * Returns the 'match' callback if any
      *
diff --git a/src/Mvc/Router/RouteInterface.php b/src/Mvc/Router/RouteInterface.php
index 04c13e01..e759ac83 100644
--- a/src/Mvc/Router/RouteInterface.php
+++ b/src/Mvc/Router/RouteInterface.php
@@ -16,8 +16,6 @@
  */
 interface RouteInterface
 {
-
-
     /**
      * Replaces placeholders from pattern returning a valid PCRE regular expression
      *
diff --git a/src/Mvc/RouterInterface.php b/src/Mvc/RouterInterface.php
index f6c2dcc2..bb1b0088 100644
--- a/src/Mvc/RouterInterface.php
+++ b/src/Mvc/RouterInterface.php
@@ -17,8 +17,6 @@
  */
 interface RouterInterface
 {
-
-
     /**
      * Adds a route to the router on any HTTP method
      *
@@ -26,17 +24,9 @@ interface RouterInterface
      * @param array|string|null $paths
      * @param array|string|null $httpMethods *
      * @return RouteInterface
+     * @param int $position
      */
-    public function add(string $pattern, $paths = null, $httpMethods = null): RouteInterface;
-
-    /**
-     * Attach Route object to the routes stack.
-     *
-     * @param RouteInterface $route
-     * @param int $position *
-     * @return RouterInterface
-     */
-    public function attach(\Phalcon\Mvc\Router\RouteInterface $route, int $position = Router::POSITION_LAST): RouterInterface;
+    public function add(string $pattern, $paths = null, $httpMethods = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is CONNECT
@@ -44,8 +34,9 @@ public function attach(\Phalcon\Mvc\Router\RouteInterface $route, int $position
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addConnect(string $pattern, $paths = null): RouteInterface;
+    public function addConnect(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is DELETE
@@ -53,8 +44,9 @@ public function addConnect(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addDelete(string $pattern, $paths = null): RouteInterface;
+    public function addDelete(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is HEAD
@@ -62,8 +54,9 @@ public function addDelete(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addHead(string $pattern, $paths = null): RouteInterface;
+    public function addHead(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is GET
@@ -71,8 +64,9 @@ public function addHead(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addGet(string $pattern, $paths = null): RouteInterface;
+    public function addGet(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Add a route to the router that only match if the HTTP method is OPTIONS
@@ -80,8 +74,9 @@ public function addGet(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addOptions(string $pattern, $paths = null): RouteInterface;
+    public function addOptions(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is PATCH
@@ -89,8 +84,9 @@ public function addOptions(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addPatch(string $pattern, $paths = null): RouteInterface;
+    public function addPatch(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is POST
@@ -98,8 +94,9 @@ public function addPatch(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addPost(string $pattern, $paths = null): RouteInterface;
+    public function addPost(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is PURGE
@@ -108,8 +105,9 @@ public function addPost(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addPurge(string $pattern, $paths = null): RouteInterface;
+    public function addPurge(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is PUT
@@ -117,8 +115,9 @@ public function addPurge(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addPut(string $pattern, $paths = null): RouteInterface;
+    public function addPut(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
 
     /**
      * Adds a route to the router that only match if the HTTP method is TRACE
@@ -126,8 +125,18 @@ public function addPut(string $pattern, $paths = null): RouteInterface;
      * @param string $pattern
      * @param array|string|null $paths *
      * @return RouteInterface
+     * @param int $position
      */
-    public function addTrace(string $pattern, $paths = null): RouteInterface;
+    public function addTrace(string $pattern, $paths = null, int $position = Router::POSITION_LAST): RouteInterface;
+
+    /**
+     * Attach Route object to the routes stack.
+     *
+     * @param RouteInterface $route
+     * @param int $position *
+     * @return RouterInterface
+     */
+    public function attach(\Phalcon\Mvc\Router\RouteInterface $route, int $position = Router::POSITION_LAST): RouterInterface;
 
     /**
      * Removes all the defined routes
@@ -153,9 +162,9 @@ public function getControllerName(): string;
     /**
      * Returns the route that matches the handled URI
      *
-     * @return RouteInterface
+     * @return RouteInterface|null
      */
-    public function getMatchedRoute(): RouteInterface;
+    public function getMatchedRoute(): ?RouteInterface;
 
     /**
      * Return the sub expressions in the regular expression matched
diff --git a/src/Mvc/Url.php b/src/Mvc/Url.php
index 690ebe50..a81ea844 100644
--- a/src/Mvc/Url.php
+++ b/src/Mvc/Url.php
@@ -35,7 +35,6 @@
  */
 class Url extends AbstractInjectionAware implements \Phalcon\Mvc\Url\UrlInterface
 {
-
     /**
      * @var null | string
      */
diff --git a/src/Mvc/Url/Exception.php b/src/Mvc/Url/Exception.php
index bcdd56af..079b7971 100644
--- a/src/Mvc/Url/Exception.php
+++ b/src/Mvc/Url/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Mvc/Url/UrlInterface.php b/src/Mvc/Url/UrlInterface.php
index 771bc095..5d335548 100644
--- a/src/Mvc/Url/UrlInterface.php
+++ b/src/Mvc/Url/UrlInterface.php
@@ -14,8 +14,6 @@
  */
 interface UrlInterface
 {
-
-
     /**
      * Generates a URL
      *
diff --git a/src/Mvc/View.php b/src/Mvc/View.php
index 3409f7b8..e7a3e75c 100644
--- a/src/Mvc/View.php
+++ b/src/Mvc/View.php
@@ -190,27 +190,6 @@ class View extends Injectable implements \Phalcon\Mvc\ViewInterface, \Phalcon\Ev
      */
     protected $viewParams = [];
 
-    /**
-     * @return int
-     */
-    public function getCurrentRenderLevel(): int
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getRegisteredEngines(): array
-    {
-    }
-
-    /**
-     * @return int
-     */
-    public function getRenderLevel(): int
-    {
-    }
-
     /**
      * Phalcon\Mvc\View constructor
      *
@@ -380,6 +359,27 @@ public function getControllerName(): string
     {
     }
 
+    /**
+     * @return int
+     */
+    public function getCurrentRenderLevel(): int
+    {
+    }
+
+    /**
+     * @return array
+     */
+    public function getRegisteredEngines(): array
+    {
+    }
+
+    /**
+     * @return int
+     */
+    public function getRenderLevel(): int
+    {
+    }
+
     /**
      * Returns the internal event manager
      *
diff --git a/src/Mvc/View/Engine/AbstractEngine.php b/src/Mvc/View/Engine/AbstractEngine.php
index f697a132..537d1ba7 100644
--- a/src/Mvc/View/Engine/AbstractEngine.php
+++ b/src/Mvc/View/Engine/AbstractEngine.php
@@ -19,7 +19,6 @@
  */
 abstract class AbstractEngine extends Injectable implements \Phalcon\Mvc\View\Engine\EngineInterface
 {
-
     /**
      * @var ViewBaseInterface
      */
diff --git a/src/Mvc/View/Engine/EngineInterface.php b/src/Mvc/View/Engine/EngineInterface.php
index 7222dc39..ac49aaa9 100644
--- a/src/Mvc/View/Engine/EngineInterface.php
+++ b/src/Mvc/View/Engine/EngineInterface.php
@@ -14,8 +14,6 @@
  */
 interface EngineInterface
 {
-
-
     /**
      * Returns cached output on another view stage
      *
diff --git a/src/Mvc/View/Engine/Php.php b/src/Mvc/View/Engine/Php.php
index e7461b13..31d0d8d4 100644
--- a/src/Mvc/View/Engine/Php.php
+++ b/src/Mvc/View/Engine/Php.php
@@ -14,8 +14,6 @@
  */
 class Php extends \Phalcon\Mvc\View\Engine\AbstractEngine
 {
-
-
     /**
      * Renders a view using the template engine
      *
diff --git a/src/Mvc/View/Engine/Volt.php b/src/Mvc/View/Engine/Volt.php
index 188dbec0..8e75c451 100644
--- a/src/Mvc/View/Engine/Volt.php
+++ b/src/Mvc/View/Engine/Volt.php
@@ -22,7 +22,6 @@
  */
 class Volt extends \Phalcon\Mvc\View\Engine\AbstractEngine implements \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var Compiler
      */
diff --git a/src/Mvc/View/Engine/Volt/Compiler.php b/src/Mvc/View/Engine/Volt/Compiler.php
index aee32c2d..91aa4307 100644
--- a/src/Mvc/View/Engine/Volt/Compiler.php
+++ b/src/Mvc/View/Engine/Volt/Compiler.php
@@ -27,7 +27,6 @@
  */
 class Compiler implements \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * @var bool
      */
@@ -395,10 +394,12 @@ public function compileSwitch(array $statement, bool $extendsMode = false): stri
     /**
      * Resolves an expression node in an AST volt tree
      *
-     * @param array $expr *
+     * @param array $expr
+     * @param bool  $doubleQuotes
+     *
      * @return string
      */
-    final public function expression(array $expr): string
+    final public function expression(array $expr, bool $doubleQuotes = false): string
     {
     }
 
@@ -417,11 +418,13 @@ final public function fireExtensionEvent(string $name, array $arguments = [])
     /**
      * Resolves function intermediate code into PHP function calls
      *
-     * @param array $expr *
+     * @param array $expr
+     * @param bool  $doubleQuotes
+     *
      * @throws \Phalcon\Mvc\View\Engine\Volt\Exception
      * @return string
      */
-    public function functionCall(array $expr): string
+    public function functionCall(array $expr, bool $doubleQuotes = false): string
     {
     }
 
@@ -625,4 +628,12 @@ final protected function statementList(array $statements, bool $extendsMode = fa
     final protected function statementListOrExtends($statements)
     {
     }
+
+    /**
+     * @param array $expression
+     * @return bool
+     */
+    private function isTagFactory(array $expression): bool
+    {
+    }
 }
diff --git a/src/Mvc/View/Engine/Volt/Exception.php b/src/Mvc/View/Engine/Volt/Exception.php
index ffa42db6..95fd8bbe 100644
--- a/src/Mvc/View/Engine/Volt/Exception.php
+++ b/src/Mvc/View/Engine/Volt/Exception.php
@@ -16,7 +16,6 @@
  */
 class Exception extends \Phalcon\Mvc\View\Exception
 {
-
     /**
      * @var array
      */
diff --git a/src/Mvc/View/Exception.php b/src/Mvc/View/Exception.php
index 4c3069c7..6fb7f25e 100644
--- a/src/Mvc/View/Exception.php
+++ b/src/Mvc/View/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Mvc/View/Simple.php b/src/Mvc/View/Simple.php
index 8889f31a..b1d8c9c9 100644
--- a/src/Mvc/View/Simple.php
+++ b/src/Mvc/View/Simple.php
@@ -47,7 +47,6 @@
  */
 class Simple extends Injectable implements \Phalcon\Mvc\ViewBaseInterface, \Phalcon\Events\EventsAwareInterface
 {
-
     /**
      * @var string
      */
@@ -74,9 +73,9 @@ class Simple extends Injectable implements \Phalcon\Mvc\ViewBaseInterface, \Phal
     protected $options = [];
 
     /**
-     * @var array|null
+     * @var array
      */
-    protected $registeredEngines;
+    protected $registeredEngines = [];
 
     /**
      * @var string
@@ -88,13 +87,6 @@ class Simple extends Injectable implements \Phalcon\Mvc\ViewBaseInterface, \Phal
      */
     protected $viewParams = [];
 
-    /**
-     * @return array|null
-     */
-    public function getRegisteredEngines(): ?array
-    {
-    }
-
     /**
      * Phalcon\Mvc\View\Simple constructor
      *
@@ -169,6 +161,13 @@ public function getParamsToView(): array
     {
     }
 
+    /**
+     * @return array
+     */
+    public function getRegisteredEngines(): array
+    {
+    }
+
     /**
      * Returns a parameter previously set in the view
      *
diff --git a/src/Mvc/ViewBaseInterface.php b/src/Mvc/ViewBaseInterface.php
index eae40a95..becc5b16 100644
--- a/src/Mvc/ViewBaseInterface.php
+++ b/src/Mvc/ViewBaseInterface.php
@@ -18,8 +18,6 @@
  */
 interface ViewBaseInterface
 {
-
-
     /**
      * Returns cached output from another view stage
      *
diff --git a/src/Mvc/ViewInterface.php b/src/Mvc/ViewInterface.php
index 279f876f..6e6caea1 100644
--- a/src/Mvc/ViewInterface.php
+++ b/src/Mvc/ViewInterface.php
@@ -16,8 +16,6 @@
  */
 interface ViewInterface extends \Phalcon\Mvc\ViewBaseInterface
 {
-
-
     /**
      * Resets any template before layouts
      */
diff --git a/src/Paginator/Adapter/AbstractAdapter.php b/src/Paginator/Adapter/AbstractAdapter.php
index eb12f3ea..f1204269 100644
--- a/src/Paginator/Adapter/AbstractAdapter.php
+++ b/src/Paginator/Adapter/AbstractAdapter.php
@@ -18,7 +18,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Paginator\Adapter\AdapterInterface
 {
-
     /**
      * Configuration of paginator
      *
diff --git a/src/Paginator/Adapter/AdapterInterface.php b/src/Paginator/Adapter/AdapterInterface.php
index 990d1d5d..dd42c377 100644
--- a/src/Paginator/Adapter/AdapterInterface.php
+++ b/src/Paginator/Adapter/AdapterInterface.php
@@ -18,8 +18,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Get current rows limit
      *
diff --git a/src/Paginator/Adapter/Model.php b/src/Paginator/Adapter/Model.php
index ec8e4edd..fa9d080d 100644
--- a/src/Paginator/Adapter/Model.php
+++ b/src/Paginator/Adapter/Model.php
@@ -80,8 +80,6 @@
  */
 class Model extends \Phalcon\Paginator\Adapter\AbstractAdapter
 {
-
-
     /**
      * Returns a slice of the resultset to show in the pagination
      *
diff --git a/src/Paginator/Adapter/NativeArray.php b/src/Paginator/Adapter/NativeArray.php
index 2e3e749e..dee9f357 100644
--- a/src/Paginator/Adapter/NativeArray.php
+++ b/src/Paginator/Adapter/NativeArray.php
@@ -37,8 +37,6 @@
  */
 class NativeArray extends \Phalcon\Paginator\Adapter\AbstractAdapter
 {
-
-
     /**
      * Returns a slice of the resultset to show in the pagination
      *
diff --git a/src/Paginator/Adapter/QueryBuilder.php b/src/Paginator/Adapter/QueryBuilder.php
index c595a6f9..a38b0333 100644
--- a/src/Paginator/Adapter/QueryBuilder.php
+++ b/src/Paginator/Adapter/QueryBuilder.php
@@ -38,7 +38,6 @@
  */
 class QueryBuilder extends \Phalcon\Paginator\Adapter\AbstractAdapter
 {
-
     /**
      * Paginator's data
      *
diff --git a/src/Paginator/Exception.php b/src/Paginator/Exception.php
index c81291e0..dc998629 100644
--- a/src/Paginator/Exception.php
+++ b/src/Paginator/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Paginator/PaginatorFactory.php b/src/Paginator/PaginatorFactory.php
index 65a52d0b..9d09a036 100644
--- a/src/Paginator/PaginatorFactory.php
+++ b/src/Paginator/PaginatorFactory.php
@@ -22,8 +22,6 @@
  */
 class PaginatorFactory extends AbstractFactory
 {
-
-
     /**
      * AdapterFactory constructor.
      *
diff --git a/src/Paginator/Repository.php b/src/Paginator/Repository.php
index 33e24892..ffa6ab77 100644
--- a/src/Paginator/Repository.php
+++ b/src/Paginator/Repository.php
@@ -18,7 +18,6 @@
  */
 class Repository implements \Phalcon\Paginator\RepositoryInterface, \JsonSerializable
 {
-
     /**
      * @var array
      */
diff --git a/src/Session/Adapter/AbstractAdapter.php b/src/Session/Adapter/AbstractAdapter.php
index ef5619e0..0d5a61b2 100644
--- a/src/Session/Adapter/AbstractAdapter.php
+++ b/src/Session/Adapter/AbstractAdapter.php
@@ -22,7 +22,6 @@
  */
 abstract class AbstractAdapter implements \SessionHandlerInterface
 {
-
     /**
      * @var AdapterInterface
      */
diff --git a/src/Session/Adapter/Libmemcached.php b/src/Session/Adapter/Libmemcached.php
index 27782ba0..c5cbb3b1 100644
--- a/src/Session/Adapter/Libmemcached.php
+++ b/src/Session/Adapter/Libmemcached.php
@@ -16,8 +16,6 @@
  */
 class Libmemcached extends \Phalcon\Session\Adapter\AbstractAdapter
 {
-
-
     /**
      * Libmemcached constructor.
      *
diff --git a/src/Session/Adapter/Noop.php b/src/Session/Adapter/Noop.php
index 934c8e77..fbebf45f 100644
--- a/src/Session/Adapter/Noop.php
+++ b/src/Session/Adapter/Noop.php
@@ -29,7 +29,6 @@
  */
 class Noop implements \SessionHandlerInterface
 {
-
     /**
      * The connection of some adapters
      *
diff --git a/src/Session/Adapter/Redis.php b/src/Session/Adapter/Redis.php
index ea19a260..66aee59d 100644
--- a/src/Session/Adapter/Redis.php
+++ b/src/Session/Adapter/Redis.php
@@ -16,8 +16,6 @@
  */
 class Redis extends \Phalcon\Session\Adapter\AbstractAdapter
 {
-
-
     /**
      * Constructor
      *
diff --git a/src/Session/Adapter/Stream.php b/src/Session/Adapter/Stream.php
index 513009f8..02278ffa 100644
--- a/src/Session/Adapter/Stream.php
+++ b/src/Session/Adapter/Stream.php
@@ -37,7 +37,6 @@
  */
 class Stream extends \Phalcon\Session\Adapter\Noop
 {
-
     /**
      * @var string
      */
diff --git a/src/Session/Bag.php b/src/Session/Bag.php
index 93a07233..a18db468 100644
--- a/src/Session/Bag.php
+++ b/src/Session/Bag.php
@@ -35,7 +35,6 @@
  */
 class Bag extends Collection implements \Phalcon\Session\BagInterface, \Phalcon\Di\InjectionAwareInterface
 {
-
     /**
      * @var DiInterface|null
      */
diff --git a/src/Session/BagInterface.php b/src/Session/BagInterface.php
index 71f0d77c..52e9d16e 100644
--- a/src/Session/BagInterface.php
+++ b/src/Session/BagInterface.php
@@ -16,8 +16,6 @@
  */
 interface BagInterface
 {
-
-
     /**
      * @param string $element
      * @return mixed
diff --git a/src/Session/Exception.php b/src/Session/Exception.php
index daf2133d..8154b4f9 100644
--- a/src/Session/Exception.php
+++ b/src/Session/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Session/Manager.php b/src/Session/Manager.php
index a2176cdf..475935ba 100644
--- a/src/Session/Manager.php
+++ b/src/Session/Manager.php
@@ -24,7 +24,6 @@
  */
 class Manager extends AbstractInjectionAware implements \Phalcon\Session\ManagerInterface
 {
-
     /**
      * @var SessionHandlerInterface|null
      */
diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
index 539a8a10..eb053a09 100644
--- a/src/Storage/Adapter/AbstractAdapter.php
+++ b/src/Storage/Adapter/AbstractAdapter.php
@@ -31,7 +31,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Storage\Adapter\AdapterInterface
 {
-
     /**
      * @var mixed
      */
@@ -75,15 +74,6 @@ abstract class AbstractAdapter implements \Phalcon\Storage\Adapter\AdapterInterf
      */
     protected $serializerFactory;
 
-    /**
-     * Name of the default serializer class
-     *
-     * @return string
-     */
-    public function getDefaultSerializer(): string
-    {
-    }
-
     /**
      * AbstractAdapter constructor.
      *
@@ -141,6 +131,15 @@ public function getAdapter()
     {
     }
 
+    /**
+     * Name of the default serializer class
+     *
+     * @return string
+     */
+    public function getDefaultSerializer(): string
+    {
+    }
+
     /**
      * Returns all the keys stored
      *
diff --git a/src/Storage/Adapter/AdapterInterface.php b/src/Storage/Adapter/AdapterInterface.php
index fb60828f..46e1c225 100644
--- a/src/Storage/Adapter/AdapterInterface.php
+++ b/src/Storage/Adapter/AdapterInterface.php
@@ -16,8 +16,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Flushes/clears the cache
      *
diff --git a/src/Storage/Adapter/Apcu.php b/src/Storage/Adapter/Apcu.php
index 99864286..ea26b961 100644
--- a/src/Storage/Adapter/Apcu.php
+++ b/src/Storage/Adapter/Apcu.php
@@ -22,7 +22,6 @@
  */
 class Apcu extends \Phalcon\Storage\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */
diff --git a/src/Storage/Adapter/Libmemcached.php b/src/Storage/Adapter/Libmemcached.php
index 8447c992..e8ae138f 100644
--- a/src/Storage/Adapter/Libmemcached.php
+++ b/src/Storage/Adapter/Libmemcached.php
@@ -20,7 +20,6 @@
  */
 class Libmemcached extends \Phalcon\Storage\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */
diff --git a/src/Storage/Adapter/Memory.php b/src/Storage/Adapter/Memory.php
index 4cc71710..d9669d89 100644
--- a/src/Storage/Adapter/Memory.php
+++ b/src/Storage/Adapter/Memory.php
@@ -22,7 +22,6 @@
  */
 class Memory extends \Phalcon\Storage\Adapter\AbstractAdapter
 {
-
     /**
      * @var array
      */
diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
index 5d507d68..8548d8d5 100644
--- a/src/Storage/Adapter/Redis.php
+++ b/src/Storage/Adapter/Redis.php
@@ -22,7 +22,6 @@
  */
 class Redis extends \Phalcon\Storage\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */
@@ -32,7 +31,19 @@ class Redis extends \Phalcon\Storage\Adapter\AbstractAdapter
      * Redis constructor.
      *
      * @param SerializerFactory $factory
-     * @param array             $options
+     * @param array             $options = [
+     *     "host"           => "127.0.0.1",
+     *     "port"           => 6379,
+     *     "index"          => 0,
+     *     "timeout"        => 0,
+     *     "persistent"     => false,
+     *     "persistentId"   => "",
+     *     "auth"           => "",
+     *     "socket"         => "",
+     *     "connectTimeout" => 0,
+     *     "retryInterval"  => 0,
+     *     "readTimeout"    => 0,
+     * ]
      *
      * @throws SupportException
      */
diff --git a/src/Storage/Adapter/Stream.php b/src/Storage/Adapter/Stream.php
index 9d77beea..05616436 100644
--- a/src/Storage/Adapter/Stream.php
+++ b/src/Storage/Adapter/Stream.php
@@ -16,9 +16,6 @@
 use Phalcon\Storage\SerializerFactory;
 use Phalcon\Storage\Traits\StorageErrorHandlerTrait;
 use Phalcon\Support\Exception as SupportException;
-use Phalcon\Traits\Helper\Str\DirFromFileTrait;
-use Phalcon\Traits\Helper\Str\DirSeparatorTrait;
-use Phalcon\Traits\Php\FileTrait;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 
@@ -30,7 +27,6 @@
  */
 class Stream extends \Phalcon\Storage\Adapter\AbstractAdapter
 {
-
     /**
      * @var string
      */
diff --git a/src/Storage/AdapterFactory.php b/src/Storage/AdapterFactory.php
index 8eadba1f..e349cb7f 100644
--- a/src/Storage/AdapterFactory.php
+++ b/src/Storage/AdapterFactory.php
@@ -22,7 +22,6 @@
  */
 class AdapterFactory extends AbstractFactory
 {
-
     /**
      * @var SerializerFactory
      */
diff --git a/src/Storage/Exception.php b/src/Storage/Exception.php
index 9f9ad399..d24a0441 100644
--- a/src/Storage/Exception.php
+++ b/src/Storage/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Storage/Serializer/AbstractSerializer.php b/src/Storage/Serializer/AbstractSerializer.php
index ee81d374..6423bda8 100644
--- a/src/Storage/Serializer/AbstractSerializer.php
+++ b/src/Storage/Serializer/AbstractSerializer.php
@@ -15,7 +15,6 @@
  */
 abstract class AbstractSerializer implements \Phalcon\Storage\Serializer\SerializerInterface
 {
-
     /**
      * @var mixed
      */
@@ -35,6 +34,25 @@ public function __construct($data = null)
     {
     }
 
+    /**
+     * Serialize data
+     *
+     * @return array
+     */
+    public function __serialize(): array
+    {
+    }
+
+    /**
+     * Unserialize data
+     *
+     * @param array $data
+     * @return void
+     */
+    public function __unserialize(array $data): void
+    {
+    }
+
     /**
      * @return mixed
      */
@@ -70,19 +88,4 @@ public function setData($data): void
     protected function isSerializable($data): bool
     {
     }
-
-    /**
-     * @return array
-     */
-    public function __serialize(): array
-    {
-    }
-
-    /**
-     * @param array $data
-     * @return void
-     */
-    public function __unserialize(array $data): void
-    {
-    }
 }
diff --git a/src/Storage/Serializer/Base64.php b/src/Storage/Serializer/Base64.php
index 38759edb..d363a5e0 100644
--- a/src/Storage/Serializer/Base64.php
+++ b/src/Storage/Serializer/Base64.php
@@ -21,8 +21,6 @@
  */
 class Base64 extends \Phalcon\Storage\Serializer\AbstractSerializer
 {
-
-
     /**
      * Serializes data
      *
diff --git a/src/Storage/Serializer/Igbinary.php b/src/Storage/Serializer/Igbinary.php
index d6cad30f..46d67f4d 100644
--- a/src/Storage/Serializer/Igbinary.php
+++ b/src/Storage/Serializer/Igbinary.php
@@ -19,8 +19,6 @@
  */
 class Igbinary extends \Phalcon\Storage\Serializer\AbstractSerializer
 {
-
-
     /**
      * Serializes data
      *
diff --git a/src/Storage/Serializer/Json.php b/src/Storage/Serializer/Json.php
index 68ec947e..9b94aa1b 100644
--- a/src/Storage/Serializer/Json.php
+++ b/src/Storage/Serializer/Json.php
@@ -22,8 +22,6 @@
  */
 class Json extends \Phalcon\Storage\Serializer\AbstractSerializer
 {
-
-
     /**
      * Serializes data
      *
diff --git a/src/Storage/Serializer/MemcachedIgbinary.php b/src/Storage/Serializer/MemcachedIgbinary.php
index 023110a9..4d03414f 100644
--- a/src/Storage/Serializer/MemcachedIgbinary.php
+++ b/src/Storage/Serializer/MemcachedIgbinary.php
@@ -14,6 +14,4 @@
  */
 class MemcachedIgbinary extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/MemcachedJson.php b/src/Storage/Serializer/MemcachedJson.php
index 6c613a88..fd0a7860 100644
--- a/src/Storage/Serializer/MemcachedJson.php
+++ b/src/Storage/Serializer/MemcachedJson.php
@@ -14,6 +14,4 @@
  */
 class MemcachedJson extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/MemcachedPhp.php b/src/Storage/Serializer/MemcachedPhp.php
index 3aeb0513..07b3c63d 100644
--- a/src/Storage/Serializer/MemcachedPhp.php
+++ b/src/Storage/Serializer/MemcachedPhp.php
@@ -14,6 +14,4 @@
  */
 class MemcachedPhp extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/Msgpack.php b/src/Storage/Serializer/Msgpack.php
index 1eb7bbac..a09ea669 100644
--- a/src/Storage/Serializer/Msgpack.php
+++ b/src/Storage/Serializer/Msgpack.php
@@ -19,8 +19,6 @@
  */
 class Msgpack extends \Phalcon\Storage\Serializer\Igbinary
 {
-
-
     /**
      * Serializes data
      *
diff --git a/src/Storage/Serializer/None.php b/src/Storage/Serializer/None.php
index 0fba9198..59c7da77 100644
--- a/src/Storage/Serializer/None.php
+++ b/src/Storage/Serializer/None.php
@@ -19,8 +19,6 @@
  */
 class None extends \Phalcon\Storage\Serializer\AbstractSerializer
 {
-
-
     /**
      * Serializes data
      *
diff --git a/src/Storage/Serializer/Php.php b/src/Storage/Serializer/Php.php
index 5989b82a..4b117985 100644
--- a/src/Storage/Serializer/Php.php
+++ b/src/Storage/Serializer/Php.php
@@ -21,8 +21,6 @@
  */
 class Php extends \Phalcon\Storage\Serializer\AbstractSerializer
 {
-
-
     /**
      * Serializes data
      *
diff --git a/src/Storage/Serializer/RedisIgbinary.php b/src/Storage/Serializer/RedisIgbinary.php
index 35765eb7..76c927ee 100644
--- a/src/Storage/Serializer/RedisIgbinary.php
+++ b/src/Storage/Serializer/RedisIgbinary.php
@@ -14,6 +14,4 @@
  */
 class RedisIgbinary extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/RedisJson.php b/src/Storage/Serializer/RedisJson.php
index f8e9e6cd..4a0e63f3 100644
--- a/src/Storage/Serializer/RedisJson.php
+++ b/src/Storage/Serializer/RedisJson.php
@@ -14,6 +14,4 @@
  */
 class RedisJson extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/RedisMsgpack.php b/src/Storage/Serializer/RedisMsgpack.php
index a8b84d7f..57533129 100644
--- a/src/Storage/Serializer/RedisMsgpack.php
+++ b/src/Storage/Serializer/RedisMsgpack.php
@@ -14,6 +14,4 @@
  */
 class RedisMsgpack extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/RedisNone.php b/src/Storage/Serializer/RedisNone.php
index 1e965fd8..053002fe 100644
--- a/src/Storage/Serializer/RedisNone.php
+++ b/src/Storage/Serializer/RedisNone.php
@@ -14,6 +14,4 @@
  */
 class RedisNone extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/RedisPhp.php b/src/Storage/Serializer/RedisPhp.php
index 0c3a15e2..4dd4d314 100644
--- a/src/Storage/Serializer/RedisPhp.php
+++ b/src/Storage/Serializer/RedisPhp.php
@@ -14,6 +14,4 @@
  */
 class RedisPhp extends \Phalcon\Storage\Serializer\None
 {
-
-
 }
diff --git a/src/Storage/Serializer/SerializerInterface.php b/src/Storage/Serializer/SerializerInterface.php
index be92b3d6..021ad6e5 100644
--- a/src/Storage/Serializer/SerializerInterface.php
+++ b/src/Storage/Serializer/SerializerInterface.php
@@ -21,8 +21,6 @@
  */
 interface SerializerInterface extends \Serializable
 {
-
-
     /**
      * @return mixed
      */
diff --git a/src/Storage/SerializerFactory.php b/src/Storage/SerializerFactory.php
index 9ee79a6f..ca3f88a3 100644
--- a/src/Storage/SerializerFactory.php
+++ b/src/Storage/SerializerFactory.php
@@ -22,8 +22,6 @@
  */
 class SerializerFactory extends AbstractFactory
 {
-
-
     /**
      * SerializerFactory constructor.
      *
diff --git a/src/Support/Collection.php b/src/Support/Collection.php
index a45544bf..0979f40b 100644
--- a/src/Support/Collection.php
+++ b/src/Support/Collection.php
@@ -37,7 +37,6 @@
  */
 class Collection implements \ArrayAccess, \Phalcon\Support\Collection\CollectionInterface, \Countable, \IteratorAggregate, \JsonSerializable, \Serializable
 {
-
     /**
      * @var array
      */
diff --git a/src/Support/Collection/CollectionInterface.php b/src/Support/Collection/CollectionInterface.php
index 1c924f35..31de7e9f 100644
--- a/src/Support/Collection/CollectionInterface.php
+++ b/src/Support/Collection/CollectionInterface.php
@@ -16,8 +16,6 @@
  */
 interface CollectionInterface
 {
-
-
     /**
      * @param string $element
      * @return mixed
diff --git a/src/Support/Collection/Exception.php b/src/Support/Collection/Exception.php
index f2e1445a..44f0f8ea 100644
--- a/src/Support/Collection/Exception.php
+++ b/src/Support/Collection/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Support/Collection/ReadOnlyCollection.php b/src/Support/Collection/ReadOnlyCollection.php
index 450adce4..d5c00d3e 100644
--- a/src/Support/Collection/ReadOnlyCollection.php
+++ b/src/Support/Collection/ReadOnlyCollection.php
@@ -16,8 +16,6 @@
  */
 class ReadOnlyCollection extends Collection
 {
-
-
     /**
      * Delete the element from the collection
      *
diff --git a/src/Support/Debug.php b/src/Support/Debug.php
index ad4e6a89..bf0d6d54 100644
--- a/src/Support/Debug.php
+++ b/src/Support/Debug.php
@@ -21,7 +21,6 @@
  */
 class Debug
 {
-
     /**
      * @var array
      */
diff --git a/src/Support/Debug/Dump.php b/src/Support/Debug/Dump.php
index 913ab5f2..7fc39116 100644
--- a/src/Support/Debug/Dump.php
+++ b/src/Support/Debug/Dump.php
@@ -35,7 +35,6 @@
  */
 class Dump
 {
-
     /**
      * @var bool
      */
@@ -52,35 +51,36 @@ class Dump
     protected $styles = [];
 
     /**
-     * @return bool
+     * Phalcon\Debug\Dump constructor
+     *
+     * @param array $styles
+     * @param bool $detailed
      */
-    public function getDetailed(): bool
+    public function __construct(array $styles = [], bool $detailed = false)
     {
     }
 
     /**
-     * @param bool $detailed
+     * Alias of variables() method
+     *
+     * @return string
      */
-    public function setDetailed(bool $detailed)
+    public function all(): string
     {
     }
 
     /**
-     * Phalcon\Debug\Dump constructor
-     *
-     * @param array $styles
-     * @param bool $detailed
+     * @return bool
      */
-    public function __construct(array $styles = [], bool $detailed = false)
+    public function getDetailed(): bool
     {
     }
 
     /**
-     * Alias of variables() method
-     *
-     * @return string
+     * @param bool $detailed
+     * @return void
      */
-    public function all(): string
+    public function setDetailed(bool $detailed): void
     {
     }
 
diff --git a/src/Support/Debug/Exception.php b/src/Support/Debug/Exception.php
index 642bcf42..53196ea9 100644
--- a/src/Support/Debug/Exception.php
+++ b/src/Support/Debug/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Support/Exception.php b/src/Support/Exception.php
index d085262c..d8b9260a 100644
--- a/src/Support/Exception.php
+++ b/src/Support/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Support/Helper/Arr/AbstractArr.php b/src/Support/Helper/Arr/AbstractArr.php
index 41bb2dde..d46bba0a 100644
--- a/src/Support/Helper/Arr/AbstractArr.php
+++ b/src/Support/Helper/Arr/AbstractArr.php
@@ -17,8 +17,6 @@
  */
 abstract class AbstractArr
 {
-
-
     /**
      * Helper method to filter the collection
      *
diff --git a/src/Support/Helper/Arr/Blacklist.php b/src/Support/Helper/Arr/Blacklist.php
index 48f84cd2..f8559f34 100644
--- a/src/Support/Helper/Arr/Blacklist.php
+++ b/src/Support/Helper/Arr/Blacklist.php
@@ -15,8 +15,6 @@
  */
 class Blacklist extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array $collection
      * @param array $blackList
diff --git a/src/Support/Helper/Arr/Chunk.php b/src/Support/Helper/Arr/Chunk.php
index 6c03747a..ebdc3124 100644
--- a/src/Support/Helper/Arr/Chunk.php
+++ b/src/Support/Helper/Arr/Chunk.php
@@ -14,8 +14,6 @@
  */
 class Chunk
 {
-
-
     /**
      * @param array $collection
      * @param int   $size
diff --git a/src/Support/Helper/Arr/Filter.php b/src/Support/Helper/Arr/Filter.php
index 80257a10..519595d5 100644
--- a/src/Support/Helper/Arr/Filter.php
+++ b/src/Support/Helper/Arr/Filter.php
@@ -14,8 +14,6 @@
  */
 class Filter extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array         $collection
      * @param callable|null $method
diff --git a/src/Support/Helper/Arr/First.php b/src/Support/Helper/Arr/First.php
index d3155838..5b2a4955 100644
--- a/src/Support/Helper/Arr/First.php
+++ b/src/Support/Helper/Arr/First.php
@@ -15,8 +15,6 @@
  */
 class First extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array         $collection
      * @param callable|null $method
diff --git a/src/Support/Helper/Arr/FirstKey.php b/src/Support/Helper/Arr/FirstKey.php
index 742bc957..b86b0a9a 100644
--- a/src/Support/Helper/Arr/FirstKey.php
+++ b/src/Support/Helper/Arr/FirstKey.php
@@ -15,8 +15,6 @@
  */
 class FirstKey extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array         $collection
      * @param callable|null $method
diff --git a/src/Support/Helper/Arr/Flatten.php b/src/Support/Helper/Arr/Flatten.php
index f0e1c31d..8a4c19d9 100644
--- a/src/Support/Helper/Arr/Flatten.php
+++ b/src/Support/Helper/Arr/Flatten.php
@@ -15,8 +15,6 @@
  */
 class Flatten
 {
-
-
     /**
      * @param array $collection
      * @param bool  $deep
diff --git a/src/Support/Helper/Arr/Get.php b/src/Support/Helper/Arr/Get.php
index c21a8352..edc26e45 100644
--- a/src/Support/Helper/Arr/Get.php
+++ b/src/Support/Helper/Arr/Get.php
@@ -16,8 +16,6 @@
  */
 class Get
 {
-
-
     /**
      * @param array       $collection
      * @param mixed       $index
diff --git a/src/Support/Helper/Arr/Group.php b/src/Support/Helper/Arr/Group.php
index a6e46aa5..193debaa 100644
--- a/src/Support/Helper/Arr/Group.php
+++ b/src/Support/Helper/Arr/Group.php
@@ -14,8 +14,6 @@
  */
 class Group
 {
-
-
     /**
      * @param array           $collection
      * @param callable|string $method
diff --git a/src/Support/Helper/Arr/Has.php b/src/Support/Helper/Arr/Has.php
index 2c04c28e..a4e769ca 100644
--- a/src/Support/Helper/Arr/Has.php
+++ b/src/Support/Helper/Arr/Has.php
@@ -15,8 +15,6 @@
  */
 class Has
 {
-
-
     /**
      * @param array      $collection
      * @param string|int $index
diff --git a/src/Support/Helper/Arr/IsUnique.php b/src/Support/Helper/Arr/IsUnique.php
index ee59f07c..9851fedb 100644
--- a/src/Support/Helper/Arr/IsUnique.php
+++ b/src/Support/Helper/Arr/IsUnique.php
@@ -15,8 +15,6 @@
  */
 class IsUnique
 {
-
-
     /**
      * @param array $collection
      *
diff --git a/src/Support/Helper/Arr/Last.php b/src/Support/Helper/Arr/Last.php
index c6081e5f..469d599d 100644
--- a/src/Support/Helper/Arr/Last.php
+++ b/src/Support/Helper/Arr/Last.php
@@ -15,8 +15,6 @@
  */
 class Last extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array         $collection
      * @param callable|null $method
diff --git a/src/Support/Helper/Arr/LastKey.php b/src/Support/Helper/Arr/LastKey.php
index cef29a8c..a4ba6482 100644
--- a/src/Support/Helper/Arr/LastKey.php
+++ b/src/Support/Helper/Arr/LastKey.php
@@ -15,8 +15,6 @@
  */
 class LastKey extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array         $collection
      * @param callable|null $method
diff --git a/src/Support/Helper/Arr/Pluck.php b/src/Support/Helper/Arr/Pluck.php
index c0726c6e..00104e47 100644
--- a/src/Support/Helper/Arr/Pluck.php
+++ b/src/Support/Helper/Arr/Pluck.php
@@ -14,8 +14,6 @@
  */
 class Pluck
 {
-
-
     /**
      * @param array  $collection
      * @param string $element
diff --git a/src/Support/Helper/Arr/Set.php b/src/Support/Helper/Arr/Set.php
index cd357661..c73512e3 100644
--- a/src/Support/Helper/Arr/Set.php
+++ b/src/Support/Helper/Arr/Set.php
@@ -14,8 +14,6 @@
  */
 class Set
 {
-
-
     /**
      * @param array $collection
      * @param mixed $value
diff --git a/src/Support/Helper/Arr/SliceLeft.php b/src/Support/Helper/Arr/SliceLeft.php
index ca742060..44c11185 100644
--- a/src/Support/Helper/Arr/SliceLeft.php
+++ b/src/Support/Helper/Arr/SliceLeft.php
@@ -14,8 +14,6 @@
  */
 class SliceLeft
 {
-
-
     /**
      * @param array $collection
      * @param int   $elements
diff --git a/src/Support/Helper/Arr/SliceRight.php b/src/Support/Helper/Arr/SliceRight.php
index 4297a2f0..26de4bdd 100644
--- a/src/Support/Helper/Arr/SliceRight.php
+++ b/src/Support/Helper/Arr/SliceRight.php
@@ -14,8 +14,6 @@
  */
 class SliceRight
 {
-
-
     /**
      * @param array $collection
      * @param int   $elements
diff --git a/src/Support/Helper/Arr/Split.php b/src/Support/Helper/Arr/Split.php
index 0e69f3a8..f224b9c9 100644
--- a/src/Support/Helper/Arr/Split.php
+++ b/src/Support/Helper/Arr/Split.php
@@ -15,8 +15,6 @@
  */
 class Split
 {
-
-
     /**
      * @param array $collection
      *
diff --git a/src/Support/Helper/Arr/ToObject.php b/src/Support/Helper/Arr/ToObject.php
index f4a42c9f..4a24639c 100644
--- a/src/Support/Helper/Arr/ToObject.php
+++ b/src/Support/Helper/Arr/ToObject.php
@@ -14,8 +14,6 @@
  */
 class ToObject
 {
-
-
     /**
      * @param array $collection
      *
diff --git a/src/Support/Helper/Arr/ValidateAll.php b/src/Support/Helper/Arr/ValidateAll.php
index ff47d97b..cf7e6f03 100644
--- a/src/Support/Helper/Arr/ValidateAll.php
+++ b/src/Support/Helper/Arr/ValidateAll.php
@@ -15,8 +15,6 @@
  */
 class ValidateAll extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array    $collection
      * @param callable $method
diff --git a/src/Support/Helper/Arr/ValidateAny.php b/src/Support/Helper/Arr/ValidateAny.php
index ffd29791..b73ab9f2 100644
--- a/src/Support/Helper/Arr/ValidateAny.php
+++ b/src/Support/Helper/Arr/ValidateAny.php
@@ -15,8 +15,6 @@
  */
 class ValidateAny extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array    $collection
      * @param callable $method
diff --git a/src/Support/Helper/Arr/Whitelist.php b/src/Support/Helper/Arr/Whitelist.php
index 232c1ab1..6d8d2f6e 100644
--- a/src/Support/Helper/Arr/Whitelist.php
+++ b/src/Support/Helper/Arr/Whitelist.php
@@ -15,8 +15,6 @@
  */
 class Whitelist extends \Phalcon\Support\Helper\Arr\AbstractArr
 {
-
-
     /**
      * @param array $collection
      * @param array $whiteList
diff --git a/src/Support/Helper/Exception.php b/src/Support/Helper/Exception.php
index cce20beb..8ac78eaf 100644
--- a/src/Support/Helper/Exception.php
+++ b/src/Support/Helper/Exception.php
@@ -14,6 +14,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Support/Helper/File/Basename.php b/src/Support/Helper/File/Basename.php
index 795c4a0e..655df323 100644
--- a/src/Support/Helper/File/Basename.php
+++ b/src/Support/Helper/File/Basename.php
@@ -16,8 +16,6 @@
  */
 class Basename
 {
-
-
     /**
      * @see https://bugs.php.net/bug.php?id=37738
      *
diff --git a/src/Support/Helper/Json/Decode.php b/src/Support/Helper/Json/Decode.php
index 4b4b3bfd..ae951666 100644
--- a/src/Support/Helper/Json/Decode.php
+++ b/src/Support/Helper/Json/Decode.php
@@ -17,8 +17,6 @@
  */
 class Decode
 {
-
-
     /**
      * @param string $data        JSON data to parse
      * @param bool   $associative When `true`, objects are converted to arrays
diff --git a/src/Support/Helper/Json/Encode.php b/src/Support/Helper/Json/Encode.php
index 639a25f2..226330c6 100644
--- a/src/Support/Helper/Json/Encode.php
+++ b/src/Support/Helper/Json/Encode.php
@@ -24,8 +24,6 @@
  */
 class Encode
 {
-
-
     /**
      * @param mixed $data    JSON data to parse
      * @param int   $options Bitmask of JSON decode options.
diff --git a/src/Support/Helper/Number/IsBetween.php b/src/Support/Helper/Number/IsBetween.php
index 4498bbf2..e1853650 100644
--- a/src/Support/Helper/Number/IsBetween.php
+++ b/src/Support/Helper/Number/IsBetween.php
@@ -14,8 +14,6 @@
  */
 class IsBetween
 {
-
-
     /**
      * @param int $value
      * @param int $start
diff --git a/src/Support/Helper/Str/AbstractStr.php b/src/Support/Helper/Str/AbstractStr.php
index c526d820..d5cc986d 100644
--- a/src/Support/Helper/Str/AbstractStr.php
+++ b/src/Support/Helper/Str/AbstractStr.php
@@ -17,8 +17,6 @@
  */
 abstract class AbstractStr
 {
-
-
     /**
      * Check if a string ends with a given string
      *
diff --git a/src/Support/Helper/Str/Camelize.php b/src/Support/Helper/Str/Camelize.php
index 4b92b174..bcaec735 100644
--- a/src/Support/Helper/Str/Camelize.php
+++ b/src/Support/Helper/Str/Camelize.php
@@ -14,8 +14,6 @@
  */
 class Camelize extends \Phalcon\Support\Helper\Str\PascalCase
 {
-
-
     /**
      * @param string      $text
      * @param string|null $delimiters
diff --git a/src/Support/Helper/Str/Concat.php b/src/Support/Helper/Str/Concat.php
index 3032d9d8..a006ef7c 100644
--- a/src/Support/Helper/Str/Concat.php
+++ b/src/Support/Helper/Str/Concat.php
@@ -17,8 +17,6 @@
  */
 class Concat extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $delimiter
      * @param string $first
diff --git a/src/Support/Helper/Str/CountVowels.php b/src/Support/Helper/Str/CountVowels.php
index 722998ca..06e14b12 100644
--- a/src/Support/Helper/Str/CountVowels.php
+++ b/src/Support/Helper/Str/CountVowels.php
@@ -15,8 +15,6 @@
  */
 class CountVowels
 {
-
-
     /**
      * @param string $text
      *
diff --git a/src/Support/Helper/Str/Decapitalize.php b/src/Support/Helper/Str/Decapitalize.php
index 82755b66..dc17459d 100644
--- a/src/Support/Helper/Str/Decapitalize.php
+++ b/src/Support/Helper/Str/Decapitalize.php
@@ -16,8 +16,6 @@
  */
 class Decapitalize extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $text
      * @param bool   $upperRest
diff --git a/src/Support/Helper/Str/Decrement.php b/src/Support/Helper/Str/Decrement.php
index 31032bee..93a1cea6 100644
--- a/src/Support/Helper/Str/Decrement.php
+++ b/src/Support/Helper/Str/Decrement.php
@@ -15,8 +15,6 @@
  */
 class Decrement
 {
-
-
     /**
      * @param string $text
      * @param string $separator
diff --git a/src/Support/Helper/Str/DirFromFile.php b/src/Support/Helper/Str/DirFromFile.php
index a3bc0b89..fb1d6a2c 100644
--- a/src/Support/Helper/Str/DirFromFile.php
+++ b/src/Support/Helper/Str/DirFromFile.php
@@ -15,8 +15,6 @@
  */
 class DirFromFile
 {
-
-
     /**
      * @param string $file
      *
diff --git a/src/Support/Helper/Str/DirSeparator.php b/src/Support/Helper/Str/DirSeparator.php
index 57da112a..da622ba3 100644
--- a/src/Support/Helper/Str/DirSeparator.php
+++ b/src/Support/Helper/Str/DirSeparator.php
@@ -15,8 +15,6 @@
  */
 class DirSeparator
 {
-
-
     /**
      * @param string $directory
      *
diff --git a/src/Support/Helper/Str/Dynamic.php b/src/Support/Helper/Str/Dynamic.php
index a6f5b073..344db16b 100644
--- a/src/Support/Helper/Str/Dynamic.php
+++ b/src/Support/Helper/Str/Dynamic.php
@@ -18,8 +18,6 @@
  */
 class Dynamic
 {
-
-
     /**
      * @param string $text
      * @param string $leftDelimiter
diff --git a/src/Support/Helper/Str/EndsWith.php b/src/Support/Helper/Str/EndsWith.php
index ee2baed3..ccd1d181 100644
--- a/src/Support/Helper/Str/EndsWith.php
+++ b/src/Support/Helper/Str/EndsWith.php
@@ -14,8 +14,6 @@
  */
 class EndsWith extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $haystack
      * @param string $needle
diff --git a/src/Support/Helper/Str/FirstBetween.php b/src/Support/Helper/Str/FirstBetween.php
index f031d536..1d9b9bae 100644
--- a/src/Support/Helper/Str/FirstBetween.php
+++ b/src/Support/Helper/Str/FirstBetween.php
@@ -15,8 +15,6 @@
  */
 class FirstBetween
 {
-
-
     /**
      * @param string $text
      * @param string $start
diff --git a/src/Support/Helper/Str/Friendly.php b/src/Support/Helper/Str/Friendly.php
index bf340c1e..b8cec776 100644
--- a/src/Support/Helper/Str/Friendly.php
+++ b/src/Support/Helper/Str/Friendly.php
@@ -18,8 +18,6 @@
  */
 class Friendly extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string     $text
      * @param string     $separator
diff --git a/src/Support/Helper/Str/Humanize.php b/src/Support/Helper/Str/Humanize.php
index 3fac92f5..f08ac435 100644
--- a/src/Support/Helper/Str/Humanize.php
+++ b/src/Support/Helper/Str/Humanize.php
@@ -14,8 +14,6 @@
  */
 class Humanize
 {
-
-
     /**
      * @param string $text
      *
diff --git a/src/Support/Helper/Str/Includes.php b/src/Support/Helper/Str/Includes.php
index 39c915ff..c941d392 100644
--- a/src/Support/Helper/Str/Includes.php
+++ b/src/Support/Helper/Str/Includes.php
@@ -14,8 +14,6 @@
  */
 class Includes
 {
-
-
     /**
      * @param string $haystack
      * @param string $needle
diff --git a/src/Support/Helper/Str/Increment.php b/src/Support/Helper/Str/Increment.php
index 2ee8f437..a68e1e15 100644
--- a/src/Support/Helper/Str/Increment.php
+++ b/src/Support/Helper/Str/Increment.php
@@ -15,8 +15,6 @@
  */
 class Increment
 {
-
-
     /**
      * @param string $text
      * @param string $separator
diff --git a/src/Support/Helper/Str/Interpolate.php b/src/Support/Helper/Str/Interpolate.php
index 940f98e2..1f5cfcff 100644
--- a/src/Support/Helper/Str/Interpolate.php
+++ b/src/Support/Helper/Str/Interpolate.php
@@ -17,8 +17,6 @@
  */
 class Interpolate
 {
-
-
     /**
      * @param string $message
      * @param array  $context
diff --git a/src/Support/Helper/Str/IsAnagram.php b/src/Support/Helper/Str/IsAnagram.php
index 25fd61a4..db31a077 100644
--- a/src/Support/Helper/Str/IsAnagram.php
+++ b/src/Support/Helper/Str/IsAnagram.php
@@ -15,8 +15,6 @@
  */
 class IsAnagram
 {
-
-
     /**
      * @param string $first
      * @param string $second
diff --git a/src/Support/Helper/Str/IsLower.php b/src/Support/Helper/Str/IsLower.php
index 7acae6d3..d0a3caf6 100644
--- a/src/Support/Helper/Str/IsLower.php
+++ b/src/Support/Helper/Str/IsLower.php
@@ -14,8 +14,6 @@
  */
 class IsLower extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $text
      * @param string $encoding
diff --git a/src/Support/Helper/Str/IsPalindrome.php b/src/Support/Helper/Str/IsPalindrome.php
index 1f37527c..0014d584 100644
--- a/src/Support/Helper/Str/IsPalindrome.php
+++ b/src/Support/Helper/Str/IsPalindrome.php
@@ -14,8 +14,6 @@
  */
 class IsPalindrome
 {
-
-
     /**
      * @param string $text
      *
diff --git a/src/Support/Helper/Str/IsUpper.php b/src/Support/Helper/Str/IsUpper.php
index 7aa01439..060492fd 100644
--- a/src/Support/Helper/Str/IsUpper.php
+++ b/src/Support/Helper/Str/IsUpper.php
@@ -14,8 +14,6 @@
  */
 class IsUpper extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $text
      * @param string $encoding
diff --git a/src/Support/Helper/Str/KebabCase.php b/src/Support/Helper/Str/KebabCase.php
index e7fd1179..c5ac1cd7 100644
--- a/src/Support/Helper/Str/KebabCase.php
+++ b/src/Support/Helper/Str/KebabCase.php
@@ -14,8 +14,6 @@
  */
 class KebabCase extends \Phalcon\Support\Helper\Str\PascalCase
 {
-
-
     /**
      * @param string      $text
      * @param string|null $delimiters
diff --git a/src/Support/Helper/Str/Len.php b/src/Support/Helper/Str/Len.php
index 092af52b..75983ca0 100644
--- a/src/Support/Helper/Str/Len.php
+++ b/src/Support/Helper/Str/Len.php
@@ -14,8 +14,6 @@
  */
 class Len
 {
-
-
     /**
      * @param string $text
      * @param string $encoding
diff --git a/src/Support/Helper/Str/Lower.php b/src/Support/Helper/Str/Lower.php
index 35872622..dd2b5d0e 100644
--- a/src/Support/Helper/Str/Lower.php
+++ b/src/Support/Helper/Str/Lower.php
@@ -14,8 +14,6 @@
  */
 class Lower extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $text
      * @param string $encoding
diff --git a/src/Support/Helper/Str/PascalCase.php b/src/Support/Helper/Str/PascalCase.php
index 024beeb8..7bfee165 100644
--- a/src/Support/Helper/Str/PascalCase.php
+++ b/src/Support/Helper/Str/PascalCase.php
@@ -14,8 +14,6 @@
  */
 class PascalCase
 {
-
-
     /**
      * @param string      $text
      * @param string|null $delimiters
diff --git a/src/Support/Helper/Str/Prefix.php b/src/Support/Helper/Str/Prefix.php
index 1ab6c247..59649b9d 100644
--- a/src/Support/Helper/Str/Prefix.php
+++ b/src/Support/Helper/Str/Prefix.php
@@ -14,8 +14,6 @@
  */
 class Prefix
 {
-
-
     /**
      * @param mixed  $text
      * @param string $prefix
diff --git a/src/Support/Helper/Str/ReduceSlashes.php b/src/Support/Helper/Str/ReduceSlashes.php
index 6bf14d37..d9501a58 100644
--- a/src/Support/Helper/Str/ReduceSlashes.php
+++ b/src/Support/Helper/Str/ReduceSlashes.php
@@ -14,8 +14,6 @@
  */
 class ReduceSlashes
 {
-
-
     /**
      * @param string $text
      *
diff --git a/src/Support/Helper/Str/SnakeCase.php b/src/Support/Helper/Str/SnakeCase.php
index 194c68c6..8b35afce 100644
--- a/src/Support/Helper/Str/SnakeCase.php
+++ b/src/Support/Helper/Str/SnakeCase.php
@@ -14,8 +14,6 @@
  */
 class SnakeCase extends \Phalcon\Support\Helper\Str\PascalCase
 {
-
-
     /**
      * @param string      $text
      * @param string|null $delimiters
diff --git a/src/Support/Helper/Str/StartsWith.php b/src/Support/Helper/Str/StartsWith.php
index 3027efcc..c151d40f 100644
--- a/src/Support/Helper/Str/StartsWith.php
+++ b/src/Support/Helper/Str/StartsWith.php
@@ -14,8 +14,6 @@
  */
 class StartsWith extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $haystack
      * @param string $needle
diff --git a/src/Support/Helper/Str/Suffix.php b/src/Support/Helper/Str/Suffix.php
index 9235b15f..431c5eec 100644
--- a/src/Support/Helper/Str/Suffix.php
+++ b/src/Support/Helper/Str/Suffix.php
@@ -14,8 +14,6 @@
  */
 class Suffix
 {
-
-
     /**
      * @param mixed  $text
      * @param string $suffix
diff --git a/src/Support/Helper/Str/Ucwords.php b/src/Support/Helper/Str/Ucwords.php
index 25db449a..5e79cfb2 100644
--- a/src/Support/Helper/Str/Ucwords.php
+++ b/src/Support/Helper/Str/Ucwords.php
@@ -14,8 +14,6 @@
  */
 class Ucwords
 {
-
-
     /**
      * @param string $text
      * @param string $encoding
diff --git a/src/Support/Helper/Str/Uncamelize.php b/src/Support/Helper/Str/Uncamelize.php
index 2daf487e..73167702 100644
--- a/src/Support/Helper/Str/Uncamelize.php
+++ b/src/Support/Helper/Str/Uncamelize.php
@@ -14,8 +14,6 @@
  */
 class Uncamelize
 {
-
-
     /**
      * @param string $text
      * @param string $delimiters
diff --git a/src/Support/Helper/Str/Underscore.php b/src/Support/Helper/Str/Underscore.php
index a5930ced..f4dcf44b 100644
--- a/src/Support/Helper/Str/Underscore.php
+++ b/src/Support/Helper/Str/Underscore.php
@@ -14,8 +14,6 @@
  */
 class Underscore
 {
-
-
     /**
      * @param string $text
      *
diff --git a/src/Support/Helper/Str/Upper.php b/src/Support/Helper/Str/Upper.php
index f7897ad5..5383addc 100644
--- a/src/Support/Helper/Str/Upper.php
+++ b/src/Support/Helper/Str/Upper.php
@@ -14,8 +14,6 @@
  */
 class Upper extends \Phalcon\Support\Helper\Str\AbstractStr
 {
-
-
     /**
      * @param string $text
      * @param string $encoding
diff --git a/src/Support/HelperFactory.php b/src/Support/HelperFactory.php
index a0a5e086..a2d7d8c9 100644
--- a/src/Support/HelperFactory.php
+++ b/src/Support/HelperFactory.php
@@ -73,8 +73,6 @@
  */
 class HelperFactory extends AbstractFactory
 {
-
-
     /**
      * FactoryTrait constructor.
      *
diff --git a/src/Support/Registry.php b/src/Support/Registry.php
index ef73d2e7..9d7bb0d3 100644
--- a/src/Support/Registry.php
+++ b/src/Support/Registry.php
@@ -64,8 +64,6 @@
  */
 final class Registry extends Collection
 {
-
-
     /**
      * Constructor
      *
diff --git a/src/Tag.php b/src/Tag.php
new file mode 100644
index 00000000..a46538f4
--- /dev/null
+++ b/src/Tag.php
@@ -0,0 +1,879 @@
+<?php
+
+/* This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalcon.io>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+namespace Phalcon;
+
+use Phalcon\Di\Di;
+use Phalcon\Di\DiInterface;
+use Phalcon\Html\Escaper\EscaperInterface;
+use Phalcon\Html\Link\Link;
+use Phalcon\Html\Link\Serializer\Header;
+use Phalcon\Tag\Select;
+use Phalcon\Tag\Exception;
+use Phalcon\Mvc\Url\UrlInterface;
+use Phalcon\Support\Helper\Str\Friendly;
+
+/**
+ * Phalcon\Tag is designed to simplify building of HTML tags.
+ * It provides a set of helpers to generate HTML in a dynamic way.
+ * This component is a class that you can extend to add more helpers.
+ */
+class Tag
+{
+    const HTML32 = 1;
+
+    const HTML401_STRICT = 2;
+
+    const HTML401_TRANSITIONAL = 3;
+
+    const HTML401_FRAMESET = 4;
+
+    const HTML5 = 5;
+
+    const XHTML10_STRICT = 6;
+
+    const XHTML10_TRANSITIONAL = 7;
+
+    const XHTML10_FRAMESET = 8;
+
+    const XHTML11 = 9;
+
+    const XHTML20 = 10;
+
+    const XHTML5 = 11;
+
+    /**
+     * @var bool
+     */
+    protected static $autoEscape = true;
+
+    /**
+     * DI Container
+     *
+     * @var DiInterface|null
+     */
+    protected static $container = null;
+
+    /**
+     * Pre-assigned values for components
+     *
+     * @var array
+     */
+    protected static $displayValues;
+
+    /**
+     * @var array
+     */
+    protected static $documentAppendTitle;
+
+    /**
+     * @var array
+     */
+    protected static $documentPrependTitle;
+
+    /**
+     * HTML document title
+     *
+     * @var string|null
+     */
+    protected static $documentTitle = null;
+
+    /**
+     * @var string|null
+     */
+    protected static $documentTitleSeparator = null;
+
+    /**
+     * @var int
+     */
+    protected static $documentType = 11;
+
+    /**
+     * @var EscaperInterface|null
+     */
+    protected static $escaperService = null;
+
+    /**
+     * @var UrlInterface|null
+     */
+    protected static $urlService = null;
+
+    /**
+     * Appends a text to current document title
+     *
+     * @param array|string $title
+     * @return void
+     */
+    public static function appendTitle($title): void
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="check"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function checkField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="color"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function colorField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="date"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function dateField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="datetime"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function dateTimeField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="datetime-local"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function dateTimeLocalField($parameters): string
+    {
+    }
+
+    /**
+     * Alias of Phalcon\Tag::setDefault()
+     *
+     * @param string $id
+     * @param mixed $value
+     * @return void
+     */
+    public static function displayTo(string $id, $value): void
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="email"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function emailField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML close FORM tag
+     *
+     * @return string
+     */
+    public static function endForm(): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="file"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function fileField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML FORM tag
+     *
+     * @param array $parameters = [
+     *     'method' => 'post',
+     *     'action' => '',
+     *     'parameters' => '',
+     *     'name' => '',
+     *     'class' => '',
+     *     'id' => ''
+     * ]
+     * @return string
+     */
+    public static function formLegacy($parameters): string
+    {
+    }
+
+    /**
+     * Converts texts into URL-friendly titles
+     *
+     * @param string $text
+     * @param string $separator
+     * @param bool $lowercase
+     * @param mixed $replace
+     * @return string
+     */
+    public static function friendlyTitle(string $text, string $separator = '-', bool $lowercase = true, $replace = null): string
+    {
+    }
+
+    /**
+     * Get the document type declaration of content
+     *
+     * @return string
+     */
+    public static function getDocType(): string
+    {
+    }
+
+    /**
+     * Obtains the 'escaper' service if required
+     *
+     * @param array $params
+     * @return EscaperInterface|null
+     */
+    public static function getEscaper(array $params): ?EscaperInterface
+    {
+    }
+
+    /**
+     * Internally gets the request dispatcher
+     *
+     * @return DiInterface
+     */
+    public static function getDI(): DiInterface
+    {
+    }
+
+    /**
+     * Returns an Escaper service from the default DI
+     *
+     * @return EscaperInterface
+     */
+    public static function getEscaperService(): EscaperInterface
+    {
+    }
+
+    /**
+     * Gets the current document title. The title will be automatically escaped.
+     *
+     * @param bool $prepend
+     * @param bool $append
+     * @return string
+     */
+    public static function getTitle(bool $prepend = true, bool $append = true): string
+    {
+    }
+
+    /**
+     * Gets the current document title separator
+     *
+     * @return string
+     */
+    public static function getTitleSeparator(): string
+    {
+    }
+
+    /**
+     * Returns a URL service from the default DI
+     *
+     * @return UrlInterface
+     */
+    public static function getUrlService(): UrlInterface
+    {
+    }
+
+    /**
+     * Every helper calls this function to check whether a component has a
+     * predefined value using Phalcon\Tag::setDefault() or value from $_POST
+     *
+     * @param mixed $name
+     * @param array $params
+     */
+    public static function getValue($name, array $params = [])
+    {
+    }
+
+    /**
+     * Check if a helper has a default value set using Phalcon\Tag::setDefault()
+     * or value from $_POST
+     *
+     * @param mixed $name
+     * @return bool
+     */
+    public static function hasValue($name): bool
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="hidden"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function hiddenField($parameters): string
+    {
+    }
+
+    /**
+     * Builds HTML IMG tags
+     *
+     * @param array|string $parameters = [
+     *     'src' => '',
+     *     'class' => '',
+     *     'id' => '',
+     *     'name' => ''
+     * ]
+     * @param bool $local
+     * @return string
+     */
+    public static function image($parameters = null, bool $local = true): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="image"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => ''
+     * ]
+     * @return string
+     */
+    public static function imageInput($parameters): string
+    {
+    }
+
+    /**
+     * Builds a SCRIPT[type="javascript"] tag
+     *
+     * @param array|string $parameters = [
+     *     'local' => false,
+     *     'src' => '',
+     *     'type' => 'text/javascript'
+     *     'rel' => ''
+     * ]
+     * @param bool $local
+     * @return string
+     */
+    public static function javascriptInclude($parameters = null, bool $local = true): string
+    {
+    }
+
+    /**
+     * Builds a HTML A tag using framework conventions
+     *
+     * @param parameters $array |string = [
+     *     'action' => '',
+     *     'text' => '',
+     *     'local' => false,
+     *     'query' => '',
+     *     'class' => '',
+     *     'name' => '',
+     *     'href' => '',
+     *     'id' => ''
+     * ]
+     * @param mixed $parameters
+     * @param mixed $text
+     * @param mixed $local
+     * @return string
+     */
+    public static function linkTo($parameters, $text = null, $local = true): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="month"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function monthField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="number"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function numericField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="password"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function passwordField($parameters): string
+    {
+    }
+
+    /**
+     * Prepends a text to current document title
+     *
+     * @param array|string $title
+     * @return void
+     */
+    public static function prependTitle($title): void
+    {
+    }
+
+    /**
+     * Parses the preload element passed and sets the necessary link headers
+     *
+     * @param mixed $parameters
+     * @return string
+     */
+    public static function preload($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="radio"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function radioField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="range"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function rangeField($parameters): string
+    {
+    }
+
+    /**
+     * Renders parameters keeping order in their HTML attributes
+     *
+     * @param array $attributes = [
+     *     'rel' => null,
+     *     'type' => null,
+     *     'for' => null,
+     *     'src' => null,
+     *     'href' => null,
+     *     'action' => null,
+     *     'id' => null,
+     *     'name' => null,
+     *     'value' => null,
+     *     'class' => null
+     * ]
+     * @param string $code
+     * @return string
+     */
+    public static function renderAttributes(string $code, array $attributes): string
+    {
+    }
+
+    /**
+     * Renders the title with title tags. The title is automatically escaped
+     *
+     * @param bool $prepend
+     * @param bool $append
+     * @return string
+     */
+    public static function renderTitle(bool $prepend = true, bool $append = true): string
+    {
+    }
+
+    /**
+     * Resets the request and internal values to avoid those fields will have
+     * any default value.
+     *
+     * @deprecated Will be removed in 4.0.0
+     * @deprecated
+     * @return void
+     */
+    public static function resetInput(): void
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="search"] tag
+     *
+     * @param array $parameters = [
+     *     'class' => '',
+     *     'name' => '',
+     *     'src' => '',
+     *     'id' => '',
+     *     'value' => ''
+     * ]
+     * @return string
+     */
+    public static function searchField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML SELECT tag using a Phalcon\Mvc\Model resultset as options
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'useEmpty' => false,
+     *     'emptyValue' => '',
+     *     'emptyText' => '',
+     * ]
+     * @param mixed $data
+     * @return string
+     */
+    public static function select($parameters, $data = null): string
+    {
+    }
+
+    /**
+     * Builds a HTML SELECT tag using a PHP array for options
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'useEmpty' => false,
+     *     'emptyValue' => '',
+     *     'emptyText' => '',
+     * ]
+     * @param mixed $data
+     * @return string
+     */
+    public static function selectStatic($parameters, $data = null): string
+    {
+    }
+
+    /**
+     * Set autoescape mode in generated HTML
+     *
+     * @param bool $autoescape
+     * @return void
+     */
+    public static function setAutoescape(bool $autoescape): void
+    {
+    }
+
+    /**
+     * Assigns default values to generated tags by helpers
+     *
+     * @param string $id
+     * @param mixed $value
+     * @return void
+     */
+    public static function setDefault(string $id, $value): void
+    {
+    }
+
+    /**
+     * Assigns default values to generated tags by helpers
+     *
+     * @param array $values
+     * @param bool $merge
+     * @return void
+     */
+    public static function setDefaults(array $values, bool $merge = false): void
+    {
+    }
+
+    /**
+     * Sets the dependency injector container.
+     *
+     * @param \Phalcon\Di\DiInterface $container
+     * @return void
+     */
+    public static function setDI(\Phalcon\Di\DiInterface $container): void
+    {
+    }
+
+    /**
+     * Set the document type of content
+     *
+     * @param int $doctype
+     * @return void
+     */
+    public static function setDocType(int $doctype): void
+    {
+    }
+
+    /**
+     * Set the title of view content
+     *
+     * @param string $title
+     * @return void
+     */
+    public static function setTitle(string $title): void
+    {
+    }
+
+    /**
+     * Set the title separator of view content
+     *
+     * @param string $titleSeparator
+     * @return void
+     */
+    public static function setTitleSeparator(string $titleSeparator): void
+    {
+    }
+
+    /**
+     * Builds a LINK[rel="stylesheet"] tag
+     *
+     * @param mixed $parameters
+     * @param bool $local
+     * @return string
+     */
+    public static function stylesheetLink($parameters = null, bool $local = true): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="submit"] tag
+     *
+     * @param mixed $parameters
+     * @return string
+     */
+    public static function submitButton($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML tag
+     *
+     * @param string $tagName
+     * @param mixed $parameters
+     * @param bool $selfClose
+     * @param bool $onlyStart
+     * @param bool $useEol
+     * @return string
+     */
+    public static function tagHtml(string $tagName, $parameters = null, bool $selfClose = false, bool $onlyStart = false, bool $useEol = false): string
+    {
+    }
+
+    /**
+     * Builds a HTML tag closing tag
+     *
+     * @param string $tagName
+     * @param bool $useEol
+     * @return string
+     */
+    public static function tagHtmlClose(string $tagName, bool $useEol = false): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="tel"] tag
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => ''
+     * ]
+     * @return string
+     */
+    public static function telField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML TEXTAREA tag
+     *
+     * @paraym array parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => ''
+     * ]
+     * @param mixed $parameters
+     * @return string
+     */
+    public static function textArea($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="text"] tag
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => ''
+     * ]
+     * @return string
+     */
+    public static function textField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="time"] tag
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => ''
+     * ]
+     * @return string
+     */
+    public static function timeField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="url"] tag
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => ''
+     * ]
+     * @return string
+     */
+    public static function urlField($parameters): string
+    {
+    }
+
+    /**
+     * Builds a HTML input[type="week"] tag
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => ''
+     * ]
+     * @return string
+     */
+    public static function weekField($parameters): string
+    {
+    }
+
+    /**
+     * Builds generic INPUT tags
+     *
+     * @param array $parameters = [
+     *     'id' => '',
+     *     'name' => '',
+     *     'value' => '',
+     *     'class' => '',
+     *     'type' => ''
+     * ]
+     * @param string $type
+     * @param bool $asValue
+     * @return string
+     */
+    final protected static function inputField(string $type, $parameters, bool $asValue = false): string
+    {
+    }
+
+    /**
+     * Builds INPUT tags that implements the checked attribute
+     *
+     * @param string $type
+     * @param mixed $parameters
+     * @return string
+     */
+    final protected static function inputFieldChecked(string $type, $parameters): string
+    {
+    }
+}
diff --git a/src/Tag/Exception.php b/src/Tag/Exception.php
index 48e6aa1e..2c466744 100644
--- a/src/Tag/Exception.php
+++ b/src/Tag/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Tag/Select.php b/src/Tag/Select.php
index bcd875a5..52736417 100644
--- a/src/Tag/Select.php
+++ b/src/Tag/Select.php
@@ -21,8 +21,6 @@
  */
 abstract class Select
 {
-
-
     /**
      * Generates a SELECT tag
      *
diff --git a/src/Translate/Adapter/AbstractAdapter.php b/src/Translate/Adapter/AbstractAdapter.php
index 567cad51..9571e206 100644
--- a/src/Translate/Adapter/AbstractAdapter.php
+++ b/src/Translate/Adapter/AbstractAdapter.php
@@ -23,7 +23,6 @@
  */
 abstract class AbstractAdapter implements \Phalcon\Translate\Adapter\AdapterInterface
 {
-
     /**
      * @var string
      */
diff --git a/src/Translate/Adapter/AdapterInterface.php b/src/Translate/Adapter/AdapterInterface.php
index 43dd41fd..c410de3a 100644
--- a/src/Translate/Adapter/AdapterInterface.php
+++ b/src/Translate/Adapter/AdapterInterface.php
@@ -16,8 +16,6 @@
  */
 interface AdapterInterface
 {
-
-
     /**
      * Check whether is defined a translation key in the internal array
      *
diff --git a/src/Translate/Adapter/Csv.php b/src/Translate/Adapter/Csv.php
index 50380414..d14a0098 100644
--- a/src/Translate/Adapter/Csv.php
+++ b/src/Translate/Adapter/Csv.php
@@ -22,7 +22,6 @@
  */
 class Csv extends \Phalcon\Translate\Adapter\AbstractAdapter implements \ArrayAccess
 {
-
     /**
      * @var array
      */
diff --git a/src/Translate/Adapter/Gettext.php b/src/Translate/Adapter/Gettext.php
index 3b214549..79a0ac4c 100644
--- a/src/Translate/Adapter/Gettext.php
+++ b/src/Translate/Adapter/Gettext.php
@@ -38,7 +38,6 @@
  */
 class Gettext extends \Phalcon\Translate\Adapter\AbstractAdapter implements \ArrayAccess
 {
-
     /**
      * @var int
      */
@@ -60,59 +59,59 @@ class Gettext extends \Phalcon\Translate\Adapter\AbstractAdapter implements \Arr
     protected $locale;
 
     /**
-     * @return int
+     * Gettext constructor.
+     *
+     * @param InterpolatorFactory $interpolator
+     * @param array               $options = [
+     *                                       'locale'        => '',
+     *                                       'defaultDomain' => '',
+     *                                       'directory'     => '',
+     *                                       'category'      => ''
+     *                                       ]
+     *
+     * @throws Exception
      */
-    public function getCategory(): int
+    public function __construct(\Phalcon\Translate\InterpolatorFactory $interpolator, array $options)
     {
     }
 
     /**
-     * @return string
+     * Check whether is defined a translation key in the internal array
+     *
+     * @param string $index
+     *
+     * @return bool
+     * @deprecated
      */
-    public function getDefaultDomain(): string
+    public function exists(string $index): bool
     {
     }
 
     /**
-     * @return string|array
+     * @return int
      */
-    public function getDirectory()
+    public function getCategory(): int
     {
     }
 
     /**
      * @return string
      */
-    public function getLocale(): string
+    public function getDefaultDomain(): string
     {
     }
 
     /**
-     * Gettext constructor.
-     *
-     * @param InterpolatorFactory $interpolator
-     * @param array               $options = [
-     *                                       'locale'        => '',
-     *                                       'defaultDomain' => '',
-     *                                       'directory'     => '',
-     *                                       'category'      => ''
-     *                                       ]
-     *
-     * @throws Exception
+     * @return string|array
      */
-    public function __construct(\Phalcon\Translate\InterpolatorFactory $interpolator, array $options)
+    public function getDirectory()
     {
     }
 
     /**
-     * Check whether is defined a translation key in the internal array
-     *
-     * @param string $index
-     *
-     * @return bool
-     * @deprecated
+     * @return string
      */
-    public function exists(string $index): bool
+    public function getLocale(): string
     {
     }
 
diff --git a/src/Translate/Adapter/NativeArray.php b/src/Translate/Adapter/NativeArray.php
index 69d8ea61..3e70aeb0 100644
--- a/src/Translate/Adapter/NativeArray.php
+++ b/src/Translate/Adapter/NativeArray.php
@@ -25,7 +25,6 @@
  */
 class NativeArray extends \Phalcon\Translate\Adapter\AbstractAdapter implements \ArrayAccess
 {
-
     /**
      * @var array
      */
diff --git a/src/Translate/Exception.php b/src/Translate/Exception.php
index b0c86b5b..1edf5bfa 100644
--- a/src/Translate/Exception.php
+++ b/src/Translate/Exception.php
@@ -16,6 +16,4 @@
  */
 class Exception extends \Exception
 {
-
-
 }
diff --git a/src/Translate/Interpolator/AssociativeArray.php b/src/Translate/Interpolator/AssociativeArray.php
index a3101366..22f7d66a 100644
--- a/src/Translate/Interpolator/AssociativeArray.php
+++ b/src/Translate/Interpolator/AssociativeArray.php
@@ -18,8 +18,6 @@
  */
 class AssociativeArray implements \Phalcon\Translate\Interpolator\InterpolatorInterface
 {
-
-
     /**
      * Replaces placeholders by the values passed
      *
diff --git a/src/Translate/Interpolator/IndexedArray.php b/src/Translate/Interpolator/IndexedArray.php
index 0beac8d1..92bedfb7 100644
--- a/src/Translate/Interpolator/IndexedArray.php
+++ b/src/Translate/Interpolator/IndexedArray.php
@@ -16,8 +16,6 @@
  */
 class IndexedArray implements \Phalcon\Translate\Interpolator\InterpolatorInterface
 {
-
-
     /**
      * Replaces placeholders by the values passed
      *
diff --git a/src/Translate/Interpolator/InterpolatorInterface.php b/src/Translate/Interpolator/InterpolatorInterface.php
index 1af005d3..22c4f57e 100644
--- a/src/Translate/Interpolator/InterpolatorInterface.php
+++ b/src/Translate/Interpolator/InterpolatorInterface.php
@@ -16,8 +16,6 @@
  */
 interface InterpolatorInterface
 {
-
-
     /**
      * Replaces placeholders by the values passed
      *
diff --git a/src/Translate/InterpolatorFactory.php b/src/Translate/InterpolatorFactory.php
index f1dbcfcd..8c2735b1 100644
--- a/src/Translate/InterpolatorFactory.php
+++ b/src/Translate/InterpolatorFactory.php
@@ -22,8 +22,6 @@
  */
 class InterpolatorFactory extends AbstractFactory
 {
-
-
     /**
      * InterpolatorFactor constructor.
      *
diff --git a/src/Translate/TranslateFactory.php b/src/Translate/TranslateFactory.php
index 18b29cc6..ee7c8be4 100644
--- a/src/Translate/TranslateFactory.php
+++ b/src/Translate/TranslateFactory.php
@@ -22,7 +22,6 @@
  */
 class TranslateFactory extends AbstractFactory
 {
-
     /**
      * @var InterpolatorFactory
      */