OXDEV-9583: Add matches method to FloatFilter

Author: MarcelOxid

src/DataType/Filter/AbstractNumberFilter.php

@@ -64,6 +64,28 @@ protected function atLeastOneIsNotNull(mixed ...$values): bool
         return false;
     }
 
+    protected function matches(mixed $value): bool
+    {
+        if ($this->equals() !== null && $value !== $this->equals()) {
+            return false;
+        }
+
+        if ($this->lessThan() !== null && $value >= $this->lessThan()) {
+            return false;
+        }
+
+        if ($this->greaterThan() !== null && $value <= $this->greaterThan()) {
+            return false;
+        }
+
+        if ($this->between() !== null && !($value >= $this->between()[0] && $value <= $this->between()[1])) {
+            return false;
+        }
+
+        return true;
+
+    }
+
     protected static function checkRangeOfBetween(?array $between, callable $checkMethod): void
     {
         if (

src/DataType/Filter/FloatFilter.php

@@ -75,6 +75,10 @@ public static function fromUserInput(
 
     public function matches(mixed $value): bool
     {
-        // TODO: Implement matches() method.
+        if (!is_float($value)) {
+            return false;
+        }
+
+        return parent::matches($value);
     }
 }

src/DataType/Filter/IntegerFilter.php

@@ -57,23 +57,7 @@ public function matches(mixed $value): bool
             return false;
         }
 
-        if ($this->equals !== null && $value !== $this->equals) {
-            return false;
-        }
-
-        if ($this->lessThan !== null && $value >= $this->lessThan) {
-            return false;
-        }
-
-        if ($this->greaterThan !== null && $value <= $this->greaterThan) {
-            return false;
-        }
-
-        if ($this->between !== null && !($value >= $this->between[0] && $value <= $this->between[1])) {
-            return false;
-        }
-
-        return true;
+        return parent::matches($value);
     }
 
     /**

tests/Unit/DataType/Filter/FloatFilterTest.php

@@ -226,4 +226,59 @@ public function testAddQueryPartWithAlias(): void
 
         $this->assertEquals('db_table_alias.DB_FIELD = :db_field_eq', (string)$where);
     }
+
+    /** @dataProvider matchesDataProvider */
+    public function testMatches(
+        float $stringForTrueCase,
+        mixed $stringForFalseCase,
+        FloatFilter $filter
+    ): void {
+        $this->assertTrue($filter->matches($stringForTrueCase));
+        $this->assertFalse($filter->matches($stringForFalseCase));
+    }
+
+    public static function matchesDataProvider(): \Generator
+    {
+        yield "test match equals" => [
+            'stringForTrueCase' => 1.0,
+            'stringForFalseCase' => 2.0,
+            'filter' => new FloatFilter(equals: 1.0)
+        ];
+
+        yield "test match less than" => [
+            'stringForTrueCase' => 1.3,
+            'stringForFalseCase' => 5.4,
+            'filter' => new FloatFilter(lessThan: 3.0)
+        ];
+
+        yield "test match greater than" => [
+            'stringForTrueCase' => 6.6,
+            'stringForFalseCase' => 2.3,
+            'filter' => new FloatFilter(greaterThan: 4.5)
+        ];
+
+        yield "test match between" => [
+            'stringForTrueCase' => 5.3,
+            'stringForFalseCase' => 2.7,
+            'filter' => new FloatFilter(between: [3.1, 5.3])
+        ];
+
+        yield "test match less and greater than" => [
+            'stringForTrueCase' => 7.8,
+            'stringForFalseCase' => 3.3,
+            'filter' => new FloatFilter(lessThan: 10.5, greaterThan: 4.5)
+        ];
+
+        yield "test not matches with float" => [
+            'stringForTrueCase' => 2.5,
+            'stringForFalseCase' => 2,
+            'filter' => new FloatFilter(equals: 2.5)
+        ];
+
+        yield "test not matches with string" => [
+            'stringForTrueCase' => 3.6,
+            'stringForFalseCase' => '3,6',
+            'filter' => new FloatFilter(equals: 3.6)
+        ];
+    }
 }