PHPStan type hints and fixes.

Author: Mistralys

src/Parser/ComponentDetector.php

@@ -65,7 +65,7 @@ private function parseBranchOnly() : void
             $matches
         );
 
-        if(empty($matches[0])) {
+        if(empty($matches[1])) {
             return;
         }
 
@@ -90,9 +90,9 @@ private function parseBranchPrepend() : bool
         }
 
         $matches = $this->nullifyEmpty($matches);
-        $tag = $matches[2] ?? $matches[5];
+        $tag = $matches[2] ?? $matches[5] ?? '';
         $number = $matches[3] ?? 0;
-        $branch = $this->detectOriginalBranch($matches[1] ?? $matches[4]);
+        $branch = $this->detectOriginalBranch($matches[1] ?? $matches[4] ?? '');
 
         $this->tag = new VersionTag(
             $this->version,
@@ -138,10 +138,10 @@ private function parseTagSolo(bool $anywhere=false) : bool
         }
 
         $matches = $this->nullifyEmpty($matches);
-        $tag = $matches[1] ?? $matches[3];
+        $tag = $matches[1] ?? $matches[3] ?? '';
         $number = $matches[2] ?? 0;
 
-        $branch = str_replace($matches[0], '-', $this->tagParts);
+        $branch = str_replace((string)$matches[0], '-', $this->tagParts);
 
         while(strpos($branch, '--') !== false) {
             $branch = str_replace('--', '-', $branch);
@@ -172,9 +172,9 @@ private function parseBranchAppend() : bool
         }
 
         $matches = $this->nullifyEmpty($matches);
-        $tag = $matches[1] ?? $matches[4];
+        $tag = $matches[1] ?? $matches[4] ?? '';
         $number = $matches[2] ?? 0;
-        $branch = $matches[3] ?? $matches[5];
+        $branch = $matches[3] ?? $matches[5] ?? '';
 
         $this->tag = new VersionTag(
             $this->version,
@@ -186,6 +186,10 @@ private function parseBranchAppend() : bool
         return true;
     }
 
+    /**
+     * @param array<int,string> $values
+     * @return array<int,string|null>
+     */
     private function nullifyEmpty(array $values) : array
     {
         foreach($values as $idx => $value) {

src/Parser/ShortTags.php

@@ -16,8 +16,14 @@ class ShortTags
         VersionParser::TAG_TYPE_DEV => VersionParser::TAG_TYPE_DEV_SHORT
     );
 
+    /**
+     * @var array<string,string>|null
+     */
     private static ?array $shortTags = null;
 
+    /**
+     * @return array<string,string>
+     */
     public static function getTagNames() : array
     {
         if(!isset(self::$shortTags)) {

src/Parser/TagWeights.php

@@ -26,6 +26,9 @@ class TagWeights
         VersionParser::TAG_TYPE_DEV_SHORT => 8
     );
 
+    /**
+     * @var array<string,int>|null
+     */
     private static ?array $tagWeights = null;
 
     /**

src/VersionParser.php

@@ -77,10 +77,6 @@ class VersionParser implements Stringable
     private string $separator = '-';
     private bool $lowercase = true;
 
-    private static ?array $tagWeights = null;
-
-    private static ?array $shortTags = null;
-
     private string $original;
 
     private string $tagParts = '';
@@ -263,7 +259,7 @@ public function getTag() : string
         return '';
     }
 
-    public function getTagInfo() : VersionTag
+    public function getTagInfo() : ?VersionTag
     {
         return $this->tag;
     }
@@ -418,6 +414,9 @@ private function parseTag() : void
         $this->tag = (new ComponentDetector($this, $this->tagParts))->detectTag();
     }
 
+    /**
+     * @return array{originalVersion:string,normalized:string,majorVersion:int,minorVersion:int,patchVersion:int,shortVersion:string,buildNumber:float,buildNumberInt:int,tag:array<string,mixed>|null}
+     */
     public function toArray() : array
     {
         $tag = null;

src/VersionTag.php

@@ -158,12 +158,15 @@ public function isTagType(string $type) : bool
         return $this->getTagType() === $type || $this->getTagName() === $type;
     }
 
+    /**
+     * @return array{tagName:string, tagType:string, number:int, branch:string, weight:int, normalized:string}
+     */
     public function toArray() : array
     {
         return array(
             'tagName' => $this->getTagName(),
             'tagType' => $this->getTagType(),
-            'number' => $this->getTagName(),
+            'number' => $this->getNumber(),
             'branch' => $this->getBranchName(),
             'weight' => $this->getWeight(),
             'normalized' => $this->getNormalized()

tests/phpstan/output.txt

@@ -0,0 +1,3 @@
+
+ [OK] No errors                                                                                                         
+