Merge branch '3.1.x' into 4.0.x

* 3.1.x: Psalm 5.22.2 (#11326)
doctrine · Mar 1, 2024 · f8b5ef0 · f8b5ef0
2 parents e80f03c + 53763d4
commit f8b5ef0
Show file tree

Hide file tree

Showing 3 changed files with 314 additions and 307 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.2",
         "symfony/cache": "^5.4 || ^6.2 || ^7.0",
-        "vimeo/psalm": "5.16.0"
+        "vimeo/psalm": "5.22.2"
     },
     "suggest": {
         "ext-dom": "Provides support for XSD validation for XML mapping files",