Merge branch '2.18.x' into 3.0.x

* 2.18.x:
  Psalm 5.22.2 (#11326)

Author: derrabus

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",