Fix Psalm issues after upgrading to v6

facile-it · Feb 8, 2025 · 7ea4b42 · 7ea4b42
1 parent 06d108c
commit 7ea4b42
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,30 +1,22 @@
 <?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>
+<files psalm-version="6.5.0@38fc8444edf0cebc9205296ee6e30e906ade783b">
   <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('exclude-testsuite')]]></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>
+      <code><![CDATA[$input->getOption('testsuite')]]></code>
     </MixedArgument>
   </file>
   <file src="src/Coverage/CoverageFetcher.php">
     <MixedAssignment>
-      <code>$codeCoverage</code>
+      <code><![CDATA[$codeCoverage]]></code>
     </MixedAssignment>
   </file>
   <file src="src/File/Cleaner.php">
@@ -33,27 +25,22 @@
       <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">
     <PossiblyNullOperand>
       <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/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;