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

ENH PHP 8.1 compatibility
silverstripe · Apr 26, 2022 · 4f79f32 · 4f79f32
2 parents 13dd349 + 729a425
commit 4f79f32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Block/BannerBlock.php b/src/Block/BannerBlock.php
@@ -110,7 +110,7 @@ protected function decodeLinkData($linkJson)
             return;
         }
 
-        $data = ArrayData::create(json_decode($linkJson));
+        $data = ArrayData::create(json_decode($linkJson ?? ''));
 
         // Link page, if selected
         if ($data->PageID) {

diff --git a/src/Form/BlockLinkField.php b/src/Form/BlockLinkField.php
@@ -55,7 +55,7 @@ public function getParsedValue()
         if ($this->parsedValue) {
             return $this->parsedValue;
         }
-        $parsedValue = json_decode($this->dataValue(), true);
+        $parsedValue = json_decode($this->dataValue() ?? '', true);
         return $this->parsedValue = ArrayData::create((array) $parsedValue);
     }
 
@@ -80,7 +80,7 @@ public function getLinkPage()
      */
     public function getLinkText()
     {
-        return trim($this->getParsedValue()->Text);
+        return trim($this->getParsedValue()->Text ?? '');
     }
     /**
      * Get the link "description", used for titles or alt text

diff --git a/tests/Behat/Context/FixtureContext.php b/tests/Behat/Context/FixtureContext.php
@@ -76,7 +76,7 @@ public function contentBlocksAreNotInLineEditable()
 
         $file = 'content-blocks-not-inline-editable.yml';
         $path = $this->getDestinationConfigFolder($file);
-        file_put_contents($path, $config);
+        file_put_contents($path ?? '', $config);
 
         $this->activatedConfigFiles[] = $path;