Narrow types

src/Complexity/Complexity.php

@@ -14,20 +14,37 @@
  */
 final class Complexity
 {
-    private string $name;
+    /**
+     * @psalm-var non-empty-string
+     */
+    private readonly string $name;
+
+    /**
+     * @psalm-var positive-int
+     */
     private int $cyclomaticComplexity;
 
+    /**
+     * @psalm-param non-empty-string $name
+     * @psalm-param positive-int $cyclomaticComplexity
+     */
     public function __construct(string $name, int $cyclomaticComplexity)
     {
         $this->name                 = $name;
         $this->cyclomaticComplexity = $cyclomaticComplexity;
     }
 
+    /**
+     * @psalm-return non-empty-string
+     */
     public function name(): string
     {
         return $this->name;
     }
 
+    /**
+     * @psalm-return positive-int
+     */
     public function cyclomaticComplexity(): int
     {
         return $this->cyclomaticComplexity;

src/Complexity/ComplexityCollection.php

@@ -21,7 +21,7 @@ final class ComplexityCollection implements Countable, IteratorAggregate
     /**
      * @psalm-var list<Complexity>
      */
-    private array $items;
+    private readonly array $items;
 
     public static function fromList(Complexity ...$items): self
     {
@@ -49,6 +49,9 @@ public function getIterator(): ComplexityCollectionIterator
         return new ComplexityCollectionIterator($this);
     }
 
+    /**
+     * @psalm-return non-negative-int
+     */
     public function count(): int
     {
         return count($this->items);
@@ -59,6 +62,9 @@ public function isEmpty(): bool
         return empty($this->items);
     }
 
+    /**
+     * @psalm-return non-negative-int
+     */
     public function cyclomaticComplexity(): int
     {
         $cyclomaticComplexity = 0;

src/Complexity/ComplexityCollectionIterator.php

@@ -16,7 +16,7 @@ final class ComplexityCollectionIterator implements Iterator
     /**
      * @psalm-var list<Complexity>
      */
-    private array $items;
+    private readonly array $items;
     private int $position = 0;
 
     public function __construct(ComplexityCollection $items)

src/Visitor/ComplexityCalculatingVisitor.php

@@ -74,6 +74,8 @@ public function result(): ComplexityCollection
 
     /**
      * @param Stmt[] $statements
+     *
+     * @psalm-return positive-int
      */
     private function cyclomaticComplexity(array $statements): int
     {
@@ -89,6 +91,9 @@ private function cyclomaticComplexity(array $statements): int
         return $cyclomaticComplexityCalculatingVisitor->cyclomaticComplexity();
     }
 
+    /**
+     * @psalm-return non-empty-string
+     */
     private function classMethodName(ClassMethod $node): string
     {
         $parent = $node->getAttribute('parent');
@@ -100,11 +105,18 @@ private function classMethodName(ClassMethod $node): string
         return $parent->namespacedName->toString() . '::' . $node->name->toString();
     }
 
+    /**
+     * @psalm-return non-empty-string
+     */
     private function functionName(Function_ $node): string
     {
         assert(isset($node->namespacedName));
         assert($node->namespacedName instanceof Name);
 
-        return $node->namespacedName->toString();
+        $functionName = $node->namespacedName->toString();
+
+        assert($functionName !== '');
+
+        return $functionName;
     }
 }

src/Visitor/CyclomaticComplexityCalculatingVisitor.php

@@ -26,6 +26,9 @@
 
 final class CyclomaticComplexityCalculatingVisitor extends NodeVisitorAbstract
 {
+    /**
+     * @psalm-var positive-int
+     */
     private int $cyclomaticComplexity = 1;
 
     public function enterNode(Node $node): void
@@ -47,6 +50,9 @@ public function enterNode(Node $node): void
         }
     }
 
+    /**
+     * @psalm-return positive-int
+     */
     public function cyclomaticComplexity(): int
     {
         return $this->cyclomaticComplexity;