Merge branch '1.0.0-beta-release' of github.com:magento/magento2-page-builder into 1.0.0-beta-release

Author: bdenham

app/code/Magento/PageBuilder/Controller/ContentType/Preview.php

@@ -9,12 +9,17 @@
 namespace Magento\PageBuilder\Controller\ContentType;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Preview controller to render blocks preview on Stage
+ *
+ * This isn't placed within the adminhtml folder as it has to extend from the front-end controllers app action to
+ * ensure the content is rendered in the storefront scope.
+ *
  * @api
  */
-class Preview extends \Magento\Framework\App\Action\Action
+class Preview extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\PageBuilder\Model\Stage\RendererPool

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader;
+
+use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
+use Magento\Framework\File\Size;
+
+/**
+ * Provides maximum file size for uploader
+ *
+ * Will provide the lower of the following two values:
+ * - upload_max_filesize from php.ini config
+ * - staticFileSize argument passed to constructor
+ */
+class MaxFileSize implements ProviderInterface
+{
+    /**
+     * @var Size
+     */
+    private $fileSize;
+
+    /**
+     * @var int
+     */
+    private $staticFileSize;
+
+    /**
+     * @param Size $fileSize
+     * @param int $staticFileSize
+     */
+    public function __construct(
+        Size $fileSize,
+        $staticFileSize = null
+    ) {
+        $this->fileSize = $fileSize;
+        $this->staticFileSize = $staticFileSize;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(string $itemName) : array
+    {
+        // dynamically set max file size based on the lower of php ini config and static value (if present)
+        $maxFileSize = min(array_filter([
+            $this->staticFileSize ?? 0,
+            $this->fileSize->getMaxFileSize()
+        ]));
+
+        return [
+            $itemName => $maxFileSize
+        ];
+    }
+}

app/code/Magento/PageBuilder/Model/Stage/ScriptFilter.php app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

@@ -11,19 +11,19 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Filters script tags from stage output
+ * Filters HTML from stage output
  *
  * @api
  */
-class ScriptFilter
+class HtmlFilter
 {
     /**
      * @var LoggerInterface
      */
     private $loggerInterface;
 
     /**
-     * ScriptFilter constructor.
+     * HtmlFilter constructor.
      * @param LoggerInterface $loggerInterface
      */
     public function __construct(
@@ -33,12 +33,12 @@ public function __construct(
     }
 
     /**
-     * Remove script tag from html
+     * Filter HTML text to remove script tags and encode HTML content types
      *
      * @param string $content
      * @return string
      */
-    public function removeScriptTags(string $content): string
+    public function filterHtml(string $content): string
     {
         $dom = new \DOMDocument();
         try {
@@ -49,9 +49,25 @@ public function removeScriptTags(string $content): string
             $this->loggerInterface->critical($e->getMessage());
         }
         libxml_use_internal_errors($previous);
+        // Remove all <script /> tags from output
         foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
             $item->parentNode->removeChild($item);
         }
+        $xpath = new \DOMXPath($dom);
+        $htmlContentTypes = $xpath->query('//*[@data-role="html" and not(contains(@class, "placeholder-html-code"))]');
+        foreach ($htmlContentTypes as $htmlContentType) {
+            /* @var \DOMElement $htmlContentType */
+            $innerHTML= '';
+            $children = $htmlContentType->childNodes;
+            foreach ($children as $child) {
+                $innerHTML .= $child->ownerDocument->saveXML($child);
+            }
+            $htmlContentType->setAttribute(
+                "class",
+                $htmlContentType->getAttribute("class") . " placeholder-html-code"
+            );
+            $htmlContentType->nodeValue = htmlentities($innerHTML);
+        }
         return $dom->saveHTML();
     }
 }

app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php

@@ -33,28 +33,28 @@ class CmsStaticBlock implements \Magento\PageBuilder\Model\Stage\RendererInterfa
     private $loggerInterface;
 
     /**
-     * @var \Magento\PageBuilder\Model\Stage\ScriptFilter
+     * @var \Magento\PageBuilder\Model\Stage\HtmlFilter
      */
-    private $scriptFilter;
+    private $htmlFilter;
 
     /**
      * CmsStaticBlock constructor.
      *
      * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory
      * @param WidgetDirective $widgetDirectiveRenderer
      * @param LoggerInterface $loggerInterface
-     * @param \Magento\PageBuilder\Model\Stage\ScriptFilter $scriptFilter
+     * @param \Magento\PageBuilder\Model\Stage\HtmlFilter $htmlFilter
      */
     public function __construct(
         \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory,
         WidgetDirective $widgetDirectiveRenderer,
         LoggerInterface $loggerInterface,
-        \Magento\PageBuilder\Model\Stage\ScriptFilter $scriptFilter
+        \Magento\PageBuilder\Model\Stage\HtmlFilter $htmlFilter
     ) {
         $this->blockCollectionFactory = $blockCollectionFactory;
         $this->widgetDirectiveRenderer = $widgetDirectiveRenderer;
         $this->loggerInterface = $loggerInterface;
-        $this->scriptFilter = $scriptFilter;
+        $this->htmlFilter = $htmlFilter;
     }
 
     /**
@@ -96,7 +96,7 @@ public function render(array $params): array
 
         if ($block->isActive()) {
             $directiveResult = $this->widgetDirectiveRenderer->render($params);
-            $result['content'] = $this->scriptFilter->removeScriptTags($directiveResult['content']);
+            $result['content'] = $this->htmlFilter->filterHtml($directiveResult['content']);
         } else {
             $result['error'] = __('Block disabled');
         }

app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php

@@ -35,7 +35,7 @@ public function getConfig(): array
     {
         $resultConfig = [];
         foreach ($this->config as $contentTypeName => $config) {
-            $selector = sprintf('div[data-role="%s"]', $contentTypeName);
+            $selector = sprintf('[data-role="%s"]', $contentTypeName);
             foreach ($config as $item) {
                 if (!isset($item['component'])) {
                     continue;