Fix text field converter for PHP 8.1 getkirby#4226

tobimori · Mar 24, 2022 · 05d4d1e · 05d4d1e
1 parent 8437921
commit 05d4d1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/fields/text.php b/config/fields/text.php
@@ -69,14 +69,13 @@
                 return $value;
             }
 
-            $value     = trim($value);
             $converter = $this->converters()[$this->converter()];
 
             if (is_array($value) === true) {
                 return array_map($converter, $value);
             }
 
-            return call_user_func($converter, $value);
+            return call_user_func($converter, trim($value ?? ''));
         },
         'converters' => function (): array {
             return [

diff --git a/tests/Form/Fields/TextFieldTest.php b/tests/Form/Fields/TextFieldTest.php
@@ -27,7 +27,9 @@ public function converterDataProvider()
             ['slug', 'Super nice', 'super-nice'],
             ['upper', 'Super nice', 'SUPER NICE'],
             ['lower', 'Super nice', 'super nice'],
-            ['ucfirst', 'super nice', 'Super nice']
+            ['ucfirst', 'super nice', 'Super nice'],
+            ['upper', null, ''],
+            ['lower', '', ''],
         ];
     }