Merge pull request #529 from greg0ire/2.0.x

Merge 1.8.x up into 2.0.x

Author: greg0ire

composer.json

@@ -30,7 +30,7 @@
         "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
         "doctrine/orm": "^2.14 || ^3",
         "fig/log-test": "^1",
-        "phpstan/phpstan": "1.12.21",
+        "phpstan/phpstan": "2.1.8",
         "phpunit/phpunit": "10.5.45",
         "symfony/cache": "^6.4 || ^7",
         "symfony/var-exporter": "^6.4 || ^7"