From 06d108c50d0ea5ede082423a81033a073059030d Mon Sep 17 00:00:00 2001
From: Alessandro Lai <alessandro.lai85@gmail.com>
Date: Sat, 8 Feb 2025 06:55:55 +0100
Subject: [PATCH 1/2] Allow Psalm 6

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 25300006..0af8d9a3 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
         "rector/rector": "2.0.7",
         "symfony/expression-language": "^4.4||^5.0||^6.0||^7.0",
         "symfony/phpunit-bridge": "^6.4||^7.0",
-        "vimeo/psalm": "^5.5.0"
+        "vimeo/psalm": "^5.5.0||^6.0"
     },
     "conflict": {
         "composer/package-versions-deprecated": "<1.11.99"

From 10e9f616059ec76035e8c346e2a284c85e634dd5 Mon Sep 17 00:00:00 2001
From: Alessandro Lai <alessandro.lai85@gmail.com>
Date: Sat, 8 Feb 2025 07:01:09 +0100
Subject: [PATCH 2/2] Fix Psalm issues after upgrading to v6

---
 psalm-baseline.xml               | 41 ++++++--------------------------
 psalm.xml                        |  8 -------
 src/Logs/ValueObject/LogData.php |  2 +-
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 820daf81..a6d644f4 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.7.7@e028ba46ba0d7f9a78bc3201c251e137383e145f">
-  <file src="src/Configuration/PHPUnitConfig.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[$extension->attributes]]></code>
-    </DocblockTypeContradiction>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[$extension->attributes?->getNamedItem('class')]]></code>
-    </RedundantConditionGivenDocblockType>
-  </file>
-  <file src="src/Configuration/ParallelConfiguration.php">
-    <MixedArgument>
-      <code><![CDATA[$input->getArgument('stringFilter')]]></code>
-      <code><![CDATA[$input->getOption('chunk-size')]]></code>
-      <code><![CDATA[$input->getOption('configuration') ?? '.']]></code>
-      <code><![CDATA[$input->getOption('logo')]]></code>
-      <code><![CDATA[$input->getOption('parallel')]]></code>
-      <code><![CDATA[$input->getOption('pass-through')]]></code>
-      <code><![CDATA[$input->getOption('testsuite')]]></code>
-      <code><![CDATA[$input->getOption('exclude-testsuite')]]></code>
-      <code><![CDATA[$input->getOption('sort')]]></code>
-      <code><![CDATA[$input->getOption('test-suffix')]]></code>
-    </MixedArgument>
-  </file>
+<files psalm-version="6.5.0@38fc8444edf0cebc9205296ee6e30e906ade783b">
   <file src="src/Coverage/CoverageFetcher.php">
     <MixedAssignment>
-      <code>$codeCoverage</code>
+      <code><![CDATA[$codeCoverage]]></code>
     </MixedAssignment>
   </file>
   <file src="src/File/Cleaner.php">
@@ -33,12 +11,12 @@
       <code><![CDATA[$file->getRealPath()]]></code>
     </MixedArgument>
     <MixedAssignment>
-      <code>$file</code>
+      <code><![CDATA[$file]]></code>
     </MixedAssignment>
     <MixedMethodCall>
-      <code>getRealPath</code>
-      <code>getRealPath</code>
-      <code>isDir</code>
+      <code><![CDATA[getRealPath]]></code>
+      <code><![CDATA[getRealPath]]></code>
+      <code><![CDATA[isDir]]></code>
     </MixedMethodCall>
   </file>
   <file src="src/Filter/Filter.php">
@@ -46,14 +24,9 @@
       <code><![CDATA[$fileNode->nodeValue]]></code>
     </PossiblyNullOperand>
   </file>
-  <file src="src/Process/CommandLine.php">
-    <PossiblyNullOperand>
-      <code><![CDATA[$option->getValue()]]></code>
-    </PossiblyNullOperand>
-  </file>
   <file src="src/Process/SymfonyProcessWrapper.php">
     <MixedArgumentTypeCoercion>
-      <code>$env</code>
+      <code><![CDATA[$env]]></code>
     </MixedArgumentTypeCoercion>
   </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
index ccc67567..0c410f26 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -19,12 +19,4 @@
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
     </plugins>
-    
-    <issueHandlers>
-        <InternalMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Event\Facade::registerSubscriber" />
-            </errorLevel>
-        </InternalMethod>
-    </issueHandlers>
 </psalm>
diff --git a/src/Logs/ValueObject/LogData.php b/src/Logs/ValueObject/LogData.php
index f791cd73..9ff47af9 100644
--- a/src/Logs/ValueObject/LogData.php
+++ b/src/Logs/ValueObject/LogData.php
@@ -59,7 +59,7 @@ private function convertToUtf8(string $string): string
     {
         /** @psalm-suppress RiskyTruthyFalsyComparison */
         if (! \mb_detect_encoding($string, 'UTF-8', true)) {
-            return \mb_convert_encoding($string, 'UTF-8');
+            return \mb_convert_encoding($string, 'UTF-8') ?: '';
         }
 
         return $string;