Extract method

Author: sebastianbergmann

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.0@fe2c67ec89f358940f90db05efd2d663388b45a6">
+<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
   <file src="src/Event/Dispatcher/DirectDispatcher.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[notify]]></code>
@@ -610,8 +610,10 @@
   </file>
   <file src="src/Metadata/Api/CodeCoverage.php">
     <RedundantCondition>
-      <code><![CDATA[$metadata instanceof CoversFunction]]></code>
-      <code><![CDATA[$metadata instanceof UsesFunction]]></code>
+      <code><![CDATA[$metadata instanceof Covers]]></code>
+      <code><![CDATA[$metadata instanceof Uses]]></code>
+      <code><![CDATA[$metadata->isCovers()]]></code>
+      <code><![CDATA[$metadata->isUses()]]></code>
       <code><![CDATA[assert($metadata instanceof Covers)]]></code>
       <code><![CDATA[assert($metadata instanceof Uses)]]></code>
     </RedundantCondition>

src/Metadata/Api/CodeCoverage.php

@@ -33,6 +33,7 @@
 use PHPUnit\Metadata\UsesFunction;
 use RecursiveIteratorIterator;
 use SebastianBergmann\CodeUnit\CodeUnitCollection;
+use SebastianBergmann\CodeUnit\Exception as CodeUnitException;
 use SebastianBergmann\CodeUnit\InvalidCodeUnitException;
 use SebastianBergmann\CodeUnit\Mapper;
 
@@ -79,34 +80,14 @@ public function linesToBeCovered(string $className, string $methodName): array|f
         $mapper    = new Mapper;
 
         foreach (Registry::parser()->forClassAndMethod($className, $methodName) as $metadata) {
-            if ($metadata->isCoversClass() || $metadata->isCoversFunction()) {
-                assert($metadata instanceof CoversClass || $metadata instanceof CoversFunction);
+            if (!$metadata->isCoversClass() && !$metadata->isCoversFunction() && !$metadata->isCovers()) {
+                continue;
+            }
 
-                try {
-                    $codeUnits = $codeUnits->mergeWith(
-                        $mapper->stringToCodeUnits($metadata->asStringForCodeUnitMapper()),
-                    );
-                } catch (InvalidCodeUnitException $e) {
-                    if ($metadata->isCoversClass()) {
-                        if (interface_exists($metadata->className())) {
-                            $type = 'Interface';
-                        } else {
-                            $type = 'Class';
-                        }
-                    } else {
-                        $type = 'Function';
-                    }
+            assert($metadata instanceof CoversClass || $metadata instanceof CoversFunction || $metadata instanceof Covers);
 
-                    throw new InvalidCoversTargetException(
-                        sprintf(
-                            '%s "%s" is not a valid target for code coverage',
-                            $type,
-                            $metadata->asStringForCodeUnitMapper(),
-                        ),
-                        $e->getCode(),
-                        $e,
-                    );
-                }
+            if ($metadata->isCoversClass() || $metadata->isCoversFunction()) {
+                $codeUnits = $codeUnits->mergeWith($this->mapToCodeUnits($metadata));
             } elseif ($metadata->isCovers()) {
                 assert($metadata instanceof Covers);
 
@@ -177,34 +158,14 @@ public function linesToBeUsed(string $className, string $methodName): array
         $mapper    = new Mapper;
 
         foreach (Registry::parser()->forClassAndMethod($className, $methodName) as $metadata) {
-            if ($metadata->isUsesClass() || $metadata->isUsesFunction()) {
-                assert($metadata instanceof UsesClass || $metadata instanceof UsesFunction);
+            if (!$metadata->isUsesClass() && !$metadata->isUsesFunction() && !$metadata->isUses()) {
+                continue;
+            }
 
-                try {
-                    $codeUnits = $codeUnits->mergeWith(
-                        $mapper->stringToCodeUnits($metadata->asStringForCodeUnitMapper()),
-                    );
-                } catch (InvalidCodeUnitException $e) {
-                    if ($metadata->isUsesClass()) {
-                        if (interface_exists($metadata->className())) {
-                            $type = 'Interface';
-                        } else {
-                            $type = 'Class';
-                        }
-                    } else {
-                        $type = 'Function';
-                    }
+            assert($metadata instanceof UsesClass || $metadata instanceof UsesFunction || $metadata instanceof Uses);
 
-                    throw new InvalidCoversTargetException(
-                        sprintf(
-                            '%s "%s" is not a valid target for code coverage',
-                            $type,
-                            $metadata->asStringForCodeUnitMapper(),
-                        ),
-                        $e->getCode(),
-                        $e,
-                    );
-                }
+            if ($metadata->isUsesClass() || $metadata->isUsesFunction()) {
+                $codeUnits = $codeUnits->mergeWith($this->mapToCodeUnits($metadata));
             } elseif ($metadata->isUses()) {
                 assert($metadata instanceof Uses);
 
@@ -319,4 +280,37 @@ private function codeUnitsIgnoredBy(string $className): CodeUnitCollection
 
         return $codeUnits;
     }
+
+    /**
+     * @throws InvalidCoversTargetException
+     */
+    private function mapToCodeUnits(CoversClass|CoversFunction|UsesClass|UsesFunction $metadata): CodeUnitCollection
+    {
+        $mapper = new Mapper;
+
+        try {
+            return $mapper->stringToCodeUnits($metadata->asStringForCodeUnitMapper());
+        } catch (CodeUnitException $e) {
+            if ($metadata->isCoversClass() || $metadata->isUsesClass()) {
+                if (interface_exists($metadata->className())) {
+                    $type = 'Interface';
+                } else {
+                    $type = 'Class';
+                }
+            } else {
+                $type = 'Function';
+            }
+
+            throw new InvalidCoversTargetException(
+                sprintf(
+                    '%s "%s" is not a valid target for code coverage',
+                    $type,
+                    $metadata->asStringForCodeUnitMapper(),
+                ),
+                $e->getCode(),
+                $e,
+            );
+        }
+
+    }
 }