OXDEV-9583: Make tests green again

Author: MarcelOxid

src/DataType/Filter/BoolFilter.php

@@ -31,7 +31,7 @@ public function equals(): bool
 
     public function matches(mixed $value): bool
     {
-        return (is_bool($value) || $value === $this->equals);
+        return (is_bool($value) && $value === $this->equals);
     }
 
     public function addToQuery(QueryBuilder $builder, string $field): void

src/DataType/Filter/DateFilter.php

@@ -115,4 +115,9 @@ function ($date) use ($zone) {
             $between
         );
     }
+
+    public function matches(mixed $value): bool
+    {
+        // TODO: Implement matches() method.
+    }
 }

src/DataType/Filter/FloatFilter.php

@@ -72,4 +72,9 @@ public static function fromUserInput(
             $between
         );
     }
+
+    public function matches(mixed $value): bool
+    {
+        // TODO: Implement matches() method.
+    }
 }

src/DataType/Filter/IntegerFilter.php

@@ -69,7 +69,7 @@ public function matches(mixed $value): bool
             return false;
         }
 
-        if ($this->between !== null && ($value <= $this->between[0] || $value >= $this->between[1])) {
+        if ($this->between !== null && !($value >= $this->between[0] && $value <= $this->between[1])) {
             return false;
         }
 

tests/Unit/DataType/Filter/IDFilterTest.php

@@ -80,10 +80,10 @@ public function testAddQueryPartWithAlias(): void
     }
 
     /** @dataProvider matchesDataProvider */
-    public function testMatches(mixed $value, IDFilter $filter, bool $expected): void
+    public function testMatches(mixed $value, IDFilter $filter, bool $result): void
     {
         $this->assertSame(
-            $expected,
+            $result,
             $filter->matches($value)
         );
     }
@@ -92,31 +92,31 @@ public static function matchesDataProvider(): \Generator
     {
         yield "test string is matching" => [
             'value' => '1abc',
-            'initFilter' => new IDFilter(equals: new ID('1abc')),
+            'filter' => new IDFilter(equals: new ID('1abc')),
             'result' => true,
         ];
 
         yield "test id class is matching" => [
             'value' => new ID('id_text'),
-            'initFilter' => new IDFilter(equals: new ID('id_text')),
+            'filter' => new IDFilter(equals: new ID('id_text')),
             'result' => true,
         ];
 
         yield "test no string or no ID-class is not matching" => [
             'value' => 123,
-            'initFilter' => new IDFilter(equals: new ID('123')),
+            'filter' => new IDFilter(equals: new ID('123')),
             'result' => false,
         ];
 
         yield "test wrong string is not matching" => [
             'value' => 'wrong1abc',
-            'initFilter' => new IDFilter(equals: new ID('1abc')),
+            'filter' => new IDFilter(equals: new ID('1abc')),
             'result' => false,
         ];
 
         yield "test wrong ID-class is not matching" => [
             'value' => new ID('wrong_id_text'),
-            'initFilter' => new IDFilter(equals: new ID('id_text')),
+            'filter' => new IDFilter(equals: new ID('id_text')),
             'result' => false,
         ];
     }

tests/Unit/DataType/Filter/IntegerFilterTest.php

@@ -209,37 +209,37 @@ public static function matchesDataProvider(): \Generator
             'initFilter' => new IntegerFilter(equals: 1)
         ];
 
-        yield "test match contains" => [
+        yield "test match less than" => [
             'stringForTrueCase' => 1,
             'stringForFalseCase' => 5,
             'initFilter' => new IntegerFilter(lessThan: 3)
         ];
 
-        yield "test match begins with" => [
+        yield "test match greater than" => [
             'stringForTrueCase' => 6,
             'stringForFalseCase' => 2,
             'initFilter' => new IntegerFilter(greaterThan: 4)
         ];
 
-        yield "test match begins with and contains" => [
+        yield "test match between" => [
             'stringForTrueCase' => 5,
             'stringForFalseCase' => 2,
             'initFilter' => new IntegerFilter(between: [3, 5])
         ];
 
-        yield "test match equals and contains" => [
+        yield "test match less and greater than" => [
             'stringForTrueCase' => 7,
             'stringForFalseCase' => 3,
             'initFilter' => new IntegerFilter(lessThan: 10, greaterThan: 4)
         ];
 
-        yield "test is and is not integer" => [
+        yield "test not matches with float" => [
             'stringForTrueCase' => 2,
             'stringForFalseCase' => 2.1,
             'initFilter' => new IntegerFilter(equals: 2)
         ];
 
-        yield "test is and is not integer with string" => [
+        yield "test not matches with string" => [
             'stringForTrueCase' => 3,
             'stringForFalseCase' => '3',
             'initFilter' => new IntegerFilter(equals: 3)

tests/Unit/DataType/Filter/StringFilterTest.php

@@ -178,7 +178,7 @@ public static function matchesDataProvider(): \Generator
         yield "test match begins with and contains" => [
             'stringForTrueCase' => 'this start with abc',
             'stringForFalseCase' => 'this does not start with abc',
-            'initFilter' => new StringFilter(beginsWith: 'THIS start', contains: 'abc')
+            'initFilter' => new StringFilter(contains: 'abc', beginsWith: 'THIS start')
         ];
 
         yield "test match equals and contains" => [
@@ -188,7 +188,7 @@ public static function matchesDataProvider(): \Generator
         ];
 
         yield "test is and is not string" => [
-            'stringForTrueCase' => 'This is abc',
+            'stringForTrueCase' => '23',
             'stringForFalseCase' => 23,
             'initFilter' => new StringFilter(equals: '23')
         ];