Don't treat numeric strings as numbers (#84)

Author: keelerm84

src/LaunchDarkly/Impl/Model/Operators.php

@@ -63,22 +63,22 @@ public static function apply(?string $op, $u, $c): bool
                     }
                     break;
                 case "lessThan":
-                    if (is_numeric($u) && is_numeric($c)) {
+                    if (self::is_numeric($u) && self::is_numeric($c)) {
                         return $u < $c;
                     }
                     break;
                 case "lessThanOrEqual":
-                    if (is_numeric($u) && is_numeric($c)) {
+                    if (self::is_numeric($u) && self::is_numeric($c)) {
                         return $u <= $c;
                     }
                     break;
                 case "greaterThan":
-                    if (is_numeric($u) && is_numeric($c)) {
+                    if (self::is_numeric($u) && self::is_numeric($c)) {
                         return $u > $c;
                     }
                     break;
                 case "greaterThanOrEqual":
-                    if (is_numeric($u) && is_numeric($c)) {
+                    if (self::is_numeric($u) && self::is_numeric($c)) {
                         return $u >= $c;
                     }
                     break;
@@ -118,6 +118,21 @@ public static function apply(?string $op, $u, $c): bool
         return false;
     }
 
+    /**
+     * A stricter version of the built-in is_numeric checker.
+     *
+     * This version will check if the provided value is numeric, but isn't a
+     * string. This helps us stay consistent with the way flag evaluations work
+     * in more strictly typed languages.
+     *
+     * @param mixed $value
+     * @return bool
+     */
+    public static function is_numeric($value): bool
+    {
+        return is_numeric($value) && !is_string($value);
+    }
+
     /**
      * @param mixed|null $in
      * @return ?numeric

tests/Impl/Model/OperatorsTest.php

@@ -74,4 +74,57 @@ public function testSemVer()
         $this->assertFalse(Operators::apply("semVerLessThan", "2.0.0", "xbad%ver"));
         $this->assertFalse(Operators::apply("semVerGreaterThan", "2.0.0", "xbad%ver"));
     }
+
+    public function comparisonOperators(): array
+    {
+        return [
+            ["lessThan", 100, 200, true],
+            ["lessThan", 200, 100, false],
+            ["lessThan", 100, 100, false],
+            ["lessThan", "100", 200, false],
+            ["lessThan", "100", "200", false],
+            ["lessThan", 100, "200", false],
+            ["lessThan", 100, true, false],
+            ["lessThan", true, 100, false],
+            ["lessThan", true, true, false],
+
+            ["lessThanOrEqual", 100, 200, true],
+            ["lessThanOrEqual", 200, 100, false],
+            ["lessThanOrEqual", 100, 100, true],
+            ["lessThanOrEqual", "100", 200, false],
+            ["lessThanOrEqual", "100", "200", false],
+            ["lessThanOrEqual", 100, "200", false],
+            ["lessThanOrEqual", 100, true, false],
+            ["lessThanOrEqual", true, 100, false],
+            ["lessThanOrEqual", true, true, false],
+
+            ["greaterThan", 100, 200, false],
+            ["greaterThan", 200, 100, true],
+            ["greaterThan", 100, 100, false],
+            ["greaterThan", "100", 200, false],
+            ["greaterThan", "100", "200", false],
+            ["greaterThan", 100, "200", false],
+            ["greaterThan", 100, true, false],
+            ["greaterThan", true, 100, false],
+            ["greaterThan", true, true, false],
+
+            ["greaterThanOrEqual", 100, 200, false],
+            ["greaterThanOrEqual", 200, 100, true],
+            ["greaterThanOrEqual", 100, 100, true],
+            ["greaterThanOrEqual", "100", 200, false],
+            ["greaterThanOrEqual", "100", "200", false],
+            ["greaterThanOrEqual", 100, "200", false],
+            ["greaterThanOrEqual", 100, true, false],
+            ["greaterThanOrEqual", true, 100, false],
+            ["greaterThanOrEqual", true, true, false],
+        ];
+    }
+
+    /**
+     * @dataProvider comparisonOperators
+     */
+    public function testComparisonOperators($operator, $lhs, $rhs, $expected)
+    {
+        $this->assertEquals($expected, Operators::apply($operator, $lhs, $rhs));
+    }
 }