Help Psalm understand our code

sebastianbergmann · Feb 5, 2023 · a8d7081 · a8d7081
1 parent 140897d
commit a8d7081
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -356,10 +356,6 @@
       <code>assert($metadata instanceof Covers)</code>
       <code>assert($metadata instanceof Uses)</code>
     </RedundantCondition>
-    <UndefinedMethod>
-      <code>className</code>
-      <code>className</code>
-    </UndefinedMethod>
   </file>
   <file src="src/Metadata/Api/DataProvider.php">
     <PossiblyInvalidArgument>

diff --git a/src/Metadata/Api/CodeCoverage.php b/src/Metadata/Api/CodeCoverage.php
@@ -18,10 +18,12 @@
 use PHPUnit\Framework\InvalidCoversTargetException;
 use PHPUnit\Metadata\Covers;
 use PHPUnit\Metadata\CoversClass;
+use PHPUnit\Metadata\CoversDefaultClass;
 use PHPUnit\Metadata\CoversFunction;
 use PHPUnit\Metadata\Parser\Registry;
 use PHPUnit\Metadata\Uses;
 use PHPUnit\Metadata\UsesClass;
+use PHPUnit\Metadata\UsesDefaultClass;
 use PHPUnit\Metadata\UsesFunction;
 use SebastianBergmann\CodeUnit\CodeUnitCollection;
 use SebastianBergmann\CodeUnit\InvalidCodeUnitException;
@@ -56,7 +58,11 @@ public function linesToBeCovered(string $className, string $methodName): array|f
                 );
             }
 
-            $classShortcut = $metadataForClass->isCoversDefaultClass()->asArray()[0]->className();
+            $metadata = $metadataForClass->isCoversDefaultClass()->asArray()[0];
+
+            assert($metadata instanceof CoversDefaultClass);
+
+            $classShortcut = $metadata->className();
         }
 
         $codeUnits = CodeUnitCollection::fromList();
@@ -143,7 +149,11 @@ public function linesToBeUsed(string $className, string $methodName): array
                 );
             }
 
-            $classShortcut = $metadataForClass->isUsesDefaultClass()->asArray()[0]->className();
+            $metadata = $metadataForClass->isUsesDefaultClass()->asArray()[0];
+
+            assert($metadata instanceof UsesDefaultClass);
+
+            $classShortcut = $metadata->className();
         }
 
         $codeUnits = CodeUnitCollection::fromList();