fix: semantic version prefix remove

marcocesarato · Oct 27, 2022 · a821c13 · a821c13
1 parent 60274c9
commit a821c13
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/Changelog.php b/src/Changelog.php
@@ -165,14 +165,13 @@ public function generate(string $root, InputInterface $input, SymfonyStyle $outp
             }
 
             // Generate new version code
-            $semver = new SemanticVersion($lastVersion);
+            $semver = new SemanticVersion($lastVersion, $tagPrefix);
             $newVersion = $semver->bump($bumpRelease);
         }
         if (!empty($nextVersion)) {
             $newVersion = $nextVersion;
             $autoBump = false;
         }
-        $newVersion = preg_replace('#^v#i', '', $newVersion);
         $newVersion = preg_replace('/^' . preg_quote($tagPrefix, '/') . '/', '', $newVersion);
 
         $options = []; // Git retrieve options per version
@@ -344,7 +343,7 @@ public function generate(string $root, InputInterface $input, SymfonyStyle $outp
             }
 
             if ($params['autoBump']) {
-                $semver = new SemanticVersion($params['from']);
+                $semver = new SemanticVersion($params['from'], $tagPrefix);
                 $bumpRelease = SemanticVersion::PATCH;
 
                 if ($summary['breaking_changes'] > 0) {
@@ -375,7 +374,7 @@ public function generate(string $root, InputInterface $input, SymfonyStyle $outp
                 $newVersion = $extraRelease ?? $newVersion;
 
                 if ($releaseType !== null) {
-                    $semVer2 = new SemanticVersion($newVersion);
+                    $semVer2 = new SemanticVersion($newVersion, $tagPrefix);
                     $newVersion = $semVer2->bump($releaseType);
                 }
 

diff --git a/src/Git/Repository.php b/src/Git/Repository.php
@@ -66,17 +66,15 @@ public static function getLastTag($prefix = '', $merged = false): string
 
         $lastTag = '0.0.0';
         foreach ($tagsFound as $value) {
-            $value = preg_replace('/^' . preg_quote($prefix, '/') . '/', '', $value);
-            if (SemanticVersion::validate($value)) {
+            if (SemanticVersion::validate($value, $prefix)) {
                 $lastTag = $value;
                 break;
             }
         }
 
         if (count($tagsFound) > 0) {
             foreach ($tagsFound as $found) {
-                $found = preg_replace('/^' . preg_quote($prefix, '/') . '/', '', $value);
-                if (SemanticVersion::validate($found)) {
+                if (SemanticVersion::validate($found, $prefix)) {
                     $lastTag = $found;
                     break;
                 }

diff --git a/src/Helper/SemanticVersion.php b/src/Helper/SemanticVersion.php
@@ -53,10 +53,10 @@ class SemanticVersion
      *
      * @param $version
      */
-    public function __construct($version)
+    public function __construct($version, $prefix = 'v')
     {
         $version = trim($version);
-        $version = preg_replace('#^v#i', '', $version);
+        $version = preg_replace('/^' . preg_quote($prefix, '/') . '/', '', $version);
 
         $this->setVersion($version);
     }
@@ -137,9 +137,9 @@ public function setVersion(string $version): SemanticVersion
         return $this;
     }
 
-    public static function validate($version): bool
+    public static function validate($version, $prefix = 'v'): bool
     {
-        $version = preg_replace('#^v#i', '', $version);
+        $version = preg_replace('/^' . preg_quote($prefix, '/') . '/', '', $version);
 
         return preg_match('/^' . self::PATTERN . '$/', $version);
     }