psalm fixes

Author: aaronm67

src/FakePdoStatementTrait.php

@@ -129,7 +129,7 @@ public function universalExecute(?array $params = null)
         if ($this->realStatement) {
             if ($this->realStatement->execute($params) === false) {
                 var_dump($this->sql);
-                throw new \UnexpectedValueException($this->realStatement->errorInfo()[2]);
+                throw new \UnexpectedValueException((string)$this->realStatement->errorInfo()[2]);
             }
         }
 
@@ -632,6 +632,9 @@ private function getExecutedSql(?array $params) : string
         return $sql;
     }
 
+    /**
+     * @return array{0: null|string, 1: int|null, 2: null|string, 3?: mixed, 4?: mixed}
+     */
     public function errorInfo(): array
     {
         return ['00000', 0, 'PHP MySQL Engine: errorInfo() not supported.'];

src/FakePdoTrait.php

@@ -213,6 +213,9 @@ public function quote($string, $parameter_type = \PDO::PARAM_STR)
         return "{$quotes[0]}{$quoted}{$quotes[1]}";
     }
 
+    /**
+     * @return array{0: null|string, 1: int|null, 2: null|string, 3?: mixed, 4?: mixed}
+     */
     public function errorInfo(): array
     {
         return ['00000', 0, 'PHP MySQL Engine: errorInfo() not supported.'];

tests/EndToEndTest.php

@@ -547,15 +547,16 @@ public function testInetAtoN()
         $pdo = self::getPdo('mysql:foo');
         $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
 
-        $query = $pdo->prepare("SELECT INET_ATON('255.255.255.255') AS a, INET_ATON('192.168.1.1') AS b, INET_ATON('127.0.0.1') AS c, INET_ATON('not an ip') AS d");
+        $query = $pdo->prepare("SELECT INET_ATON('255.255.255.255') AS a, INET_ATON('192.168.1.1') AS b, INET_ATON('127.0.0.1') AS c, INET_ATON('not an ip') AS d, INET_ATON(NULL) as e");
         $query->execute();
         $this->assertSame(
             [
                 [
                     'a' => 4294967295,
                     'b' => 3232235777,
                     'c' => 2130706433,
-                    'd' => NULL
+                    'd' => NULL,
+                    'e' => NULL,
                 ],
             ],
             $query->fetchAll(\PDO::FETCH_ASSOC)
@@ -568,7 +569,7 @@ public function testInetNtoA()
         $pdo = self::getPdo('mysql:foo');
         $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
 
-        $query = $pdo->prepare("SELECT INET_NTOA(4294967295) AS a, INET_NTOA(3232235777) AS b, INET_NTOA(2130706433) AS c, INET_NTOA(NULL) as d");
+        $query = $pdo->prepare("SELECT INET_NTOA(4294967295) AS a, INET_NTOA(3232235777) AS b, INET_NTOA(2130706433) AS c, INET_NTOA(NULL) as d, INET_NTOA('not a number') as e");
         $query->execute();
 
         $this->assertSame(
@@ -578,6 +579,7 @@ public function testInetNtoA()
                     'b' => '192.168.1.1',
                     'c' => '127.0.0.1',
                     'd' => NULL,
+                    'e' => NULL,
                 ],
             ],
             $query->fetchAll(\PDO::FETCH_ASSOC)