Semver return nex version logic fixed

selamiphp · Dec 3, 2018 · 7bb0113 · 7bb0113
1 parent b7724f7
commit 7bb0113
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/Semver.php b/src/Semver.php
@@ -51,21 +51,35 @@ public function getCurrent() : string
 
     public function getNextPatchRelease() : string
     {
-        return $this->major . '.' . $this->minor . '.' . (++$this->patch);
+        $patch = $this->patch;
+        if ($this->preRelease === null) {
+            $patch++;
+        }
+        return $this->major . '.' . $this->minor . '.' . $patch;
     }
 
     public function getNextMinorRelease() : string
     {
-        return $this->major . '.' . (++$this->minor) . '.' . $this->patch;
+        $minor = $this->minor;
+        $patch = $this->patch;
+        if ($this->preRelease === null) {
+            $minor++;
+
+            $patch = 0;
+        }
+        return $this->major . '.' . $minor . '.' . $patch;
     }
 
     public function getNextMajorRelease() : string
     {
+        $major = $this->major;
+        $minor = $this->minor;
+        $patch = $this->patch;
         if ($this->preRelease === null) {
-            $this->major++;
+            $major++;
+            $minor = 0;
+            $patch = 0;
         }
-        return $this->major . '.'
-            . $this->minor . '.'
-            . $this->patch;
+        return $major . '.' . $minor . '.' . $patch;
     }
 }
diff --git a/tests/unit/SemverTest.php b/tests/unit/SemverTest.php
@@ -45,7 +45,7 @@ public function shouldReturnNextMinorVersionSuccessfully() : void
     {
         $version = '2.0.6';
         $semver = Semver::createFromString($version);
-        $this->assertEquals('2.1.6', $semver->getNextMinorRelease());
+        $this->assertEquals('2.1.0', $semver->getNextMinorRelease());
     }
 
     /**
@@ -55,18 +55,20 @@ public function shouldReturnNextMajorVersionSuccessfully() : void
     {
         $version = '2.0.6';
         $semver = Semver::createFromString($version);
-        $this->assertEquals('3.0.6', $semver->getNextMajorRelease());
+        $this->assertEquals('3.0.0', $semver->getNextMajorRelease());
     }
 
     /**
      * @test
      */
-    public function shouldReturnNextMajorVersionWithPreReleaseSuccessfully() : void
+    public function shouldReturnNextVersionsWithPreReleaseSuccessfully() : void
     {
         $version = '2.0.6-alpha.1';
         $semver = Semver::createFromString($version);
         $this->assertEquals('2.0.6-alpha.1', $semver->getCurrent());
         $this->assertEquals('2.0.6', $semver->getNextMajorRelease());
+        $this->assertEquals('2.0.6', $semver->getNextMinorRelease());
+        $this->assertEquals('2.0.6', $semver->getNextPatchRelease());
     }
 
     /**