Only stable version in exception (#4)

Author: msmakouz

src/VersionChecker.php

@@ -53,7 +53,7 @@ public function greaterThan(?string $version = null): void
         $installedVersion = $this->installedVersion->getInstalledVersion();
 
         if (!$this->comparator->greaterThan($version, $installedVersion)) {
-            throw new UnsupportedVersionException(\sprintf(
+            throw new UnsupportedVersionException($this->getFormattedMessage(
                 'Installed RoadRunner version `%s` not supported. Requires version `%s` or higher.',
                 $installedVersion,
                 $version
@@ -72,7 +72,7 @@ public function lessThan(string $version): void
         $installedVersion = $this->installedVersion->getInstalledVersion();
 
         if (!$this->comparator->lessThan($version, $installedVersion)) {
-            throw new UnsupportedVersionException(\sprintf(
+            throw new UnsupportedVersionException($this->getFormattedMessage(
                 'Installed RoadRunner version `%s` not supported. Requires version `%s` or lower.',
                 $installedVersion,
                 $version
@@ -91,11 +91,32 @@ public function equal(string $version): void
         $installedVersion = $this->installedVersion->getInstalledVersion();
 
         if (!$this->comparator->equal($version, $installedVersion)) {
-            throw new UnsupportedVersionException(\sprintf(
+            throw new UnsupportedVersionException($this->getFormattedMessage(
                 'Installed RoadRunner version `%s` not supported. Requires version `%s`.',
                 $installedVersion,
                 $version
             ), $installedVersion, $version);
         }
     }
+
+    /**
+     * @param non-empty-string $message
+     * @param non-empty-string $installedVersion
+     * @param non-empty-string $version
+     *
+     * @return non-empty-string
+     */
+    private function getFormattedMessage(string $message, string $installedVersion, string $version): string
+    {
+        \preg_match('/\bv?(\d+)\.(\d+)\.(\d+)\b/', $version, $matches);
+
+        if (!empty($matches[0])) {
+            $version = $matches[1] . '.' . $matches[2] . '.' . $matches[3];
+        }
+
+        /** @var non-empty-string $msg */
+        $msg = \sprintf($message, $installedVersion, $version);
+
+        return $msg;
+    }
 }

tests/src/Unit/VersionCheckerTest.php

@@ -256,9 +256,34 @@ public function testFailEqual(): void
         );
     }
 
+    /**
+     * @dataProvider getFormattedMessageDataProvider
+     */
+    public function testGetFormattedMessage(string $version, string $expected): void
+    {
+        $checker = new VersionChecker();
+        $ref = new \ReflectionMethod($checker, 'getFormattedMessage');
+        $ref->setAccessible(true);
+
+        $this->assertSame(
+            \sprintf('installed 1 required %s', $expected),
+            $ref->invoke($checker, 'installed %s required %s', '1', $version)
+        );
+    }
+
     public static function invalidVersionsDataProvider(): \Traversable
     {
         yield [''];
         yield [null];
     }
+
+    public static function getFormattedMessageDataProvider(): \Traversable
+    {
+        yield ['1', '1'];
+        yield ['1.1', '1.1'];
+        yield ['1.2.3', '1.2.3'];
+        yield ['1.2.3.4', '1.2.3'];
+        yield ['v1.2.3.4', '1.2.3'];
+        yield ['2023.1.0.0-dev', '2023.1.0'];
+    }
 }