Merge pull request #82 from creative-commoners/pulls/3/php81

ENH PHP 8.1 compatibility
silverstripe · Apr 26, 2022 · ed7dc6e · ed7dc6e
2 parents a2a2198 + d452367
commit ed7dc6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/code/EditableSpamProtectionField.php b/code/EditableSpamProtectionField.php
@@ -130,13 +130,13 @@ protected function getCandidateFields()
      */
     public function onBeforeWrite()
     {
-        $fieldMap = json_decode($this->SpamFieldSettings, true);
+        $fieldMap = json_decode($this->SpamFieldSettings ?? '', true);
         if (empty($fieldMap)) {
             $fieldMap = array();
         }
 
         foreach ($this->record as $key => $value) {
-            if (substr($key, 0, 8) === 'spammap-') {
+            if (substr($key ?? '', 0, 8) === 'spammap-') {
                 $fieldMap[substr($key, 8)] = $value;
             }
         }
@@ -176,7 +176,7 @@ public function getCMSFields()
 
         // Generate field specific settings
         $mappableFields = FormSpamProtectionExtension::config()->get('mappable_fields');
-        $mappableFieldsMerged = array_combine($mappableFields, $mappableFields);
+        $mappableFieldsMerged = array_combine($mappableFields ?? [], $mappableFields ?? []);
         foreach ($this->getCandidateFields() as $otherField) {
             $mapSetting = "Map-{$otherField->Name}";
             $fieldOption = DropdownField::create(
@@ -200,12 +200,12 @@ public function getCMSFields()
      */
     public function spamMapValue($mapSetting)
     {
-        $map = json_decode($this->SpamFieldSettings, true);
+        $map = json_decode($this->SpamFieldSettings ?? '', true);
         if (empty($map)) {
             $map = array();
         }
 
-        if (array_key_exists($mapSetting, $map)) {
+        if (array_key_exists($mapSetting, $map ?? [])) {
             return $map[$mapSetting];
         }
         return '';
@@ -235,7 +235,7 @@ public function validateField($data, $form)
             $foundError = false;
 
             // field validate implementation may not add error to validator
-            if (count($errors) > 0) {
+            if (count($errors ?? []) > 0) {
                 // check if error already added from fields' validate method
                 foreach ($errors as $error) {
                     if ($error['fieldName'] == $this->Name) {

diff --git a/code/Extension/FormSpamProtectionExtension.php b/code/Extension/FormSpamProtectionExtension.php
@@ -73,7 +73,7 @@ public static function get_protector($options = null)
             $protector = self::config()->get('default_spam_protector');
         }
 
-        if ($protector && class_exists($protector)) {
+        if ($protector && class_exists($protector ?? '')) {
             return Injector::inst()->create($protector);
         } else {
             return null;