From 47b808ca9b555df4bacbed46c0c9524aed60b3a0 Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Fri, 23 Oct 2020 18:19:20 +0200
Subject: [PATCH] Psalm improvements

---
 examples/bot.php                             |  2 +-
 src/danog/MadelineProto/Db/MemoryArray.php   | 20 ++++++++++----------
 src/danog/MadelineProto/Db/MysqlArray.php    |  6 ++++++
 src/danog/MadelineProto/Db/PostgresArray.php | 10 ++++++++--
 src/danog/MadelineProto/Db/SqlArray.php      |  2 +-
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/examples/bot.php b/examples/bot.php
index f265113a..4e867941 100755
--- a/examples/bot.php
+++ b/examples/bot.php
@@ -23,9 +23,9 @@ use danog\MadelineProto\API;
 use danog\MadelineProto\EventHandler;
 use danog\MadelineProto\Logger;
 use danog\MadelineProto\Settings;
-use danog\MadelineProto\Settings\Database\Redis;
 use danog\MadelineProto\Settings\Database\Mysql;
 use danog\MadelineProto\Settings\Database\Postgres;
+use danog\MadelineProto\Settings\Database\Redis;
 
 /*
  * Various ways to load MadelineProto
diff --git a/src/danog/MadelineProto/Db/MemoryArray.php b/src/danog/MadelineProto/Db/MemoryArray.php
index 4d2905e4..2c6fde7e 100644
--- a/src/danog/MadelineProto/Db/MemoryArray.php
+++ b/src/danog/MadelineProto/Db/MemoryArray.php
@@ -24,24 +24,24 @@ class MemoryArray extends \ArrayIterator implements DbArray
      * Get instance.
      *
      * @param string $table
-     * @param mixed  $value
+     * @param mixed  $previous
      * @param Memory $settings
      * @return Promise<self>
      */
-    public static function getInstance(string $table, $value, $settings): Promise
+    public static function getInstance(string $table, $previous, $settings): Promise
     {
-        return call(static function () use ($value) {
-            if ($value instanceof MemoryArray) {
-                return $value;
+        return call(static function () use ($previous) {
+            if ($previous instanceof MemoryArray) {
+                return $previous;
             }
-            if ($value instanceof DbArray) {
+            if ($previous instanceof DbArray) {
                 Logger::log("Loading database to memory. Please wait.", Logger::WARNING);
-                if ($value instanceof DriverArray) {
-                    yield from $value->initStartup();
+                if ($previous instanceof DriverArray) {
+                    yield from $previous->initStartup();
                 }
-                $value = yield $value->getArrayCopy();
+                $previous = yield $previous->getArrayCopy();
             }
-            return new static($value);
+            return new static($previous);
         });
     }
 
diff --git a/src/danog/MadelineProto/Db/MysqlArray.php b/src/danog/MadelineProto/Db/MysqlArray.php
index e0bbe15b..319b946c 100644
--- a/src/danog/MadelineProto/Db/MysqlArray.php
+++ b/src/danog/MadelineProto/Db/MysqlArray.php
@@ -58,6 +58,12 @@ class MysqlArray extends SqlArray
     }
 
 
+    /**
+     * Get value from row.
+     *
+     * @param array $row
+     * @return null|mixed
+     */
     protected function getValue(array $row)
     {
         if ($row) {
diff --git a/src/danog/MadelineProto/Db/PostgresArray.php b/src/danog/MadelineProto/Db/PostgresArray.php
index da849471..ec54761b 100644
--- a/src/danog/MadelineProto/Db/PostgresArray.php
+++ b/src/danog/MadelineProto/Db/PostgresArray.php
@@ -72,6 +72,12 @@ class PostgresArray extends SqlArray
         }
     }
 
+    /**
+     * Get value from row.
+     *
+     * @param array $row
+     * @return null|mixed
+     */
     protected function getValue(array $row)
     {
         if ($row) {
@@ -82,7 +88,7 @@ class PostgresArray extends SqlArray
                 return $row['value'];
             }
             if ($row['value'][0] === '\\') {
-                $row['value'] = hex2bin(substr($row['value'], 2));
+                $row['value'] = \hex2bin(\substr($row['value'], 2));
             }
             return \unserialize($row['value']);
         }
@@ -158,7 +164,7 @@ class PostgresArray extends SqlArray
     protected function renameTable(string $from, string $to): \Generator
     {
         Logger::log("Renaming table {$from} to {$to}", Logger::WARNING);
-        
+
         yield $this->db->query("
             DROP TABLE IF EXISTS \"{$to}\";
         ");
diff --git a/src/danog/MadelineProto/Db/SqlArray.php b/src/danog/MadelineProto/Db/SqlArray.php
index 9d5fdd90..5eed7b30 100644
--- a/src/danog/MadelineProto/Db/SqlArray.php
+++ b/src/danog/MadelineProto/Db/SqlArray.php
@@ -34,7 +34,7 @@ abstract class SqlArray extends DriverArray
      * Get value from row.
      *
      * @param array $row
-     * @return void
+     * @return null|mixed
      */
     abstract protected function getValue(array $row);