Merge pull request #209 from creative-commoners/pulls/2/php81

ENH PHP 8.1 compatibility
silverstripe · Apr 26, 2022 · d486842 · d486842
2 parents 0a04e35 + 1b7dba1
commit d486842
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/StringTagField.php b/src/StringTagField.php
@@ -254,12 +254,12 @@ protected function getOptions()
     public function setValue($value, $source = null)
     {
         if (is_string($value)) {
-            $value = explode(',', $value);
+            $value = explode(',', $value ?? '');
         }
 
         if ($source instanceof DataObject) {
             $name = $this->getName();
-            $value = explode(',', $source->$name);
+            $value = explode(',', $source->$name ?? '');
         }
 
         if ($source instanceof SS_List) {
@@ -270,7 +270,7 @@ public function setValue($value, $source = null)
             $value = [];
         }
 
-        return parent::setValue(array_filter($value));
+        return parent::setValue(array_filter($value ?? []));
     }
 
     public function saveInto(DataObjectInterface $record)
@@ -328,15 +328,15 @@ protected function getTags($term)
             /** @var ArrayData $tag */
             $tagValue = $tag->Value;
             // Map into a distinct list (prevent duplicates)
-            if (stripos($tagValue, $term) !== false && !array_key_exists($tagValue, $items)) {
+            if (stripos($tagValue ?? '', $term ?? '') !== false && !array_key_exists($tagValue, $items ?? [])) {
                 $items[$tagValue] = [
                     'id' => $tag->Title,
                     'text' => $tag->Value,
                 ];
             }
         }
         // @todo do we actually need lazy loading limits for StringTagField?
-        return array_slice(array_values($items), 0, $this->getLazyLoadItemLimit());
+        return array_slice(array_values($items ?? []), 0, $this->getLazyLoadItemLimit());
     }
 
     /**

diff --git a/src/TagField.php b/src/TagField.php
@@ -234,7 +234,7 @@ public function getSchemaDataDefaults()
         );
 
         if (!$this->getShouldLazyLoad()) {
-            $schema['options'] = array_values($this->getOptions()->toNestedArray());
+            $schema['options'] = array_values($this->getOptions()->toNestedArray() ?? []);
         } else {
             $schema['optionUrl'] = $this->getSuggestURL();
         }
@@ -421,7 +421,7 @@ public function saveInto(DataObjectInterface $record)
             }
         }
 
-        $relation->setByIDList(array_filter($ids));
+        $relation->setByIDList(array_filter($ids ?? []));
     }
 
     /**
@@ -513,7 +513,7 @@ protected function getTags($term)
             ];
         }
 
-        return array_values($items);
+        return array_values($items ?? []);
     }
 
     /**

diff --git a/tests/TagFieldTest.php b/tests/TagFieldTest.php
@@ -72,7 +72,7 @@ protected function compareExpectedAndActualTags(array $expected, TagFieldTestBlo
      */
     protected function compareTagLists(array $expected, DataList $actualSource)
     {
-        $actual = array_values($actualSource->map('ID', 'Title')->toArray());
+        $actual = array_values($actualSource->map('ID', 'Title')->toArray() ?? []);
         sort($expected);
         sort($actual);