Merge pull request #52 from hostep/fixes-php8-deprecated-functionality

Fixes PHP 8.1 deprecated function calls with passing 'null' to 'trim'
Magenerds · Nov 23, 2022 · 6d6fee5 · 6d6fee5
2 parents ae3c3ed + b7d64ac
commit 6d6fee5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Plugin/Cms/Model/Block/BlockPlugin.php b/Plugin/Cms/Model/Block/BlockPlugin.php
@@ -60,7 +60,7 @@ public function beforeSave(
  {
  /** @noinspection PhpUndefinedMethodInspection */
  $json = $block->getData(Constants::ATTR_PAGE_DESIGNER_JSON);
- if (strlen(trim($json)) > 0) {
+ if (is_string($json) && strlen(trim($json)) > 0) {
  $block->setContent($this->htmlRenderer->toHtml($json, $block->getData(Constants::ATTR_PAGE_DESIGNER_REMOVE)));
  }
  }

diff --git a/Plugin/Cms/Model/Page/PagePlugin.php b/Plugin/Cms/Model/Page/PagePlugin.php
@@ -60,7 +60,7 @@ public function beforeSave(
  {
  /** @noinspection PhpUndefinedMethodInspection */
  $json = $page->getData(Constants::ATTR_PAGE_DESIGNER_JSON);
- if (strlen(trim($json)) > 0) {
+ if (is_string($json) && strlen(trim($json)) > 0) {
  $page->setContent($this->htmlRenderer->toHtml($json, $page->getData(Constants::ATTR_PAGE_DESIGNER_REMOVE)));
  }
  }