Fix psalm errors

src/Phalcon/Application/AbstractApplication.php

@@ -70,7 +70,8 @@ public function getEventsManager(): ManagerInterface
      * Gets the module definition registered in the application via module name
      *
      * @param string $name
-     * @return array|object
+     *
+     * @return array
      */
     public function getModule(string $name): array
     {

src/Phalcon/DataMapper/Pdo/Connection/AbstractConnection.php

@@ -265,7 +265,7 @@ public function fetchValue(string $statement, array $values = array())
     /**
      * Return the inner PDO (if any)
      *
-     * @return PDO
+     * @return \PDO
      */
     public function getAdapter(): \PDO
     {
@@ -361,7 +361,7 @@ public function lastInsertId(string $name = null): string
      * @param string $statement
      * @param array  $values
      *
-     * @return PDOStatement
+     * @return \PDOStatement
      */
     public function perform(string $statement, array $values = array()): \PDOStatement
     {
@@ -440,9 +440,10 @@ public function setProfiler(\Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface $
     /**
      * Bind a value using the proper PDO::PARAM_ type.
      *
-     * @param PDOStatement $statement
+     * @param \PDOStatement $statement
      * @param mixed        $name
      * @param mixed        $arguments
+     *
      * @return void
      */
     protected function performBind(\PDOStatement $statement, $name, $arguments)

src/Phalcon/DataMapper/Pdo/Connection/ConnectionInterface.php

@@ -173,7 +173,7 @@ public function fetchValue(string $statement, array $values = array());
     /**
      * Return the inner PDO (if any)
      *
-     * @return PDO
+     * @return \PDO
      */
     public function getAdapter(): \PDO;
 
@@ -200,7 +200,7 @@ public function isConnected(): bool;
      * @param string $statement
      * @param array  $values
      *
-     * @return PDOStatement
+     * @return \PDOStatement
      */
     public function perform(string $statement, array $values = array()): \PDOStatement;
 

src/Phalcon/DataMapper/Pdo/Connection/Decorated.php

@@ -19,15 +19,13 @@ class Decorated extends \Phalcon\DataMapper\Pdo\Connection\AbstractConnection
 {
 
     /**
-     *
      * Constructor.
      *
      * This overrides the parent so that it can take an existing PDO instance
      * and decorate it with the extended methods.
      *
-     * @param PDO                    $pdo
+     * @param \PDO $pdo
      * @param ProfilerInterface|null $profiler
-     *
      */
     public function __construct(\PDO $pdo, \Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface $profiler = null)
     {

src/Phalcon/DataMapper/Query/Delete.php

@@ -42,9 +42,9 @@ public function __construct(\Phalcon\DataMapper\Pdo\Connection $connection, Bind
      *
      * @param string $table
      *
-     * @return AbstractConditions
+     * @return self
      */
-    public function from(string $table): Delete
+    public function from(string $table): self
     {
     }
 

src/Phalcon/DataMapper/Query/Insert.php

@@ -31,12 +31,12 @@ public function __construct(\Phalcon\DataMapper\Pdo\Connection $connection, Bind
      * Sets a column for the `INSERT` query
      *
      * @param string $column
-     *
-     * @return this
      * @param mixed $value
      * @param int $type
+     *
+     * @return self
      */
-    public function column(string $column, $value = null, int $type = -1): Insert
+    public function column(string $column, $value = null, int $type = -1): self
     {
     }
 
@@ -45,9 +45,9 @@ public function column(string $column, $value = null, int $type = -1): Insert
      *
      * @param array $columns
      *
-     * @return this
+     * @return self
      */
-    public function columns(array $columns): Insert
+    public function columns(array $columns): self
     {
     }
 

src/Phalcon/DataMapper/Query/Update.php

@@ -31,12 +31,12 @@ public function __construct(\Phalcon\DataMapper\Pdo\Connection $connection, Bind
      * Sets a column for the `UPDATE` query
      *
      * @param string $column
-     *
-     * @return this
      * @param mixed $value
      * @param int $type
+     *
+     * @return self
      */
-    public function column(string $column, $value = null, int $type = -1): Update
+    public function column(string $column, $value = null, int $type = -1): self
     {
     }
 
@@ -45,9 +45,9 @@ public function column(string $column, $value = null, int $type = -1): Update
      *
      * @param array $columns
      *
-     * @return this
+     * @return self
      */
-    public function columns(array $columns): Update
+    public function columns(array $columns): self
     {
     }
 

src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php

@@ -47,17 +47,7 @@ abstract class AbstractPdo extends AbstractAdapter
     /**
      * Constructor for Phalcon\Db\Adapter\Pdo
      *
-     * @param array|\Phalcon\Config $descriptor = [
-     *     'host' => 'localhost',
-     *     'port' => '3306',
-     *     'dbname' => 'blog',
-     *     'username' => 'sigma'
-     *     'password' => 'secret'
-     *     'dialectClass' => null,
-     *     'options' => [],
-     *     'dsn' => null,
-     *     'charset' => 'utf8mb4'
-     * ]
+     * @param array $descriptor
      */
     public function __construct(array $descriptor)
     {

src/Phalcon/Db/Result/Pdo.php

@@ -88,7 +88,8 @@ public function __construct(\Phalcon\Db\Adapter\AdapterInterface $connection, \P
      * $row = $result->fetch();
      * ```
      *
-     * @param long $number
+     * @param int $number
+     *
      * @return void
      */
     public function dataSeek(int $number)

src/Phalcon/Db/ResultInterface.php

@@ -19,7 +19,7 @@ interface ResultInterface
      * Moves internal resultset cursor to another position letting us to fetch a
      * certain row
      *
-     * @param long $number
+     * @param int $number
      */
     public function dataSeek(int $number);
 

src/Phalcon/Dispatcher/AbstractDispatcher.php

@@ -131,9 +131,7 @@ public function callActionMethod($handler, string $actionMethod, array $params =
      * Process the results of the router by calling into the appropriate
      * controller action(s) including any routing data or injected parameters.
      *
-     * @return object|false Returns the dispatched handler class (the Controller for Mvc dispatching or a Task
-     *                      for CLI dispatching) or <tt>false</tt> if an exception occurred and the operation was
-     *                      stopped by returning <tt>false</tt> in the exception handler.
+     * @return bool
      *
      * @throws \Exception if any uncaught or unhandled exception occurs during the dispatcher process.
      */

src/Phalcon/Dispatcher/DispatcherInterface.php

@@ -18,7 +18,7 @@ interface DispatcherInterface
     /**
      * Dispatches a handle action taking into account the routing parameters
      *
-     * @return object|false
+     * @return bool
      */
     public function dispatch(): bool;
 

src/Phalcon/Helper/Json.php

@@ -67,9 +67,10 @@ final public static function decode(string $data, bool $associative = false, int
      * @param int    $options     Bitmask of JSON decode options.
      * @param int    $depth       Recursion depth.
      *
-     * @return mixed
+     * @return string
      *
      * @throws \InvalidArgumentException if the JSON cannot be encoded.
+     *
      * @link http://www.php.net/manual/en/function.json-encode.php
      */
     final public static function encode($data, int $options = 0, int $depth = 512): string

src/Phalcon/Html/Helper/AbstractHelper.php

@@ -46,7 +46,7 @@ abstract class AbstractHelper
     /**
      * AbstractHelper constructor.
      *
-     * @param Escaper $escaper
+     * @param EscaperInterface $escaper
      */
     public function __construct(\Phalcon\Escaper\EscaperInterface $escaper)
     {

src/Phalcon/Http/Message/Uri.php

@@ -424,7 +424,7 @@ private function filterPath(string $path): string
      *
      * @param int|null $port
      *
-     * @return int|null
+     * @return int
      */
     private function filterPort($port): int
     {

src/Phalcon/Mvc/Model/Binder.php

@@ -82,7 +82,8 @@ public function bindToHandler($handler, array $params, string $cacheKey, string
     /**
      * Find the model by param value.
      *
-     * @return object|false
+     * @return bool
+     *
      * @param mixed $paramValue
      * @param string $className
      */

src/Phalcon/Text.php

@@ -207,7 +207,8 @@ public static function startsWith(string $text, string $start, bool $ignoreCase
      * ```
      *
      * @param int $type
-     * @param long $length
+     * @param int $length
+     *
      * @return string
      */
     public static function random(int $type = 0, int $length = 8): string