ENH PHP 8.1 compatibility

silverstripe · Apr 13, 2022 · e7284d8 · e7284d8
1 parent 9a38e44
commit e7284d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Filter/SlugFilter.php b/src/Filter/SlugFilter.php
@@ -33,11 +33,11 @@ public function filter($value)
         }
 
         foreach ($replacements as $regex => $replace) {
-            $value = preg_replace($regex, $replace, $value);
+            $value = preg_replace($regex ?? '', $replace ?? '', $value ?? '');
         }
 
         if ($this->getAllowMultibyte()) {
-            $value = rawurlencode($value);
+            $value = rawurlencode($value ?? '');
         }
 
         return $value;

diff --git a/tests/SegmentFieldTest.php b/tests/SegmentFieldTest.php
@@ -20,7 +20,7 @@ public function testSuggest()
         ));
 
         $encoded = $field->suggest($this->getNewRequestMock());
-        $decoded = json_decode($encoded);
+        $decoded = json_decode($encoded ?? '');
 
         $this->assertEquals('ARRAY-SUGGESTION', $decoded->suggestion);
         $this->assertEquals('array-preview', $decoded->preview);

diff --git a/tests/SegmentFieldTestModifier.php b/tests/SegmentFieldTestModifier.php
@@ -15,7 +15,7 @@ class SegmentFieldTestModifier extends AbstractSegmentFieldModifier
      */
     public function getSuggestion($value)
     {
-        return strtoupper($value);
+        return strtoupper($value ?? '');
     }
 
     /**
@@ -27,6 +27,6 @@ public function getSuggestion($value)
      */
     public function getPreview($value)
     {
-        return strtolower($value);
+        return strtolower($value ?? '');
     }
 }