From 0ed205b42a4ca893ca7df4567929ba0bb2b9dc6d Mon Sep 17 00:00:00 2001
From: Ruud Boon <ruud@ruudboon.io>
Date: Sat, 25 Jan 2020 23:51:17 +0100
Subject: [PATCH 1/2] Upgraded stubs

---
 src/Phalcon/Acl/Adapter/AdapterInterface.php     |  4 ++--
 src/Phalcon/Acl/Adapter/Memory.php               |  4 ++--
 src/Phalcon/Annotations/AnnotationsFactory.php   |  2 +-
 src/Phalcon/Annotations/Collection.php           |  4 ++--
 src/Phalcon/Annotations/Reflection.php           |  4 ++--
 src/Phalcon/Assets/AssetInterface.php            |  2 +-
 src/Phalcon/Assets/Manager.php                   |  2 +-
 src/Phalcon/Cache/CacheFactory.php               |  2 +-
 src/Phalcon/Cli/Router.php                       |  2 +-
 src/Phalcon/Cli/RouterInterface.php              |  2 +-
 src/Phalcon/Db/Adapter/AbstractAdapter.php       |  4 ++--
 src/Phalcon/Db/Adapter/AdapterInterface.php      |  6 +++---
 src/Phalcon/Db/Adapter/Pdo/Mysql.php             |  6 +++---
 src/Phalcon/Db/Adapter/Pdo/Postgresql.php        |  4 ++--
 src/Phalcon/Db/Adapter/Pdo/Sqlite.php            |  6 +++---
 src/Phalcon/Db/Adapter/PdoFactory.php            |  2 +-
 src/Phalcon/Db/Profiler.php                      |  2 +-
 src/Phalcon/Db/Result/Pdo.php                    |  2 +-
 src/Phalcon/Db/ResultInterface.php               |  4 ++--
 src/Phalcon/Debug.php                            |  4 ++--
 src/Phalcon/Di.php                               |  2 +-
 src/Phalcon/Di/DiInterface.php                   |  2 +-
 src/Phalcon/Filter/FilterFactory.php             |  2 +-
 src/Phalcon/Filter/Sanitize/UpperWords.php       |  2 +-
 src/Phalcon/Forms/Element/AbstractElement.php    |  2 +-
 src/Phalcon/Forms/Element/ElementInterface.php   |  2 +-
 src/Phalcon/Forms/Form.php                       |  2 +-
 src/Phalcon/Helper/Arr.php                       |  2 +-
 src/Phalcon/Helper/Str.php                       |  4 ++--
 src/Phalcon/Http/Request.php                     |  2 +-
 src/Phalcon/Http/RequestInterface.php            |  2 +-
 src/Phalcon/Image/ImageFactory.php               |  2 +-
 src/Phalcon/Logger/LoggerFactory.php             |  2 +-
 src/Phalcon/Mvc/Application.php                  |  1 -
 src/Phalcon/Mvc/Micro.php                        |  2 +-
 src/Phalcon/Mvc/Model.php                        |  2 +-
 src/Phalcon/Mvc/Model/Manager.php                | 14 +++++++-------
 src/Phalcon/Mvc/Model/ManagerInterface.php       | 16 ++++++++--------
 src/Phalcon/Mvc/Model/Query/Status.php           |  2 +-
 src/Phalcon/Mvc/Model/Query/StatusInterface.php  |  2 +-
 src/Phalcon/Mvc/Model/RelationInterface.php      |  2 +-
 src/Phalcon/Mvc/Model/Resultset.php              |  4 ++--
 src/Phalcon/Mvc/Model/ResultsetInterface.php     |  4 ++--
 src/Phalcon/Mvc/Model/Transaction/Failed.php     |  2 +-
 src/Phalcon/Mvc/Model/ValidationFailed.php       |  2 +-
 src/Phalcon/Mvc/ModelInterface.php               |  2 +-
 src/Phalcon/Mvc/Router.php                       |  2 +-
 src/Phalcon/Mvc/Router/Group.php                 |  2 +-
 src/Phalcon/Mvc/Router/GroupInterface.php        |  2 +-
 src/Phalcon/Mvc/RouterInterface.php              |  2 +-
 src/Phalcon/Paginator/PaginatorFactory.php       |  2 +-
 src/Phalcon/Storage/Adapter/Redis.php            |  3 ++-
 src/Phalcon/Tag.php                              |  2 +-
 src/Phalcon/Translate/Adapter/NativeArray.php    |  2 +-
 src/Phalcon/Translate/TranslateFactory.php       |  2 +-
 .../Validator/File/Resolution/Equal.php          |  2 +-
 .../Validation/Validator/File/Resolution/Max.php |  2 +-
 .../Validation/Validator/File/Resolution/Min.php |  2 +-
 .../Validation/Validator/File/Size/Equal.php     |  2 +-
 .../Validation/Validator/StringLength.php        |  2 +-
 src/Phalcon/Validation/ValidatorInterface.php    |  2 +-
 61 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/src/Phalcon/Acl/Adapter/AdapterInterface.php b/src/Phalcon/Acl/Adapter/AdapterInterface.php
index 4d7067e0..50dcf539 100644
--- a/src/Phalcon/Acl/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Acl/Adapter/AdapterInterface.php
@@ -127,14 +127,14 @@ public function getNoArgumentsDefaultAction(): int;
     /**
      * Return an array with every role registered in the list
      *
-     * @return array|\Phalcon\Acl\RoleInterface[]
+     * @return array
      */
     public function getRoles(): array;
 
     /**
      * Return an array with every component registered in the list
      *
-     * @return array|\Phalcon\Acl\ComponentInterface[]
+     * @return array
      */
     public function getComponents(): array;
 
diff --git a/src/Phalcon/Acl/Adapter/Memory.php b/src/Phalcon/Acl/Adapter/Memory.php
index c29cd66b..6a243609 100644
--- a/src/Phalcon/Acl/Adapter/Memory.php
+++ b/src/Phalcon/Acl/Adapter/Memory.php
@@ -362,7 +362,7 @@ public function getNoArgumentsDefaultAction(): int
     /**
      * Return an array with every role registered in the list
      *
-     * @return array|\Phalcon\Acl\RoleInterface[]
+     * @return array
      */
     public function getRoles(): array
     {
@@ -371,7 +371,7 @@ public function getRoles(): array
     /**
      * Return an array with every component registered in the list
      *
-     * @return array|\Phalcon\Acl\ComponentInterface[]
+     * @return array
      */
     public function getComponents(): array
     {
diff --git a/src/Phalcon/Annotations/AnnotationsFactory.php b/src/Phalcon/Annotations/AnnotationsFactory.php
index 2428e9fa..0ede1c60 100644
--- a/src/Phalcon/Annotations/AnnotationsFactory.php
+++ b/src/Phalcon/Annotations/AnnotationsFactory.php
@@ -37,7 +37,7 @@ public function __construct(array $services = array())
      *     ]
      * ]
      *
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      * @return mixed
      */
     public function load($config)
diff --git a/src/Phalcon/Annotations/Collection.php b/src/Phalcon/Annotations/Collection.php
index 5bcb82e2..d949b7c4 100644
--- a/src/Phalcon/Annotations/Collection.php
+++ b/src/Phalcon/Annotations/Collection.php
@@ -80,7 +80,7 @@ public function get(string $name): Annotation
      * Returns all the annotations that match a name
      *
      * @param string $name
-     * @return array|Annotation[]
+     * @return array
      */
     public function getAll(string $name): array
     {
@@ -89,7 +89,7 @@ public function getAll(string $name): array
     /**
      * Returns the internal annotations as an array
      *
-     * @return array|Annotation[]
+     * @return array
      */
     public function getAnnotations(): array
     {
diff --git a/src/Phalcon/Annotations/Reflection.php b/src/Phalcon/Annotations/Reflection.php
index 83bb43fa..fdcb7760 100644
--- a/src/Phalcon/Annotations/Reflection.php
+++ b/src/Phalcon/Annotations/Reflection.php
@@ -65,7 +65,7 @@ public function getClassAnnotations()
     /**
      * Returns the annotations found in the methods' docblocks
      *
-     * @return array|bool|Collection[]
+     * @return array|bool
      */
     public function getMethodsAnnotations()
     {
@@ -74,7 +74,7 @@ public function getMethodsAnnotations()
     /**
      * Returns the annotations found in the properties' docblocks
      *
-     * @return array|bool|Collection[]
+     * @return array|bool
      */
     public function getPropertiesAnnotations()
     {
diff --git a/src/Phalcon/Assets/AssetInterface.php b/src/Phalcon/Assets/AssetInterface.php
index bbc486c9..320f6317 100644
--- a/src/Phalcon/Assets/AssetInterface.php
+++ b/src/Phalcon/Assets/AssetInterface.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Assets;
 
 /**
- * Interface for custom Phalcon\Assets reources
+ * Interface for custom Phalcon\Assets resources
  */
 interface AssetInterface
 {
diff --git a/src/Phalcon/Assets/Manager.php b/src/Phalcon/Assets/Manager.php
index b84eb4e7..9386ec9a 100644
--- a/src/Phalcon/Assets/Manager.php
+++ b/src/Phalcon/Assets/Manager.php
@@ -217,7 +217,7 @@ public function get(string $id): Collection
     /**
      * Returns existing collections in the manager
      *
-     * @return array|Collection[]
+     * @return array
      */
     public function getCollections(): array
     {
diff --git a/src/Phalcon/Cache/CacheFactory.php b/src/Phalcon/Cache/CacheFactory.php
index a78c1bf2..ad026d3d 100644
--- a/src/Phalcon/Cache/CacheFactory.php
+++ b/src/Phalcon/Cache/CacheFactory.php
@@ -32,7 +32,7 @@ public function __construct(AdapterFactory $factory)
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'apcu',
diff --git a/src/Phalcon/Cli/Router.php b/src/Phalcon/Cli/Router.php
index 79745c4c..861414e1 100644
--- a/src/Phalcon/Cli/Router.php
+++ b/src/Phalcon/Cli/Router.php
@@ -167,7 +167,7 @@ public function getRouteByName(string $name)
     /**
      * Returns all the routes defined in the router
      *
-     * @return array|\Phalcon\Cli\Router\Route[]
+     * @return array
      */
     public function getRoutes(): array
     {
diff --git a/src/Phalcon/Cli/RouterInterface.php b/src/Phalcon/Cli/RouterInterface.php
index 29f56fa8..7c6c9571 100644
--- a/src/Phalcon/Cli/RouterInterface.php
+++ b/src/Phalcon/Cli/RouterInterface.php
@@ -80,7 +80,7 @@ public function getRouteByName(string $name): RouteInterface;
     /**
      * Return all the routes defined in the router
      *
-     * @return array|\Phalcon\Cli\Router\RouteInterface[]
+     * @return array
      */
     public function getRoutes(): array;
 
diff --git a/src/Phalcon/Db/Adapter/AbstractAdapter.php b/src/Phalcon/Db/Adapter/AbstractAdapter.php
index c91fc8c6..4135ec85 100644
--- a/src/Phalcon/Db/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Db/Adapter/AbstractAdapter.php
@@ -257,7 +257,7 @@ public function delete($table, $whereCondition = null, $placeholders = null, $da
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\IndexInterface[]
+     * @return array
      */
     public function describeIndexes(string $table, string $schema = null): array
     {
@@ -274,7 +274,7 @@ public function describeIndexes(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ReferenceInterface[]
+     * @return array
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/AdapterInterface.php b/src/Phalcon/Db/Adapter/AdapterInterface.php
index 9cf09489..2e2e691f 100644
--- a/src/Phalcon/Db/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Db/Adapter/AdapterInterface.php
@@ -143,7 +143,7 @@ public function delete($table, $whereCondition = null, $placeholders = null, $da
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ColumnInterface[]
+     * @return array
      */
     public function describeColumns(string $table, string $schema = null): array;
 
@@ -152,7 +152,7 @@ public function describeColumns(string $table, string $schema = null): array;
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\IndexInterface[]
+     * @return array
      */
     public function describeIndexes(string $table, string $schema = null): array;
 
@@ -161,7 +161,7 @@ public function describeIndexes(string $table, string $schema = null): array;
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ReferenceInterface[]
+     * @return array
      */
     public function describeReferences(string $table, string $schema = null): array;
 
diff --git a/src/Phalcon/Db/Adapter/Pdo/Mysql.php b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
index 04d16231..c72a284f 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Mysql.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
@@ -62,7 +62,7 @@ public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ColumnInterface[]
+     * @return array
      */
     public function describeColumns(string $table, string $schema = null): array
     {
@@ -79,7 +79,7 @@ public function describeColumns(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\IndexInterface[]
+     * @return array
      */
     public function describeIndexes(string $table, string $schema = null): array
     {
@@ -96,7 +96,7 @@ public function describeIndexes(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ReferenceInterface[]
+     * @return array
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
index 2d581d59..5235f722 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
@@ -84,7 +84,7 @@ public function createTable(string $tableName, string $schemaName, array $defini
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ColumnInterface[]
+     * @return array
      */
     public function describeColumns(string $table, string $schema = null): array
     {
@@ -101,7 +101,7 @@ public function describeColumns(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ReferenceInterface[]
+     * @return array
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
index 7bb69a4c..ebec76be 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
@@ -68,7 +68,7 @@ public function connect(array $descriptor = null): bool
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ColumnInterface[]
+     * @return array
      */
     public function describeColumns(string $table, string $schema = null): array
     {
@@ -85,7 +85,7 @@ public function describeColumns(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\IndexInterface[]
+     * @return array
      */
     public function describeIndexes(string $table, string $schema = null): array
     {
@@ -96,7 +96,7 @@ public function describeIndexes(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array|\Phalcon\Db\ReferenceInterface[]
+     * @return array
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/PdoFactory.php b/src/Phalcon/Db/Adapter/PdoFactory.php
index b539b732..fb41d198 100644
--- a/src/Phalcon/Db/Adapter/PdoFactory.php
+++ b/src/Phalcon/Db/Adapter/PdoFactory.php
@@ -32,7 +32,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'mysql',
diff --git a/src/Phalcon/Db/Profiler.php b/src/Phalcon/Db/Profiler.php
index 5aee40ff..96fe89e0 100644
--- a/src/Phalcon/Db/Profiler.php
+++ b/src/Phalcon/Db/Profiler.php
@@ -115,7 +115,7 @@ public function getTotalElapsedSeconds(): float
     /**
      * Returns all the processed profiles
      *
-     * @return array|\Phalcon\Db\Profiler\Item[]
+     * @return array
      */
     public function getProfiles(): array
     {
diff --git a/src/Phalcon/Db/Result/Pdo.php b/src/Phalcon/Db/Result/Pdo.php
index ab2ffa8f..f8efc724 100644
--- a/src/Phalcon/Db/Result/Pdo.php
+++ b/src/Phalcon/Db/Result/Pdo.php
@@ -98,7 +98,7 @@ public function dataSeek(int $number)
     /**
      * Allows to execute the statement again. Some database systems don't
      * support scrollable cursors. So, as cursors are forward only, we need to
-     * execute the cursor again to fetch rows from the begining
+     * execute the cursor again to fetch rows from the beginning
      *
      * @return bool
      */
diff --git a/src/Phalcon/Db/ResultInterface.php b/src/Phalcon/Db/ResultInterface.php
index 5f7abd5c..77662071 100644
--- a/src/Phalcon/Db/ResultInterface.php
+++ b/src/Phalcon/Db/ResultInterface.php
@@ -24,9 +24,9 @@ interface ResultInterface
     public function dataSeek(int $number);
 
     /**
-     * Allows to executes the statement again. Some database systems don't
+     * Allows to execute the statement again. Some database systems don't
      * support scrollable cursors. So, as cursors are forward only, we need to
-     * execute the cursor again to fetch rows from the begining
+     * execute the cursor again to fetch rows from the beginning
      *
      * @return bool
      */
diff --git a/src/Phalcon/Debug.php b/src/Phalcon/Debug.php
index 8911041f..2e18f6c4 100644
--- a/src/Phalcon/Debug.php
+++ b/src/Phalcon/Debug.php
@@ -141,10 +141,10 @@ public function listenLowSeverity(): Debug
     /**
      * Handles uncaught exceptions
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @return bool
      */
-    public function onUncaughtException(\Exception $exception): bool
+    public function onUncaughtException(\Throwable $exception): bool
     {
     }
 
diff --git a/src/Phalcon/Di.php b/src/Phalcon/Di.php
index b7d54e62..bf94c8d1 100644
--- a/src/Phalcon/Di.php
+++ b/src/Phalcon/Di.php
@@ -160,7 +160,7 @@ public function getService(string $name): ServiceInterface
     /**
      * Return the services registered in the DI
      *
-     * @return array|\Phalcon\Di\ServiceInterface[]
+     * @return array
      */
     public function getServices(): array
     {
diff --git a/src/Phalcon/Di/DiInterface.php b/src/Phalcon/Di/DiInterface.php
index 6c47e9f4..d270d4e9 100644
--- a/src/Phalcon/Di/DiInterface.php
+++ b/src/Phalcon/Di/DiInterface.php
@@ -62,7 +62,7 @@ public function getService(string $name): ServiceInterface;
     /**
      * Return the services registered in the DI
      *
-     * @return array|ServiceInterface[]
+     * @return array
      */
     public function getServices(): array;
 
diff --git a/src/Phalcon/Filter/FilterFactory.php b/src/Phalcon/Filter/FilterFactory.php
index 649ba460..b2b9ffd5 100644
--- a/src/Phalcon/Filter/FilterFactory.php
+++ b/src/Phalcon/Filter/FilterFactory.php
@@ -21,7 +21,7 @@ class FilterFactory
 {
 
     /**
-     * Returns a Locator object with all the helpers defined in anonynous
+     * Returns a Locator object with all the helpers defined in anonymous
      * functions
      *
      * @return FilterInterface
diff --git a/src/Phalcon/Filter/Sanitize/UpperWords.php b/src/Phalcon/Filter/Sanitize/UpperWords.php
index a0ffce76..497cf04f 100644
--- a/src/Phalcon/Filter/Sanitize/UpperWords.php
+++ b/src/Phalcon/Filter/Sanitize/UpperWords.php
@@ -12,7 +12,7 @@
 /**
  * Phalcon\Filter\Sanitize\UpperWords
  *
- * Sanitizes a value to uppercase teh first character of each word
+ * Sanitizes a value to uppercase the first character of each word
  */
 class UpperWords
 {
diff --git a/src/Phalcon/Forms/Element/AbstractElement.php b/src/Phalcon/Forms/Element/AbstractElement.php
index f9397385..8dbc902e 100644
--- a/src/Phalcon/Forms/Element/AbstractElement.php
+++ b/src/Phalcon/Forms/Element/AbstractElement.php
@@ -216,7 +216,7 @@ public function getUserOptions(): array
     /**
      * Returns the validators registered for the element
      *
-     * @return array|\Phalcon\Validation\ValidatorInterface[]
+     * @return array
      */
     public function getValidators(): array
     {
diff --git a/src/Phalcon/Forms/Element/ElementInterface.php b/src/Phalcon/Forms/Element/ElementInterface.php
index ec77a1d4..4274309b 100644
--- a/src/Phalcon/Forms/Element/ElementInterface.php
+++ b/src/Phalcon/Forms/Element/ElementInterface.php
@@ -138,7 +138,7 @@ public function getUserOptions(): array;
     /**
      * Returns the validators registered for the element
      *
-     * @return array|\Phalcon\Validation\ValidatorInterface[]
+     * @return array
      */
     public function getValidators(): array;
 
diff --git a/src/Phalcon/Forms/Form.php b/src/Phalcon/Forms/Form.php
index dcf85e29..01e9d411 100644
--- a/src/Phalcon/Forms/Form.php
+++ b/src/Phalcon/Forms/Form.php
@@ -155,7 +155,7 @@ public function getAttributes(): Attributes
     /**
      * Returns the form elements added to the form
      *
-     * @return array|\Phalcon\Forms\Element\ElementInterface[]
+     * @return array
      */
     public function getElements(): array
     {
diff --git a/src/Phalcon/Helper/Arr.php b/src/Phalcon/Helper/Arr.php
index a269fc1b..5f7c5025 100644
--- a/src/Phalcon/Helper/Arr.php
+++ b/src/Phalcon/Helper/Arr.php
@@ -253,7 +253,7 @@ final public static function validateAll(array $collection, $method = null): boo
 
     /**
      * Returns true if the provided function returns true for at least one
-     * element fo the collection, false otherwise.
+     * element of the collection, false otherwise.
      *
      * @param array    $collection
      * @param callable $method
diff --git a/src/Phalcon/Helper/Str.php b/src/Phalcon/Helper/Str.php
index 06393094..e2d475b8 100644
--- a/src/Phalcon/Helper/Str.php
+++ b/src/Phalcon/Helper/Str.php
@@ -83,7 +83,7 @@ final public static function concat(): string
     }
 
     /**
-     * Retuns number of vowels in provided string. Uses a regular expression
+     * Returns number of vowels in provided string. Uses a regular expression
      * to count the number of vowels (A, E, I, O, U) in a string.
      *
      * @param string $string
@@ -96,7 +96,7 @@ final public static function countVowels(string $text): int
     }
 
     /**
-     * Decapitalizes the first letter of the sring and then adds it with rest
+     * Decapitalizes the first letter of the string and then adds it with rest
      * of the string. Omit the upperRest parameter to keep the rest of the
      * string intact, or set it to true to convert to uppercase.
      *
diff --git a/src/Phalcon/Http/Request.php b/src/Phalcon/Http/Request.php
index fa2cf8ba..6d54dfb5 100644
--- a/src/Phalcon/Http/Request.php
+++ b/src/Phalcon/Http/Request.php
@@ -479,7 +479,7 @@ public function getServerName(): string
      *
      * @param bool $onlySuccessful
      * @param bool $namedKeys
-     * @return array|\Phalcon\Http\Request\FileInterface[]
+     * @return array
      */
     public function getUploadedFiles(bool $onlySuccessful = false, bool $namedKeys = false): array
     {
diff --git a/src/Phalcon/Http/RequestInterface.php b/src/Phalcon/Http/RequestInterface.php
index 8c96e2e2..96b2bee0 100644
--- a/src/Phalcon/Http/RequestInterface.php
+++ b/src/Phalcon/Http/RequestInterface.php
@@ -341,7 +341,7 @@ public function getServerName(): string;
      *
      * @param bool $onlySuccessful
      * @param bool $namedKeys
-     * @return array|\Phalcon\Http\Request\FileInterface[]
+     * @return array
      */
     public function getUploadedFiles(bool $onlySuccessful = false, bool $namedKeys = false): array;
 
diff --git a/src/Phalcon/Image/ImageFactory.php b/src/Phalcon/Image/ImageFactory.php
index d1814299..efe9c7c0 100644
--- a/src/Phalcon/Image/ImageFactory.php
+++ b/src/Phalcon/Image/ImageFactory.php
@@ -28,7 +28,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'gd',
diff --git a/src/Phalcon/Logger/LoggerFactory.php b/src/Phalcon/Logger/LoggerFactory.php
index de0205bc..6dfe2189 100644
--- a/src/Phalcon/Logger/LoggerFactory.php
+++ b/src/Phalcon/Logger/LoggerFactory.php
@@ -32,7 +32,7 @@ public function __construct(AdapterFactory $factory)
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'name' => 'messages',
diff --git a/src/Phalcon/Mvc/Application.php b/src/Phalcon/Mvc/Application.php
index 338827f4..ec4e78c0 100644
--- a/src/Phalcon/Mvc/Application.php
+++ b/src/Phalcon/Mvc/Application.php
@@ -10,7 +10,6 @@
 namespace Phalcon\Mvc;
 
 use Phalcon\Application\AbstractApplication;
-use Phalcon\Mvc\ModuleDefinitionInterface;
 
 /**
  * Phalcon\Mvc\Application
diff --git a/src/Phalcon/Mvc/Micro.php b/src/Phalcon/Mvc/Micro.php
index 012171b3..ba0606f0 100644
--- a/src/Phalcon/Mvc/Micro.php
+++ b/src/Phalcon/Mvc/Micro.php
@@ -461,7 +461,7 @@ public function setModelBinder(\Phalcon\Mvc\Model\BinderInterface $modelBinder,
     }
 
     /**
-     * Appends a custom 'reponse' handler to be called insted of the default
+     * Appends a custom 'response' handler to be called instead of the default
      * response handler
      *
      * @param callable $handler
diff --git a/src/Phalcon/Mvc/Model.php b/src/Phalcon/Mvc/Model.php
index dab6d99f..ab6608ec 100644
--- a/src/Phalcon/Mvc/Model.php
+++ b/src/Phalcon/Mvc/Model.php
@@ -860,7 +860,7 @@ public function getEventsManager(): EventsManagerInterface
      * ```
      *
      * @param mixed $filter
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getMessages($filter = null): array
     {
diff --git a/src/Phalcon/Mvc/Model/Manager.php b/src/Phalcon/Mvc/Model/Manager.php
index 9af259ba..777815c2 100644
--- a/src/Phalcon/Mvc/Model/Manager.php
+++ b/src/Phalcon/Mvc/Model/Manager.php
@@ -775,7 +775,7 @@ public function getHasOneRecords(string $modelName, string $modelRelation, \Phal
      * ```
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -785,7 +785,7 @@ public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -805,7 +805,7 @@ public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasOneThrough relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -815,7 +815,7 @@ public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasManyToMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -825,7 +825,7 @@ public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -835,7 +835,7 @@ public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array
      * Query all the relationships defined on a model
      *
      * @param string $modelName
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getRelations(string $modelName): array
     {
@@ -846,7 +846,7 @@ public function getRelations(string $modelName): array
      *
      * @param string $first
      * @param string $second
-     * @return array|bool|RelationInterface[]
+     * @return array|bool
      */
     public function getRelationsBetween(string $first, string $second)
     {
diff --git a/src/Phalcon/Mvc/Model/ManagerInterface.php b/src/Phalcon/Mvc/Model/ManagerInterface.php
index 1e1193c5..c7d7b345 100644
--- a/src/Phalcon/Mvc/Model/ManagerInterface.php
+++ b/src/Phalcon/Mvc/Model/ManagerInterface.php
@@ -170,7 +170,7 @@ public function existsHasManyToMany(string $modelName, string $modelRelation): b
      * Gets belongsTo relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -190,7 +190,7 @@ public function getBelongsToRecords(string $modelName, string $modelRelation, \P
      * Gets hasMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -210,7 +210,7 @@ public function getHasManyRecords(string $modelName, string $modelRelation, \Pha
      * Gets hasManyToMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -218,7 +218,7 @@ public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array;
      * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -226,7 +226,7 @@ public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array;
      * Gets hasOneThrough relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -234,7 +234,7 @@ public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array;
      * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -320,7 +320,7 @@ public function getRelationRecords(RelationInterface $relation, \Phalcon\Mvc\Mod
      * Query all the relationships defined on a model
      *
      * @param string $modelName
-     * @return array|RelationInterface[]
+     * @return array
      */
     public function getRelations(string $modelName): array;
 
@@ -329,7 +329,7 @@ public function getRelations(string $modelName): array;
      *
      * @param string $first
      * @param string $second
-     * @return array|bool|RelationInterface[]
+     * @return array|bool
      */
     public function getRelationsBetween(string $first, string $second);
 
diff --git a/src/Phalcon/Mvc/Model/Query/Status.php b/src/Phalcon/Mvc/Model/Query/Status.php
index 623b3ca1..9c6f5668 100644
--- a/src/Phalcon/Mvc/Model/Query/Status.php
+++ b/src/Phalcon/Mvc/Model/Query/Status.php
@@ -60,7 +60,7 @@ public function __construct(bool $success, \Phalcon\Mvc\ModelInterface $model =
     /**
      * Returns the messages produced because of a failed operation
      *
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getMessages(): array
     {
diff --git a/src/Phalcon/Mvc/Model/Query/StatusInterface.php b/src/Phalcon/Mvc/Model/Query/StatusInterface.php
index b70cbae2..c63f95dc 100644
--- a/src/Phalcon/Mvc/Model/Query/StatusInterface.php
+++ b/src/Phalcon/Mvc/Model/Query/StatusInterface.php
@@ -22,7 +22,7 @@ interface StatusInterface
     /**
      * Returns the messages produced by an operation failed
      *
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getMessages(): array;
 
diff --git a/src/Phalcon/Mvc/Model/RelationInterface.php b/src/Phalcon/Mvc/Model/RelationInterface.php
index ed33aa25..a418e806 100644
--- a/src/Phalcon/Mvc/Model/RelationInterface.php
+++ b/src/Phalcon/Mvc/Model/RelationInterface.php
@@ -117,7 +117,7 @@ public function isReusable(): bool;
     public function isThrough(): bool;
 
     /**
-     * Sets the intermediate model dat for has--through relations
+     * Sets the intermediate model data for has--through relations
      *
      * @param string|array $intermediateFields
      * @param string|array $intermediateReferencedFields
diff --git a/src/Phalcon/Mvc/Model/Resultset.php b/src/Phalcon/Mvc/Model/Resultset.php
index c5f57173..0cb616a9 100644
--- a/src/Phalcon/Mvc/Model/Resultset.php
+++ b/src/Phalcon/Mvc/Model/Resultset.php
@@ -146,7 +146,7 @@ public function delete(\Closure $conditionCallback = null): bool
      * ```
      *
      * @param callable $filter
-     * @return array|\Phalcon\Mvc\ModelInterface[]
+     * @return array
      */
     public function filter($filter): array
     {
@@ -191,7 +191,7 @@ public function getLast(): ?ModelInterface
     /**
      * Returns the error messages produced by a batch operation
      *
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getMessages(): array
     {
diff --git a/src/Phalcon/Mvc/Model/ResultsetInterface.php b/src/Phalcon/Mvc/Model/ResultsetInterface.php
index 6e2f6730..7109e39a 100644
--- a/src/Phalcon/Mvc/Model/ResultsetInterface.php
+++ b/src/Phalcon/Mvc/Model/ResultsetInterface.php
@@ -42,7 +42,7 @@ public function delete(\Closure $conditionCallback = null): bool;
      * ```
      *
      * @param callable $filter
-     * @return array|\Phalcon\Mvc\ModelInterface[]
+     * @return array
      */
     public function filter($filter): array;
 
@@ -77,7 +77,7 @@ public function getLast(): ?ModelInterface;
     /**
      * Returns the error messages produced by a batch operation
      *
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getMessages(): array;
 
diff --git a/src/Phalcon/Mvc/Model/Transaction/Failed.php b/src/Phalcon/Mvc/Model/Transaction/Failed.php
index 0c0ec856..b6555617 100644
--- a/src/Phalcon/Mvc/Model/Transaction/Failed.php
+++ b/src/Phalcon/Mvc/Model/Transaction/Failed.php
@@ -44,7 +44,7 @@ public function getRecord(): ModelInterface
     /**
      * Returns validation record messages which stop the transaction
      *
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getRecordMessages(): array
     {
diff --git a/src/Phalcon/Mvc/Model/ValidationFailed.php b/src/Phalcon/Mvc/Model/ValidationFailed.php
index f532b193..098cc9d4 100644
--- a/src/Phalcon/Mvc/Model/ValidationFailed.php
+++ b/src/Phalcon/Mvc/Model/ValidationFailed.php
@@ -41,7 +41,7 @@ public function __construct(\Phalcon\Mvc\ModelInterface $model, array $validatio
     /**
      * Returns the complete group of messages produced in the validation
      *
-     * @return array|Message[]
+     * @return array
      */
     public function getMessages(): array
     {
diff --git a/src/Phalcon/Mvc/ModelInterface.php b/src/Phalcon/Mvc/ModelInterface.php
index 50ab8ab2..ed66717c 100644
--- a/src/Phalcon/Mvc/ModelInterface.php
+++ b/src/Phalcon/Mvc/ModelInterface.php
@@ -151,7 +151,7 @@ public function getDirtyState(): int;
     /**
      * Returns array of validation messages
      *
-     * @return array|\Phalcon\Messages\MessageInterface[]
+     * @return array
      */
     public function getMessages(): array;
 
diff --git a/src/Phalcon/Mvc/Router.php b/src/Phalcon/Mvc/Router.php
index 75b49be9..1558ef80 100644
--- a/src/Phalcon/Mvc/Router.php
+++ b/src/Phalcon/Mvc/Router.php
@@ -482,7 +482,7 @@ public function getRouteByName(string $name)
     /**
      * Returns all the routes defined in the router
      *
-     * @return array|\Phalcon\Mvc\Router\RouteInterface[]
+     * @return array
      */
     public function getRoutes(): array
     {
diff --git a/src/Phalcon/Mvc/Router/Group.php b/src/Phalcon/Mvc/Router/Group.php
index f6b9b6d7..38095e23 100644
--- a/src/Phalcon/Mvc/Router/Group.php
+++ b/src/Phalcon/Mvc/Router/Group.php
@@ -325,7 +325,7 @@ public function getPrefix(): string
     /**
      * Returns the routes added to the group
      *
-     * @return array|RouteInterface[]
+     * @return array
      */
     public function getRoutes(): array
     {
diff --git a/src/Phalcon/Mvc/Router/GroupInterface.php b/src/Phalcon/Mvc/Router/GroupInterface.php
index 2ed4c526..d68a50db 100644
--- a/src/Phalcon/Mvc/Router/GroupInterface.php
+++ b/src/Phalcon/Mvc/Router/GroupInterface.php
@@ -210,7 +210,7 @@ public function getPrefix(): string;
     /**
      * Returns the routes added to the group
      *
-     * @return array|RouteInterface[]
+     * @return array
      */
     public function getRoutes(): array;
 
diff --git a/src/Phalcon/Mvc/RouterInterface.php b/src/Phalcon/Mvc/RouterInterface.php
index e6e702a9..eca288fe 100644
--- a/src/Phalcon/Mvc/RouterInterface.php
+++ b/src/Phalcon/Mvc/RouterInterface.php
@@ -186,7 +186,7 @@ public function getParams(): array;
     /**
      * Return all the routes defined in the router
      *
-     * @return array|\Phalcon\Mvc\Router\RouteInterface[]
+     * @return array
      */
     public function getRoutes(): array;
 
diff --git a/src/Phalcon/Paginator/PaginatorFactory.php b/src/Phalcon/Paginator/PaginatorFactory.php
index a6ef3ec1..3b120854 100644
--- a/src/Phalcon/Paginator/PaginatorFactory.php
+++ b/src/Phalcon/Paginator/PaginatorFactory.php
@@ -33,7 +33,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * ```php
      * use Phalcon\Paginator\PaginatorFactory;
diff --git a/src/Phalcon/Storage/Adapter/Redis.php b/src/Phalcon/Storage/Adapter/Redis.php
index 5885c61e..ab56e4cc 100644
--- a/src/Phalcon/Storage/Adapter/Redis.php
+++ b/src/Phalcon/Storage/Adapter/Redis.php
@@ -103,7 +103,8 @@ public function getAdapter()
     }
 
     /**
-     * Stores data in the adapter
+     * Gets the keys from the adapter. Accepts an optional prefix which will
+     * filter the keys returned
      *
      * @return array
      * @throws Exception
diff --git a/src/Phalcon/Tag.php b/src/Phalcon/Tag.php
index c7004216..986c9330 100644
--- a/src/Phalcon/Tag.php
+++ b/src/Phalcon/Tag.php
@@ -541,7 +541,7 @@ public static function renderAttributes(string $code, array $attributes): string
     }
 
     /**
-     * Renders the title with title tags. The title is automaticall escaped
+     * Renders the title with title tags. The title is automatically escaped
      *
      * @param bool $prepend
      * @param bool $append
diff --git a/src/Phalcon/Translate/Adapter/NativeArray.php b/src/Phalcon/Translate/Adapter/NativeArray.php
index 7b35a0aa..5e0bf236 100644
--- a/src/Phalcon/Translate/Adapter/NativeArray.php
+++ b/src/Phalcon/Translate/Adapter/NativeArray.php
@@ -51,7 +51,7 @@ public function exists(string $index): bool
     }
 
     /**
-     * Whenever a key is not found this medhod will be called
+     * Whenever a key is not found this method will be called
      *
      * @param string $index
      * @return string
diff --git a/src/Phalcon/Translate/TranslateFactory.php b/src/Phalcon/Translate/TranslateFactory.php
index 59d0c027..b938f42e 100644
--- a/src/Phalcon/Translate/TranslateFactory.php
+++ b/src/Phalcon/Translate/TranslateFactory.php
@@ -39,7 +39,7 @@ public function __construct(InterpolatorFactory $interpolator, array $services =
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config = [
      *     'adapter' => 'ini,
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
index fdd9bd33..00c22fa6 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
- * Checks if a file has the rigth resolution
+ * Checks if a file has the right resolution
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Max.php b/src/Phalcon/Validation/Validator/File/Resolution/Max.php
index eac298ab..868e9f08 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Max.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Max.php
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
- * Checks if a file has the rigth resolution
+ * Checks if a file has the right resolution
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Min.php b/src/Phalcon/Validation/Validator/File/Resolution/Min.php
index 0866f57e..bd948037 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Min.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Min.php
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
- * Checks if a file has the rigth resolution
+ * Checks if a file has the right resolution
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/Validator/File/Size/Equal.php b/src/Phalcon/Validation/Validator/File/Size/Equal.php
index d1c56a84..8fad03de 100644
--- a/src/Phalcon/Validation/Validator/File/Size/Equal.php
+++ b/src/Phalcon/Validation/Validator/File/Size/Equal.php
@@ -47,7 +47,7 @@
  *                 "anotherFile" => true,
  *             ],
  *             "message" => [
- *                 "file"        => "file does not have the rigth filesize",
+ *                 "file"        => "file does not have the right filesize",
  *                 "anotherFile" => "anotherFile wrong filesize (4MB)",
  *             ],
  *         ]
diff --git a/src/Phalcon/Validation/Validator/StringLength.php b/src/Phalcon/Validation/Validator/StringLength.php
index 761ad171..c6c7e05f 100644
--- a/src/Phalcon/Validation/Validator/StringLength.php
+++ b/src/Phalcon/Validation/Validator/StringLength.php
@@ -15,7 +15,7 @@
  * Validates that a string has the specified maximum and minimum constraints
  * The test is passed if for a string's length L, min<=L<=max, i.e. L must
  * be at least min, and at most max.
- * Since Phalcon v4.0 this valitor works like a container
+ * Since Phalcon v4.0 this validator works like a container
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/ValidatorInterface.php b/src/Phalcon/Validation/ValidatorInterface.php
index 2019197f..1844d552 100644
--- a/src/Phalcon/Validation/ValidatorInterface.php
+++ b/src/Phalcon/Validation/ValidatorInterface.php
@@ -67,7 +67,7 @@ public function getTemplates(): array;
     public function setTemplates(array $templates): ValidatorInterface;
 
     /**
-     * Set a new temlate message
+     * Set a new template message
      *
      * @return ValidatorInterface
      * @param string $template

From 91c56d2142be6a906a9fddb624180bdb62b28730 Mon Sep 17 00:00:00 2001
From: Ruud Boon <ruud@ruudboon.io>
Date: Sun, 26 Jan 2020 00:18:39 +0100
Subject: [PATCH 2/2] Upgraded stubs using Zephir 0.12.16

---
 src/Phalcon/Acl/Adapter/AdapterInterface.php    |  4 ++--
 src/Phalcon/Acl/Adapter/Memory.php              |  4 ++--
 src/Phalcon/Annotations/Collection.php          |  4 ++--
 src/Phalcon/Annotations/Reflection.php          |  4 ++--
 src/Phalcon/Assets/Manager.php                  |  2 +-
 src/Phalcon/Cli/Router.php                      |  2 +-
 src/Phalcon/Cli/RouterInterface.php             |  2 +-
 src/Phalcon/Db/Adapter/AbstractAdapter.php      |  4 ++--
 src/Phalcon/Db/Adapter/AdapterInterface.php     |  6 +++---
 src/Phalcon/Db/Adapter/Pdo/Mysql.php            |  6 +++---
 src/Phalcon/Db/Adapter/Pdo/Postgresql.php       |  4 ++--
 src/Phalcon/Db/Adapter/Pdo/Sqlite.php           |  6 +++---
 src/Phalcon/Db/Profiler.php                     |  2 +-
 src/Phalcon/Di.php                              |  2 +-
 src/Phalcon/Di/DiInterface.php                  |  2 +-
 src/Phalcon/Forms/Element/AbstractElement.php   |  2 +-
 src/Phalcon/Forms/Element/ElementInterface.php  |  2 +-
 src/Phalcon/Forms/Form.php                      |  2 +-
 src/Phalcon/Http/Request.php                    |  2 +-
 src/Phalcon/Http/RequestInterface.php           |  2 +-
 src/Phalcon/Mvc/Model.php                       |  2 +-
 src/Phalcon/Mvc/Model/Manager.php               | 14 +++++++-------
 src/Phalcon/Mvc/Model/ManagerInterface.php      | 16 ++++++++--------
 src/Phalcon/Mvc/Model/Query/Status.php          |  2 +-
 src/Phalcon/Mvc/Model/Query/StatusInterface.php |  2 +-
 src/Phalcon/Mvc/Model/Resultset.php             |  4 ++--
 src/Phalcon/Mvc/Model/ResultsetInterface.php    |  4 ++--
 src/Phalcon/Mvc/Model/Transaction/Failed.php    |  2 +-
 src/Phalcon/Mvc/Model/ValidationFailed.php      |  2 +-
 src/Phalcon/Mvc/ModelInterface.php              |  2 +-
 src/Phalcon/Mvc/Router.php                      |  2 +-
 src/Phalcon/Mvc/Router/Group.php                |  2 +-
 src/Phalcon/Mvc/Router/GroupInterface.php       |  2 +-
 src/Phalcon/Mvc/RouterInterface.php             |  2 +-
 34 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/src/Phalcon/Acl/Adapter/AdapterInterface.php b/src/Phalcon/Acl/Adapter/AdapterInterface.php
index 50dcf539..4d7067e0 100644
--- a/src/Phalcon/Acl/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Acl/Adapter/AdapterInterface.php
@@ -127,14 +127,14 @@ public function getNoArgumentsDefaultAction(): int;
     /**
      * Return an array with every role registered in the list
      *
-     * @return array
+     * @return array|\Phalcon\Acl\RoleInterface[]
      */
     public function getRoles(): array;
 
     /**
      * Return an array with every component registered in the list
      *
-     * @return array
+     * @return array|\Phalcon\Acl\ComponentInterface[]
      */
     public function getComponents(): array;
 
diff --git a/src/Phalcon/Acl/Adapter/Memory.php b/src/Phalcon/Acl/Adapter/Memory.php
index 6a243609..c29cd66b 100644
--- a/src/Phalcon/Acl/Adapter/Memory.php
+++ b/src/Phalcon/Acl/Adapter/Memory.php
@@ -362,7 +362,7 @@ public function getNoArgumentsDefaultAction(): int
     /**
      * Return an array with every role registered in the list
      *
-     * @return array
+     * @return array|\Phalcon\Acl\RoleInterface[]
      */
     public function getRoles(): array
     {
@@ -371,7 +371,7 @@ public function getRoles(): array
     /**
      * Return an array with every component registered in the list
      *
-     * @return array
+     * @return array|\Phalcon\Acl\ComponentInterface[]
      */
     public function getComponents(): array
     {
diff --git a/src/Phalcon/Annotations/Collection.php b/src/Phalcon/Annotations/Collection.php
index d949b7c4..5bcb82e2 100644
--- a/src/Phalcon/Annotations/Collection.php
+++ b/src/Phalcon/Annotations/Collection.php
@@ -80,7 +80,7 @@ public function get(string $name): Annotation
      * Returns all the annotations that match a name
      *
      * @param string $name
-     * @return array
+     * @return array|Annotation[]
      */
     public function getAll(string $name): array
     {
@@ -89,7 +89,7 @@ public function getAll(string $name): array
     /**
      * Returns the internal annotations as an array
      *
-     * @return array
+     * @return array|Annotation[]
      */
     public function getAnnotations(): array
     {
diff --git a/src/Phalcon/Annotations/Reflection.php b/src/Phalcon/Annotations/Reflection.php
index fdcb7760..83bb43fa 100644
--- a/src/Phalcon/Annotations/Reflection.php
+++ b/src/Phalcon/Annotations/Reflection.php
@@ -65,7 +65,7 @@ public function getClassAnnotations()
     /**
      * Returns the annotations found in the methods' docblocks
      *
-     * @return array|bool
+     * @return array|bool|Collection[]
      */
     public function getMethodsAnnotations()
     {
@@ -74,7 +74,7 @@ public function getMethodsAnnotations()
     /**
      * Returns the annotations found in the properties' docblocks
      *
-     * @return array|bool
+     * @return array|bool|Collection[]
      */
     public function getPropertiesAnnotations()
     {
diff --git a/src/Phalcon/Assets/Manager.php b/src/Phalcon/Assets/Manager.php
index 9386ec9a..b84eb4e7 100644
--- a/src/Phalcon/Assets/Manager.php
+++ b/src/Phalcon/Assets/Manager.php
@@ -217,7 +217,7 @@ public function get(string $id): Collection
     /**
      * Returns existing collections in the manager
      *
-     * @return array
+     * @return array|Collection[]
      */
     public function getCollections(): array
     {
diff --git a/src/Phalcon/Cli/Router.php b/src/Phalcon/Cli/Router.php
index 861414e1..79745c4c 100644
--- a/src/Phalcon/Cli/Router.php
+++ b/src/Phalcon/Cli/Router.php
@@ -167,7 +167,7 @@ public function getRouteByName(string $name)
     /**
      * Returns all the routes defined in the router
      *
-     * @return array
+     * @return array|\Phalcon\Cli\Router\Route[]
      */
     public function getRoutes(): array
     {
diff --git a/src/Phalcon/Cli/RouterInterface.php b/src/Phalcon/Cli/RouterInterface.php
index 7c6c9571..29f56fa8 100644
--- a/src/Phalcon/Cli/RouterInterface.php
+++ b/src/Phalcon/Cli/RouterInterface.php
@@ -80,7 +80,7 @@ public function getRouteByName(string $name): RouteInterface;
     /**
      * Return all the routes defined in the router
      *
-     * @return array
+     * @return array|\Phalcon\Cli\Router\RouteInterface[]
      */
     public function getRoutes(): array;
 
diff --git a/src/Phalcon/Db/Adapter/AbstractAdapter.php b/src/Phalcon/Db/Adapter/AbstractAdapter.php
index 4135ec85..c91fc8c6 100644
--- a/src/Phalcon/Db/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Db/Adapter/AbstractAdapter.php
@@ -257,7 +257,7 @@ public function delete($table, $whereCondition = null, $placeholders = null, $da
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\IndexInterface[]
      */
     public function describeIndexes(string $table, string $schema = null): array
     {
@@ -274,7 +274,7 @@ public function describeIndexes(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ReferenceInterface[]
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/AdapterInterface.php b/src/Phalcon/Db/Adapter/AdapterInterface.php
index 2e2e691f..9cf09489 100644
--- a/src/Phalcon/Db/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Db/Adapter/AdapterInterface.php
@@ -143,7 +143,7 @@ public function delete($table, $whereCondition = null, $placeholders = null, $da
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ColumnInterface[]
      */
     public function describeColumns(string $table, string $schema = null): array;
 
@@ -152,7 +152,7 @@ public function describeColumns(string $table, string $schema = null): array;
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\IndexInterface[]
      */
     public function describeIndexes(string $table, string $schema = null): array;
 
@@ -161,7 +161,7 @@ public function describeIndexes(string $table, string $schema = null): array;
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ReferenceInterface[]
      */
     public function describeReferences(string $table, string $schema = null): array;
 
diff --git a/src/Phalcon/Db/Adapter/Pdo/Mysql.php b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
index c72a284f..04d16231 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Mysql.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
@@ -62,7 +62,7 @@ public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ColumnInterface[]
      */
     public function describeColumns(string $table, string $schema = null): array
     {
@@ -79,7 +79,7 @@ public function describeColumns(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\IndexInterface[]
      */
     public function describeIndexes(string $table, string $schema = null): array
     {
@@ -96,7 +96,7 @@ public function describeIndexes(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ReferenceInterface[]
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
index 5235f722..2d581d59 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
@@ -84,7 +84,7 @@ public function createTable(string $tableName, string $schemaName, array $defini
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ColumnInterface[]
      */
     public function describeColumns(string $table, string $schema = null): array
     {
@@ -101,7 +101,7 @@ public function describeColumns(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ReferenceInterface[]
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
index ebec76be..7bb69a4c 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
@@ -68,7 +68,7 @@ public function connect(array $descriptor = null): bool
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ColumnInterface[]
      */
     public function describeColumns(string $table, string $schema = null): array
     {
@@ -85,7 +85,7 @@ public function describeColumns(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\IndexInterface[]
      */
     public function describeIndexes(string $table, string $schema = null): array
     {
@@ -96,7 +96,7 @@ public function describeIndexes(string $table, string $schema = null): array
      *
      * @param string $table
      * @param string $schema
-     * @return array
+     * @return array|\Phalcon\Db\ReferenceInterface[]
      */
     public function describeReferences(string $table, string $schema = null): array
     {
diff --git a/src/Phalcon/Db/Profiler.php b/src/Phalcon/Db/Profiler.php
index 96fe89e0..5aee40ff 100644
--- a/src/Phalcon/Db/Profiler.php
+++ b/src/Phalcon/Db/Profiler.php
@@ -115,7 +115,7 @@ public function getTotalElapsedSeconds(): float
     /**
      * Returns all the processed profiles
      *
-     * @return array
+     * @return array|\Phalcon\Db\Profiler\Item[]
      */
     public function getProfiles(): array
     {
diff --git a/src/Phalcon/Di.php b/src/Phalcon/Di.php
index bf94c8d1..b7d54e62 100644
--- a/src/Phalcon/Di.php
+++ b/src/Phalcon/Di.php
@@ -160,7 +160,7 @@ public function getService(string $name): ServiceInterface
     /**
      * Return the services registered in the DI
      *
-     * @return array
+     * @return array|\Phalcon\Di\ServiceInterface[]
      */
     public function getServices(): array
     {
diff --git a/src/Phalcon/Di/DiInterface.php b/src/Phalcon/Di/DiInterface.php
index d270d4e9..6c47e9f4 100644
--- a/src/Phalcon/Di/DiInterface.php
+++ b/src/Phalcon/Di/DiInterface.php
@@ -62,7 +62,7 @@ public function getService(string $name): ServiceInterface;
     /**
      * Return the services registered in the DI
      *
-     * @return array
+     * @return array|ServiceInterface[]
      */
     public function getServices(): array;
 
diff --git a/src/Phalcon/Forms/Element/AbstractElement.php b/src/Phalcon/Forms/Element/AbstractElement.php
index 8dbc902e..f9397385 100644
--- a/src/Phalcon/Forms/Element/AbstractElement.php
+++ b/src/Phalcon/Forms/Element/AbstractElement.php
@@ -216,7 +216,7 @@ public function getUserOptions(): array
     /**
      * Returns the validators registered for the element
      *
-     * @return array
+     * @return array|\Phalcon\Validation\ValidatorInterface[]
      */
     public function getValidators(): array
     {
diff --git a/src/Phalcon/Forms/Element/ElementInterface.php b/src/Phalcon/Forms/Element/ElementInterface.php
index 4274309b..ec77a1d4 100644
--- a/src/Phalcon/Forms/Element/ElementInterface.php
+++ b/src/Phalcon/Forms/Element/ElementInterface.php
@@ -138,7 +138,7 @@ public function getUserOptions(): array;
     /**
      * Returns the validators registered for the element
      *
-     * @return array
+     * @return array|\Phalcon\Validation\ValidatorInterface[]
      */
     public function getValidators(): array;
 
diff --git a/src/Phalcon/Forms/Form.php b/src/Phalcon/Forms/Form.php
index 01e9d411..dcf85e29 100644
--- a/src/Phalcon/Forms/Form.php
+++ b/src/Phalcon/Forms/Form.php
@@ -155,7 +155,7 @@ public function getAttributes(): Attributes
     /**
      * Returns the form elements added to the form
      *
-     * @return array
+     * @return array|\Phalcon\Forms\Element\ElementInterface[]
      */
     public function getElements(): array
     {
diff --git a/src/Phalcon/Http/Request.php b/src/Phalcon/Http/Request.php
index 6d54dfb5..fa2cf8ba 100644
--- a/src/Phalcon/Http/Request.php
+++ b/src/Phalcon/Http/Request.php
@@ -479,7 +479,7 @@ public function getServerName(): string
      *
      * @param bool $onlySuccessful
      * @param bool $namedKeys
-     * @return array
+     * @return array|\Phalcon\Http\Request\FileInterface[]
      */
     public function getUploadedFiles(bool $onlySuccessful = false, bool $namedKeys = false): array
     {
diff --git a/src/Phalcon/Http/RequestInterface.php b/src/Phalcon/Http/RequestInterface.php
index 96b2bee0..8c96e2e2 100644
--- a/src/Phalcon/Http/RequestInterface.php
+++ b/src/Phalcon/Http/RequestInterface.php
@@ -341,7 +341,7 @@ public function getServerName(): string;
      *
      * @param bool $onlySuccessful
      * @param bool $namedKeys
-     * @return array
+     * @return array|\Phalcon\Http\Request\FileInterface[]
      */
     public function getUploadedFiles(bool $onlySuccessful = false, bool $namedKeys = false): array;
 
diff --git a/src/Phalcon/Mvc/Model.php b/src/Phalcon/Mvc/Model.php
index ab6608ec..dab6d99f 100644
--- a/src/Phalcon/Mvc/Model.php
+++ b/src/Phalcon/Mvc/Model.php
@@ -860,7 +860,7 @@ public function getEventsManager(): EventsManagerInterface
      * ```
      *
      * @param mixed $filter
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getMessages($filter = null): array
     {
diff --git a/src/Phalcon/Mvc/Model/Manager.php b/src/Phalcon/Mvc/Model/Manager.php
index 777815c2..9af259ba 100644
--- a/src/Phalcon/Mvc/Model/Manager.php
+++ b/src/Phalcon/Mvc/Model/Manager.php
@@ -775,7 +775,7 @@ public function getHasOneRecords(string $modelName, string $modelRelation, \Phal
      * ```
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -785,7 +785,7 @@ public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -805,7 +805,7 @@ public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasOneThrough relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -815,7 +815,7 @@ public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasManyToMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -825,7 +825,7 @@ public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array
      * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array
     {
@@ -835,7 +835,7 @@ public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array
      * Query all the relationships defined on a model
      *
      * @param string $modelName
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getRelations(string $modelName): array
     {
@@ -846,7 +846,7 @@ public function getRelations(string $modelName): array
      *
      * @param string $first
      * @param string $second
-     * @return array|bool
+     * @return array|bool|RelationInterface[]
      */
     public function getRelationsBetween(string $first, string $second)
     {
diff --git a/src/Phalcon/Mvc/Model/ManagerInterface.php b/src/Phalcon/Mvc/Model/ManagerInterface.php
index c7d7b345..1e1193c5 100644
--- a/src/Phalcon/Mvc/Model/ManagerInterface.php
+++ b/src/Phalcon/Mvc/Model/ManagerInterface.php
@@ -170,7 +170,7 @@ public function existsHasManyToMany(string $modelName, string $modelRelation): b
      * Gets belongsTo relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -190,7 +190,7 @@ public function getBelongsToRecords(string $modelName, string $modelRelation, \P
      * Gets hasMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -210,7 +210,7 @@ public function getHasManyRecords(string $modelName, string $modelRelation, \Pha
      * Gets hasManyToMany relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -218,7 +218,7 @@ public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array;
      * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -226,7 +226,7 @@ public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array;
      * Gets hasOneThrough relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -234,7 +234,7 @@ public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array;
      * Gets hasOne relations defined on a model
      *
      * @param \Phalcon\Mvc\ModelInterface $model
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array;
 
@@ -320,7 +320,7 @@ public function getRelationRecords(RelationInterface $relation, \Phalcon\Mvc\Mod
      * Query all the relationships defined on a model
      *
      * @param string $modelName
-     * @return array
+     * @return array|RelationInterface[]
      */
     public function getRelations(string $modelName): array;
 
@@ -329,7 +329,7 @@ public function getRelations(string $modelName): array;
      *
      * @param string $first
      * @param string $second
-     * @return array|bool
+     * @return array|bool|RelationInterface[]
      */
     public function getRelationsBetween(string $first, string $second);
 
diff --git a/src/Phalcon/Mvc/Model/Query/Status.php b/src/Phalcon/Mvc/Model/Query/Status.php
index 9c6f5668..623b3ca1 100644
--- a/src/Phalcon/Mvc/Model/Query/Status.php
+++ b/src/Phalcon/Mvc/Model/Query/Status.php
@@ -60,7 +60,7 @@ public function __construct(bool $success, \Phalcon\Mvc\ModelInterface $model =
     /**
      * Returns the messages produced because of a failed operation
      *
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getMessages(): array
     {
diff --git a/src/Phalcon/Mvc/Model/Query/StatusInterface.php b/src/Phalcon/Mvc/Model/Query/StatusInterface.php
index c63f95dc..b70cbae2 100644
--- a/src/Phalcon/Mvc/Model/Query/StatusInterface.php
+++ b/src/Phalcon/Mvc/Model/Query/StatusInterface.php
@@ -22,7 +22,7 @@ interface StatusInterface
     /**
      * Returns the messages produced by an operation failed
      *
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getMessages(): array;
 
diff --git a/src/Phalcon/Mvc/Model/Resultset.php b/src/Phalcon/Mvc/Model/Resultset.php
index 0cb616a9..c5f57173 100644
--- a/src/Phalcon/Mvc/Model/Resultset.php
+++ b/src/Phalcon/Mvc/Model/Resultset.php
@@ -146,7 +146,7 @@ public function delete(\Closure $conditionCallback = null): bool
      * ```
      *
      * @param callable $filter
-     * @return array
+     * @return array|\Phalcon\Mvc\ModelInterface[]
      */
     public function filter($filter): array
     {
@@ -191,7 +191,7 @@ public function getLast(): ?ModelInterface
     /**
      * Returns the error messages produced by a batch operation
      *
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getMessages(): array
     {
diff --git a/src/Phalcon/Mvc/Model/ResultsetInterface.php b/src/Phalcon/Mvc/Model/ResultsetInterface.php
index 7109e39a..6e2f6730 100644
--- a/src/Phalcon/Mvc/Model/ResultsetInterface.php
+++ b/src/Phalcon/Mvc/Model/ResultsetInterface.php
@@ -42,7 +42,7 @@ public function delete(\Closure $conditionCallback = null): bool;
      * ```
      *
      * @param callable $filter
-     * @return array
+     * @return array|\Phalcon\Mvc\ModelInterface[]
      */
     public function filter($filter): array;
 
@@ -77,7 +77,7 @@ public function getLast(): ?ModelInterface;
     /**
      * Returns the error messages produced by a batch operation
      *
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getMessages(): array;
 
diff --git a/src/Phalcon/Mvc/Model/Transaction/Failed.php b/src/Phalcon/Mvc/Model/Transaction/Failed.php
index b6555617..0c0ec856 100644
--- a/src/Phalcon/Mvc/Model/Transaction/Failed.php
+++ b/src/Phalcon/Mvc/Model/Transaction/Failed.php
@@ -44,7 +44,7 @@ public function getRecord(): ModelInterface
     /**
      * Returns validation record messages which stop the transaction
      *
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getRecordMessages(): array
     {
diff --git a/src/Phalcon/Mvc/Model/ValidationFailed.php b/src/Phalcon/Mvc/Model/ValidationFailed.php
index 098cc9d4..f532b193 100644
--- a/src/Phalcon/Mvc/Model/ValidationFailed.php
+++ b/src/Phalcon/Mvc/Model/ValidationFailed.php
@@ -41,7 +41,7 @@ public function __construct(\Phalcon\Mvc\ModelInterface $model, array $validatio
     /**
      * Returns the complete group of messages produced in the validation
      *
-     * @return array
+     * @return array|Message[]
      */
     public function getMessages(): array
     {
diff --git a/src/Phalcon/Mvc/ModelInterface.php b/src/Phalcon/Mvc/ModelInterface.php
index ed66717c..50ab8ab2 100644
--- a/src/Phalcon/Mvc/ModelInterface.php
+++ b/src/Phalcon/Mvc/ModelInterface.php
@@ -151,7 +151,7 @@ public function getDirtyState(): int;
     /**
      * Returns array of validation messages
      *
-     * @return array
+     * @return array|\Phalcon\Messages\MessageInterface[]
      */
     public function getMessages(): array;
 
diff --git a/src/Phalcon/Mvc/Router.php b/src/Phalcon/Mvc/Router.php
index 1558ef80..75b49be9 100644
--- a/src/Phalcon/Mvc/Router.php
+++ b/src/Phalcon/Mvc/Router.php
@@ -482,7 +482,7 @@ public function getRouteByName(string $name)
     /**
      * Returns all the routes defined in the router
      *
-     * @return array
+     * @return array|\Phalcon\Mvc\Router\RouteInterface[]
      */
     public function getRoutes(): array
     {
diff --git a/src/Phalcon/Mvc/Router/Group.php b/src/Phalcon/Mvc/Router/Group.php
index 38095e23..f6b9b6d7 100644
--- a/src/Phalcon/Mvc/Router/Group.php
+++ b/src/Phalcon/Mvc/Router/Group.php
@@ -325,7 +325,7 @@ public function getPrefix(): string
     /**
      * Returns the routes added to the group
      *
-     * @return array
+     * @return array|RouteInterface[]
      */
     public function getRoutes(): array
     {
diff --git a/src/Phalcon/Mvc/Router/GroupInterface.php b/src/Phalcon/Mvc/Router/GroupInterface.php
index d68a50db..2ed4c526 100644
--- a/src/Phalcon/Mvc/Router/GroupInterface.php
+++ b/src/Phalcon/Mvc/Router/GroupInterface.php
@@ -210,7 +210,7 @@ public function getPrefix(): string;
     /**
      * Returns the routes added to the group
      *
-     * @return array
+     * @return array|RouteInterface[]
      */
     public function getRoutes(): array;
 
diff --git a/src/Phalcon/Mvc/RouterInterface.php b/src/Phalcon/Mvc/RouterInterface.php
index eca288fe..e6e702a9 100644
--- a/src/Phalcon/Mvc/RouterInterface.php
+++ b/src/Phalcon/Mvc/RouterInterface.php
@@ -186,7 +186,7 @@ public function getParams(): array;
     /**
      * Return all the routes defined in the router
      *
-     * @return array
+     * @return array|\Phalcon\Mvc\Router\RouteInterface[]
      */
     public function getRoutes(): array;