OXDEV-8213: Move order of filter condition check

Author: MarcelOxid

CHANGELOG-v9.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - `DataType\Filter\AbstractNumberFilter`
+- `DataType\Filter\StringFilter::matches()` to check if string match the filter conditions
 
 ### Changed
 - Use `DataType\Filter\AbstractNumberFilter` for  `DataType\Filter\IntegerFilter` and `DataType\Filter\FloatFilter`

src/DataType/Filter/StringFilter.php

@@ -44,11 +44,11 @@ public function contains(): ?string
 
     public function matches(string $value): bool
     {
-        if ($this->contains !== null && !str_contains($value, $this->contains)) {
+        if ($this->equals !== null && $value !== $this->equals) {
             return false;
         }
 
-        if ($this->equals !== null && $value !== $this->equals) {
+        if ($this->contains !== null && !str_contains($value, $this->contains)) {
             return false;
         }
 

tests/Unit/DataType/Filter/StringFilterTest.php

@@ -171,7 +171,7 @@ public static function matchesDataProvider(): \Generator
 
         yield "test match begins with " => [
             'stringForTrueCase' => 'this start',
-            'stringForFalseCase' => 'this deos not start with',
+            'stringForFalseCase' => 'this does not start with',
             'initFilter' => new StringFilter(beginsWith: 'this start')
         ];
     }