Merge pull request #6931 from kenjis/update-psalm-5.0

chore: update psalm to 5.0

Author: kenjis

composer.json

@@ -26,7 +26,7 @@
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
         "rector/rector": "0.14.8",
-        "vimeo/psalm": "^4.26"
+        "vimeo/psalm": "^5.0"
     },
     "suggest": {
         "ext-curl": "If you use CURLRequest class",

system/Cookie/Cookie.php

@@ -37,6 +37,8 @@
  * $cookie2 = $cookie->withName('prod_cookie');
  * $cookie2->getName(); // prod_cookie
  * ```
+ *
+ * @template-implements ArrayAccess<string, bool|int|string>
  */
 class Cookie implements ArrayAccess, CloneableCookieInterface
 {
@@ -564,7 +566,7 @@ public function withRaw(bool $raw = true)
     /**
      * Whether an offset exists.
      *
-     * @param mixed $offset
+     * @param string $offset
      */
     public function offsetExists($offset): bool
     {
@@ -574,9 +576,9 @@ public function offsetExists($offset): bool
     /**
      * Offset to retrieve.
      *
-     * @param mixed $offset
+     * @param string $offset
      *
-     * @return mixed
+     * @return bool|int|string
      *
      * @throws InvalidArgumentException
      */
@@ -593,8 +595,8 @@ public function offsetGet($offset)
     /**
      * Offset to set.
      *
-     * @param mixed $offset
-     * @param mixed $value
+     * @param string $offset
+     * @param mixed  $value
      *
      * @throws LogicException
      */
@@ -606,7 +608,7 @@ public function offsetSet($offset, $value): void
     /**
      * Offset to unset.
      *
-     * @param mixed $offset
+     * @param string $offset
      *
      * @throws LogicException
      */

system/Database/BaseConnection.php

@@ -1006,15 +1006,18 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
         // Added exception for single quotes as well, we don't want to alter
         // literal strings.
         if (strcspn($item, "()'") !== strlen($item)) {
+            /** @psalm-suppress NoValue I don't know why ERROR. */
             return $item;
         }
 
         // Do not protect identifiers and do not prefix, no swap prefix, there is nothing to do
         if ($protectIdentifiers === false && $prefixSingle === false && $this->swapPre === '') {
+            /** @psalm-suppress NoValue I don't know why ERROR. */
             return $item;
         }
 
         // Convert tabs or multiple spaces into single spaces
+        /** @psalm-suppress NoValue I don't know why ERROR. */
         $item = preg_replace('/\s+/', ' ', trim($item));
 
         // If the item has an alias declaration we remove it and set it aside.
@@ -1176,6 +1179,7 @@ public function escapeIdentifiers($item)
         }
 
         foreach ($this->reservedIdentifiers as $id) {
+            /** @psalm-suppress NoValue I don't know why ERROR. */
             if (strpos($item, '.' . $id) !== false) {
                 return preg_replace(
                     '/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?\./i',
@@ -1185,6 +1189,7 @@ public function escapeIdentifiers($item)
             }
         }
 
+        /** @psalm-suppress NoValue I don't know why ERROR. */
         return preg_replace(
             '/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?(\.)?/i',
             $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '$2',
@@ -1228,6 +1233,7 @@ public function escape($str)
             return array_map([&$this, 'escape'], $str);
         }
 
+        /** @psalm-suppress NoValue I don't know why ERROR. */
         if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
             if ($str instanceof RawSql) {
                 return $str->__toString();

system/Database/Postgre/Connection.php

@@ -188,6 +188,7 @@ public function escape($str)
             $this->initialize();
         }
 
+        /** @psalm-suppress NoValue I don't know why ERROR. */
         if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
             if ($str instanceof RawSql) {
                 return $str->__toString();
@@ -200,6 +201,7 @@ public function escape($str)
             return $str ? 'TRUE' : 'FALSE';
         }
 
+        /** @psalm-suppress NoValue I don't know why ERROR. */
         return parent::escape($str);
     }
 

system/Files/FileCollection.php

@@ -23,6 +23,8 @@
  *
  * Representation for a group of files, with utilities for locating,
  * filtering, and ordering them.
+ *
+ * @template-implements IteratorAggregate<int, File>
  */
 class FileCollection implements Countable, IteratorAggregate
 {

system/Test/Mock/MockConnection.php

@@ -16,6 +16,9 @@
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Database\Query;
 
+/**
+ * @extends BaseConnection<object|resource, object|resource>
+ */
 class MockConnection extends BaseConnection
 {
     protected $returnValues = [];

system/Test/Mock/MockResult.php

@@ -13,6 +13,9 @@
 
 use CodeIgniter\Database\BaseResult;
 
+/**
+ * @extends BaseResult<object|resource, object|resource>
+ */
 class MockResult extends BaseResult
 {
     /**