Fix Psalm issues (#34)

JBZoo · Aug 23, 2023 · 38965ba · 38965ba
1 parent 3290a11
commit 38965ba
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 41 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Converters/JUnitConverter.php b/src/Converters/JUnitConverter.php
@@ -122,11 +122,12 @@ private function createSourceNodes(array $xmlAsArray, SourceSuite $currentSuite)
             $case->classname  = $attrs->getStringNull('classname');
             $case->assertions = $attrs->getIntNull('assertions');
 
+            /** @var array $output */
             foreach ($xmlAsArray['_children'] as $output) {
                 $typeOfOutput = $output['_node'];
                 $type         = $output['_attrs']['type'] ?? null;
                 $message      = $output['_attrs']['message'] ?? null;
-                $details      = ($output['_cdata'] ?? null) ?? $output['_text'] ?? null;
+                $details      = $output['_cdata'] ?? $output['_text'] ?? null;
 
                 $caseOutput = new SourceCaseOutput($type, $message, $details);
 

diff --git a/src/Converters/PhpUnitCloverStatsTcConverter.php b/src/Converters/PhpUnitCloverStatsTcConverter.php
@@ -33,14 +33,18 @@ final class PhpUnitCloverStatsTcConverter extends AbstractStatsTcConverter
     public function toInternalMetric(string $sourceCode): Metrics
     {
         $cloverXml = new \SimpleXMLElement($sourceCode);
-        $info      = data((array)$cloverXml->project->metrics)->getSelf('@attributes');
+        $info      = data((array)$cloverXml->project?->metrics)->getSelf('@attributes');
 
         $coveredClasses = 0;
 
         $nodeClasses = $cloverXml->xpath('//class');
         // @phpstan-ignore-next-line
         if (\is_iterable($nodeClasses)) {
             foreach ($nodeClasses as $class) {
+                if ($class->metrics === null) {
+                    continue;
+                }
+
                 if ((int)$class->metrics['coveredmethods'] === (int)$class->metrics['methods']) {
                     $coveredClasses++;
                 }