Merge pull request #51 from maxmilash/trim-php8-fix

fix Trim filter with null or other non-string value with strict_types=1
rdohms · Oct 11, 2021 · ef4c214 · ef4c214
2 parents be79368 + bcf753c
commit ef4c214
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/DMS/Filter/Filters/Trim.php b/src/DMS/Filter/Filters/Trim.php
@@ -5,6 +5,7 @@
 
 use DMS\Filter\Rules\Rule;
 
+use function is_string;
 use function trim;
 
 /**
@@ -19,6 +20,10 @@ class Trim extends BaseFilter
      */
     public function apply(Rule $rule, $value)
     {
+        if (! is_string($value)) {
+            return $value;
+        }
+
         //trim() only operates in default mode
         //if no second argument is passed, it
         //cannot be passed as null

diff --git a/tests/DMS/Filter/Filters/TrimTest.php b/tests/DMS/Filter/Filters/TrimTest.php
@@ -34,6 +34,7 @@ public function provideForRule(): array
             [['charlist' => "\\"], "\my text", "my text"],
             ["\\", "\my text", "my text"],
             ["x", "xmy textx", "my text"],
+            [[], null, null],
         ];
     }
 }