Merge pull request #24 from hostep/fix-issue-23

Fixes issue 23: make sure cms block content is correct in Magento 2.2.4 and 2.2.5
Magenerds · Aug 23, 2018 · 08f0dd2 · 08f0dd2
2 parents d36722d + e1afe1d
commit 08f0dd2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Plugin/Cms/Model/Block/BlockPlugin.php b/Plugin/Cms/Model/Block/BlockPlugin.php
@@ -9,8 +9,10 @@
 
 namespace Magenerds\PageDesigner\Plugin\Cms\Model\Block;
 
-use Magento\Cms\Api\Data\BlockInterface;
+use Magenerds\PageDesigner\Constants;
 use Magenerds\PageDesigner\Utils\HtmlRendererInterface;
+use Magento\Cms\Model\Block;
+use Magento\Cms\Model\ResourceModel\Block as BlockResource;
 
 /**
  * Class BlockPlugin
@@ -43,13 +45,14 @@ public function __construct(HtmlRendererInterface $htmlRenderer)
     /**
      * Manipulates the Block entity before it is saved
      *
-     * @param BlockInterface $block
+     * @param BlockResource $blockResource
+     * @param Block $block
      * @param array $arguments
      */
-    public function beforeSave(BlockInterface $block, ... $arguments) // NOSONAR
+    public function beforeSave(BlockResource $blockResource, Block $block, ... $arguments) // NOSONAR
     {
         /** @noinspection PhpUndefinedMethodInspection */
-        $json = $block->getPageDesignerJson();
+        $json = $block->getData(Constants::ATTR_PAGE_DESIGNER_JSON);
 
         if (strlen(trim($json)) > 0) {
             $block->setContent($this->htmlRenderer->toHtml($json));

diff --git a/Plugin/Cms/Model/Page/PagePlugin.php b/Plugin/Cms/Model/Page/PagePlugin.php
@@ -10,7 +10,6 @@
 namespace Magenerds\PageDesigner\Plugin\Cms\Model\Page;
 
 use Magenerds\PageDesigner\Constants;
-use Magento\Cms\Api\Data\PageInterface;
 use Magenerds\PageDesigner\Utils\HtmlRendererInterface;
 use Magento\Cms\Model\Page;
 use Magento\Cms\Model\ResourceModel\Page as PageResource;
@@ -47,7 +46,7 @@ public function __construct(HtmlRendererInterface $htmlRenderer)
      * Manipulates the Page entity before it is saved
      *
      * @param PageResource $pageResource
-     * @param PageInterface|Page $page
+     * @param Page $page
      * @param array $arguments
      */
     public function beforeSave(PageResource $pageResource, Page $page, ... $arguments) // NOSONAR

diff --git a/etc/di.xml b/etc/di.xml
@@ -27,7 +27,7 @@
                 type="Magenerds\PageDesigner\Plugin\Cms\Model\Page\PagePlugin" sortOrder="100"/>
     </type>
 
-    <type name="Magento\Cms\Model\Block">
+    <type name="Magento\Cms\Model\ResourceModel\Block">
         <plugin name="Magenerds_PageDesigner::cmsBlockRenderJson"
                 type="Magenerds\PageDesigner\Plugin\Cms\Model\Block\BlockPlugin" sortOrder="100"/>
     </type>