From f766be619664ef0c8691a0109b267154b0a86962 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 13 Nov 2023 11:40:03 +0100
Subject: [PATCH] Psalm 5

---
 DependencyInjection/Configuration.php |  8 ++++----
 composer.json                         |  4 +++-
 psalm-baseline.xml                    | 10 +++++-----
 psalm.xml                             |  7 ++++++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index c2fa1fd..2c69caa 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -164,15 +164,15 @@ private function getOrganizeMigrationsModes(): array
         $constPrefix = 'VERSIONS_ORGANIZATION_';
         $prefixLen   = strlen($constPrefix);
         $refClass    = new ReflectionClass('Doctrine\Migrations\Configuration\Configuration');
-        $constsArray = $refClass->getConstants();
+        $constsArray = array_keys($refClass->getConstants());
         $namesArray  = [];
 
-        foreach ($constsArray as $key => $value) {
-            if (strpos($key, $constPrefix) !== 0) {
+        foreach ($constsArray as $constant) {
+            if (strpos($constant, $constPrefix) !== 0) {
                 continue;
             }
 
-            $namesArray[] = substr($key, $prefixLen);
+            $namesArray[] = substr($constant, $prefixLen);
         }
 
         return $namesArray;
diff --git a/composer.json b/composer.json
index 030062f..3ddce90 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,9 @@
         "phpstan/phpstan-symfony": "^1.3",
         "doctrine/orm": "^2.6",
         "doctrine/persistence": "^2.0 || ^3 ",
-        "vimeo/psalm": "^4.22"
+        "psalm/plugin-phpunit": "^0.18.4",
+        "psalm/plugin-symfony": "^5",
+        "vimeo/psalm": "^5.15"
     },
     "autoload": {
         "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "" },
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index eaab553..e27cdae 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="DependencyInjection/Configuration.php">
-    <UndefinedMethod occurrences="1">
-      <code>root</code>
-    </UndefinedMethod>
+    <UndefinedInterfaceMethod>
+      <code>end</code>
+    </UndefinedInterfaceMethod>
   </file>
   <file src="DependencyInjection/DoctrineMigrationsExtension.php">
-    <MoreSpecificImplementedParamType occurrences="1">
+    <MoreSpecificImplementedParamType>
       <code>$configs</code>
     </MoreSpecificImplementedParamType>
   </file>
diff --git a/psalm.xml b/psalm.xml
index 743b180..56c71aa 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -2,7 +2,8 @@
 <psalm
     errorLevel="4"
     phpVersion="8.2"
-    resolveFromConfigFile="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
     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"
@@ -16,4 +17,8 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <plugins>
+        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+        <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin" />
+    </plugins>
 </psalm>