Merge branch '3.6.x' into 4.0.x

* 3.6.x:
  Add support for doctrine/orm 3 (#415)
  Upgrade to Psalm 5 (#416)

composer.json

@@ -23,7 +23,7 @@
         "php": "^8.1",
         "doctrine/data-fixtures": "^1.3",
         "doctrine/doctrine-bundle": "^2.2",
-        "doctrine/orm": "^2.14.0",
+        "doctrine/orm": "^2.14.0 || ^3.0",
         "doctrine/persistence": "^2.4|^3.0",
         "symfony/config": "^5.4|^6.0|^7.0",
         "symfony/console": "^5.4|^6.0|^7.0",
@@ -37,7 +37,7 @@
         "phpstan/phpstan": "^1.10.39",
         "phpunit/phpunit": "^9.6.13",
         "symfony/phpunit-bridge": "^6.3.6",
-        "vimeo/psalm": "^4.30"
+        "vimeo/psalm": "^5.15"
     },
     "conflict": {
         "doctrine/dbal": "< 3"

psalm.xml

@@ -5,8 +5,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
     phpVersion="8.2"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="Command" />