Merge remote-tracking branch 'mainline/develop' into MC-3910-Align-animations

Author: cspruiell

app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php

@@ -52,6 +52,7 @@ private function getConfig(): array
     {
         $formNamespace = $this->getData('formNamespace');
         $attribute = $this->getData('attribute');
+        $jsObjectName = $formNamespace . '_' . $attribute;
 
         return [
             'formNamespace' => $formNamespace,
@@ -60,14 +61,16 @@ private function getConfig(): array
                 [
                     'form_namespace' => $formNamespace,
                     'prefix' => $attribute,
+                    'js_object_name' => $jsObjectName,
                 ]
             ),
-            'jsObjectName' => $formNamespace . '_' . $attribute,
+            'jsObjectName' => $jsObjectName,
             'childComponentUrl' => $this->getUrl(
                 'pagebuilder/form/element_productconditions_child',
                 [
                     'form_namespace' => $formNamespace,
                     'prefix' => $attribute,
+                    'js_object_name' => $jsObjectName,
                 ]
             ),
             'attribute' => $attribute,

app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions.php

@@ -54,7 +54,7 @@ public function execute()
         $this->rule->loadPost(['conditions' => $this->serializer->unserialize($conditionsEncoded)]);
         $formName = $this->getRequest()->getParam('form_namespace');
         // Combine class recursively sets jsFormObject so we don't need to
-        $conditions->setJsFormObject($formName);
+        $conditions->setJsFormObject($this->getRequest()->getParam('js_object_name'));
         // The Combine class doesn't need the data attribute on children but we do.
         $this->configureConditionsFormName($conditions, $formName);
         $result = $conditions->asHtmlRecursive();

app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/Child.php

@@ -39,6 +39,7 @@ public function execute()
     {
         $id = $this->getRequest()->getParam('id');
         $formName = $this->getRequest()->getParam('form_namespace');
+        $jsObjectName = $this->getRequest()->getParam('js_object_name');
 
         $typeData = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
         $className = $typeData[0];
@@ -55,7 +56,7 @@ public function execute()
 
         $result = '';
         if ($model instanceof AbstractCondition) {
-            $model->setJsFormObject($formName);
+            $model->setJsFormObject($jsObjectName);
             $model->setFormName($formName);
             $result = $model->asHtmlRecursive();
         }

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

@@ -32,21 +32,29 @@ class CmsStaticBlock implements \Magento\PageBuilder\Model\Stage\RendererInterfa
      */
     private $loggerInterface;
 
+    /**
+     * @var \Magento\PageBuilder\Model\Stage\ScriptFilter
+     */
+    private $scriptFilter;
+
     /**
      * CmsStaticBlock constructor.
      *
      * @param \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory
      * @param WidgetDirective $widgetDirectiveRenderer
      * @param LoggerInterface $loggerInterface
+     * @param \Magento\PageBuilder\Model\Stage\ScriptFilter $scriptFilter
      */
     public function __construct(
         \Magento\Cms\Model\ResourceModel\Block\CollectionFactory $blockCollectionFactory,
         WidgetDirective $widgetDirectiveRenderer,
-        LoggerInterface $loggerInterface
+        LoggerInterface $loggerInterface,
+        \Magento\PageBuilder\Model\Stage\ScriptFilter $scriptFilter
     ) {
         $this->blockCollectionFactory = $blockCollectionFactory;
         $this->widgetDirectiveRenderer = $widgetDirectiveRenderer;
         $this->loggerInterface = $loggerInterface;
+        $this->scriptFilter = $scriptFilter;
     }
 
     /**
@@ -88,34 +96,11 @@ public function render(array $params): array
 
         if ($block->isActive()) {
             $directiveResult = $this->widgetDirectiveRenderer->render($params);
-            $result['content'] = $this->removeScriptTags($directiveResult['content']);
+            $result['content'] = $this->scriptFilter->removeScriptTags($directiveResult['content']);
         } else {
             $result['error'] = __('Block disabled');
         }
 
         return $result;
     }
-
-    /**
-     * Remove script tag from html
-     *
-     * @param string $content
-     * @return string
-     */
-    private function removeScriptTags(string $content): string
-    {
-        $dom = new \DOMDocument();
-        try {
-            //this code is required because of https://bugs.php.net/bug.php?id=60021
-            $previous = libxml_use_internal_errors(true);
-            $dom->loadHTML($content);
-        } catch (\Exception $e) {
-            $this->loggerInterface->critical($e->getMessage());
-        }
-        libxml_use_internal_errors($previous);
-        foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
-            $item->parentNode->removeChild($item);
-        }
-        return $dom->saveHTML();
-    }
 }

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

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Stage;
+
+use Psr\Log\LoggerInterface;
+
+/**
+ * Filters script tags from stage output
+ *
+ * @api
+ */
+class ScriptFilter
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $loggerInterface;
+
+    /**
+     * ScriptFilter constructor.
+     * @param LoggerInterface $loggerInterface
+     */
+    public function __construct(
+        LoggerInterface $loggerInterface
+    ) {
+        $this->loggerInterface = $loggerInterface;
+    }
+
+    /**
+     * Remove script tag from html
+     *
+     * @param string $content
+     * @return string
+     */
+    public function removeScriptTags(string $content): string
+    {
+        $dom = new \DOMDocument();
+        try {
+            //this code is required because of https://bugs.php.net/bug.php?id=60021
+            $previous = libxml_use_internal_errors(true);
+            $dom->loadHTML($content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+        } catch (\Exception $e) {
+            $this->loggerInterface->critical($e->getMessage());
+        }
+        libxml_use_internal_errors($previous);
+        foreach (iterator_to_array($dom->getElementsByTagName('script')) as $item) {
+            $item->parentNode->removeChild($item);
+        }
+        return $dom->saveHTML();
+    }
+}