add normalization of shortened versions

Author: eli-darkly

src/LaunchDarkly/Operators.php

@@ -11,6 +11,7 @@
 class Operators
 {
     const RFC3339 = 'Y-m-d\TH:i:s.uP';
+    const VERSION_NUMBERS_REGEX = '/^\\d+(\\.\\d+)?(\\.\\d+)?/';
 
     /**
      * @param $op string
@@ -143,6 +144,21 @@ public static function parseSemVer($in) {
         try {
             return Parser::toVersion($in);
         } catch (InvalidStringRepresentationException $e) {
+            // If minor or patch version was omitted, or both, normalize the version
+            // by adding zeroes in their place.
+            if (preg_match(Operators::VERSION_NUMBERS_REGEX, $in, $matches)) {
+                $transformed = $matches[0];
+                for ($i = 1; $i <= 3; $i++) {
+                    if ($i > count($matches)) {
+                        $transformed .= '.0';
+                    }
+                }
+                $transformed .= substr($in, strlen($matches[0]));
+                try {
+                    return Parser::toVersion($transformed);
+                } catch (InvalidStringRepresentationException $e) {
+                }
+            }
             return null;
         }
     }

tests/OperatorsTest.php

@@ -59,12 +59,17 @@ public function testParseTime()
     public function testSemVer() {
         $this->assertTrue(Operators::apply("semVerEqual", "2.0.0", "2.0.0"));
         $this->assertTrue(Operators::apply("semVerEqual", "2.0", "2.0.0"));
+        $this->assertTrue(Operators::apply("semVerEqual", "2", "2.0.0"));
+        $this->assertTrue(Operators::apply("semVerEqual", "2-rc1", "2.0.0-rc1"));
+        $this->assertTrue(Operators::apply("semVerEqual", "2+build2", "2.0.0+build2"));
         $this->assertFalse(Operators::apply("semVerEqual", "2.0.0", "2.0.1"));
         $this->assertTrue(Operators::apply("semVerLessThan", "2.0.0", "2.0.1"));
         $this->assertTrue(Operators::apply("semVerLessThan", "2.0", "2.0.1"));
         $this->assertFalse(Operators::apply("semVerLessThan", "2.0.1", "2.0.0"));
+        $this->assertTrue(Operators::apply("semVerLessThan", "2.0.0-rc", "2.0.0-rc.beta"));
         $this->assertTrue(Operators::apply("semVerGreaterThan", "2.0.1", "2.0.0"));
         $this->assertFalse(Operators::apply("semVerGreaterThan", "2.0.0", "2.0.1"));
+        $this->assertTrue(Operators::apply("semVerGreaterThan", "2.0.0-rc.1", "2.0.0-rc.0"));
         $this->assertFalse(Operators::apply("semVerLessThan", "2.0.0", "xbad%ver"));
         $this->assertFalse(Operators::apply("semVerGreaterThan", "2.0.0", "xbad%ver"));
     }