Merge branch '4.1.x' into 5.0.x

* 4.1.x:
  Fix iterable type errors
  Fix return type of iterateKeyValue() (#6402)
  Psalm 5.24.0 (#6401)
  PHPUnit 10.5.20 (#6400)
  PHPStan 1.11.1 (#6399)

composer.json

@@ -40,16 +40,16 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "1.10.67",
-        "phpstan/phpstan-phpunit": "1.3.16",
-        "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpunit": "10.5.9",
-        "psalm/plugin-phpunit": "0.18.4",
+        "phpstan/phpstan": "1.11.1",
+        "phpstan/phpstan-phpunit": "1.4.0",
+        "phpstan/phpstan-strict-rules": "^1.6",
+        "phpunit/phpunit": "10.5.20",
+        "psalm/plugin-phpunit": "0.19.0",
         "slevomat/coding-standard": "8.13.1",
         "squizlabs/php_codesniffer": "3.9.2",
         "symfony/cache": "^6.3.8|^7.0",
         "symfony/console": "^5.4|^6.3|^7.0",
-        "vimeo/psalm": "5.21.1"
+        "vimeo/psalm": "5.24.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

phpstan.neon.dist

@@ -1,15 +1,15 @@
 parameters:
     level: 8
-    phpVersion: 80200
+    phpVersion: 80300
     paths:
         - src
         - static-analysis
         - tests
     treatPhpDocTypesAsCertain: false
     reportUnmatchedIgnoredErrors: false
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
+        - identifier: missingType.generics
+
         # https://github.com/phpstan/phpstan-strict-rules/issues/103
         -
             message: '~^Construct empty\(\) is not allowed. Use more strict comparison\.~'

src/Portability/Converter.php

@@ -244,7 +244,7 @@ private function createConvertAll(?Closure $function): Closure
      *
      * @param Closure $function The function that maps each value of the array
      *
-     * @return Closure(array):array
+     * @return Closure(array<mixed>):array<mixed>
      */
     private function createMapper(Closure $function): Closure
     {

src/Result.php

@@ -178,7 +178,7 @@ public function iterateAssociative(): Traversable
     }
 
     /**
-     * @return Traversable<mixed,mixed>
+     * @return Traversable<mixed, mixed>
      *
      * @throws Exception
      */

tests/Functional/Types/JsonTest.php

@@ -59,7 +59,7 @@ public function testInsertAndSelect(): void
         self::assertSame($value2, $res2);
     }
 
-    /** @param array<scalar|array> $value */
+    /** @param array<mixed> $value */
     private function insert(int $id, array $value): void
     {
         $result = $this->connection->insert('json_test_table', [
@@ -73,7 +73,7 @@ private function insert(int $id, array $value): void
         self::assertSame(1, $result);
     }
 
-    /** @return array<scalar|array> */
+    /** @return array<mixed> */
     private function select(int $id): array
     {
         $value = $this->connection->fetchOne(