composer update

vendor/sebastian/lines-of-code/src/Counter.php

@@ -13,10 +13,8 @@ use function assert;
 use function file_get_contents;
 use function substr_count;
 use PhpParser\Error;
-use PhpParser\Lexer;
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
-use PhpParser\Parser;
 use PhpParser\ParserFactory;
 
 final class Counter
@@ -40,8 +38,10 @@ final class Counter
             $linesOfCode = 1;
         }
 
+        assert($linesOfCode >= 0);
+
         try {
-            $nodes = $this->parser()->parse($source);
+            $nodes = (new ParserFactory)->createForHostVersion()->parse($source);
 
             assert($nodes !== null);
 
@@ -52,13 +52,15 @@ final class Counter
             throw new RuntimeException(
                 $error->getMessage(),
                 $error->getCode(),
-                $error
+                $error,
             );
         }
         // @codeCoverageIgnoreEnd
     }
 
     /**
+     * @psalm-param non-negative-int $linesOfCode
+     *
      * @param Node[] $nodes
      *
      * @throws RuntimeException
@@ -78,16 +80,11 @@ final class Counter
             throw new RuntimeException(
                 $error->getMessage(),
                 $error->getCode(),
-                $error
+                $error,
             );
         }
         // @codeCoverageIgnoreEnd
 
         return $visitor->result();
     }
-
-    private function parser(): Parser
-    {
-        return (new ParserFactory)->create(ParserFactory::PREFER_PHP7, new Lexer);
-    }
 }

vendor/sebastian/lines-of-code/src/LineCountingVisitor.php

@@ -11,6 +11,7 @@ namespace SebastianBergmann\LinesOfCode;
 
 use function array_merge;
 use function array_unique;
+use function assert;
 use function count;
 use PhpParser\Comment;
 use PhpParser\Node;
@@ -19,7 +20,10 @@ use PhpParser\NodeVisitorAbstract;
 
 final class LineCountingVisitor extends NodeVisitorAbstract
 {
-    private int $linesOfCode;
+    /**
+     * @psalm-var non-negative-int
+     */
+    private readonly int $linesOfCode;
 
     /**
      * @var Comment[]
@@ -31,6 +35,9 @@ final class LineCountingVisitor extends NodeVisitorAbstract
      */
     private array $linesWithStatements = [];
 
+    /**
+     * @psalm-param non-negative-int $linesOfCode
+     */
     public function __construct(int $linesOfCode)
     {
         $this->linesOfCode = $linesOfCode;
@@ -55,11 +62,18 @@ final class LineCountingVisitor extends NodeVisitorAbstract
             $commentLinesOfCode += ($comment->getEndLine() - $comment->getStartLine() + 1);
         }
 
+        $nonCommentLinesOfCode = $this->linesOfCode - $commentLinesOfCode;
+        $logicalLinesOfCode    = count(array_unique($this->linesWithStatements));
+
+        assert($commentLinesOfCode >= 0);
+        assert($nonCommentLinesOfCode >= 0);
+        assert($logicalLinesOfCode >= 0);
+
         return new LinesOfCode(
             $this->linesOfCode,
             $commentLinesOfCode,
-            $this->linesOfCode - $commentLinesOfCode,
-            count(array_unique($this->linesWithStatements))
+            $nonCommentLinesOfCode,
+            $logicalLinesOfCode,
         );
     }
 

vendor/sebastian/lines-of-code/src/LinesOfCode.php

@@ -14,29 +14,53 @@ namespace SebastianBergmann\LinesOfCode;
  */
 final class LinesOfCode
 {
-    private int $linesOfCode;
-    private int $commentLinesOfCode;
-    private int $nonCommentLinesOfCode;
-    private int $logicalLinesOfCode;
+    /**
+     * @psalm-var non-negative-int
+     */
+    private readonly int $linesOfCode;
 
     /**
+     * @psalm-var non-negative-int
+     */
+    private readonly int $commentLinesOfCode;
+
+    /**
+     * @psalm-var non-negative-int
+     */
+    private readonly int $nonCommentLinesOfCode;
+
+    /**
+     * @psalm-var non-negative-int
+     */
+    private readonly int $logicalLinesOfCode;
+
+    /**
+     * @psalm-param non-negative-int $linesOfCode
+     * @psalm-param non-negative-int $commentLinesOfCode
+     * @psalm-param non-negative-int $nonCommentLinesOfCode
+     * @psalm-param non-negative-int $logicalLinesOfCode
+     *
      * @throws IllogicalValuesException
      * @throws NegativeValueException
      */
     public function __construct(int $linesOfCode, int $commentLinesOfCode, int $nonCommentLinesOfCode, int $logicalLinesOfCode)
     {
+        /** @psalm-suppress DocblockTypeContradiction */
         if ($linesOfCode < 0) {
             throw new NegativeValueException('$linesOfCode must not be negative');
         }
 
+        /** @psalm-suppress DocblockTypeContradiction */
         if ($commentLinesOfCode < 0) {
             throw new NegativeValueException('$commentLinesOfCode must not be negative');
         }
 
+        /** @psalm-suppress DocblockTypeContradiction */
         if ($nonCommentLinesOfCode < 0) {
             throw new NegativeValueException('$nonCommentLinesOfCode must not be negative');
         }
 
+        /** @psalm-suppress DocblockTypeContradiction */
         if ($logicalLinesOfCode < 0) {
             throw new NegativeValueException('$logicalLinesOfCode must not be negative');
         }
@@ -51,21 +75,33 @@ final class LinesOfCode
         $this->logicalLinesOfCode    = $logicalLinesOfCode;
     }
 
+    /**
+     * @psalm-return non-negative-int
+     */
     public function linesOfCode(): int
     {
         return $this->linesOfCode;
     }
 
+    /**
+     * @psalm-return non-negative-int
+     */
     public function commentLinesOfCode(): int
     {
         return $this->commentLinesOfCode;
     }
 
+    /**
+     * @psalm-return non-negative-int
+     */
     public function nonCommentLinesOfCode(): int
     {
         return $this->nonCommentLinesOfCode;
     }
 
+    /**
+     * @psalm-return non-negative-int
+     */
     public function logicalLinesOfCode(): int
     {
         return $this->logicalLinesOfCode;