Merge branch '1.1-develop' into MC-14994

Author: davemacaulay

app/code/Magento/CatalogPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/CmsPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-cms": "*",
         "magento/framework": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/PageBuilder/composer.json

@@ -17,7 +17,7 @@
         "magento/module-directory": "*",
         "magento/module-email": "*",
         "magento/module-require-js": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "conflict": {
         "gene/bluefoot": "*"

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js

@@ -10,8 +10,9 @@ define([
     'Magento_Ui/js/form/element/image-uploader',
     'Magento_PageBuilder/js/resource/resize-observer/ResizeObserver',
     'Magento_PageBuilder/js/events',
-    'mage/translate'
-], function ($, _, uiRegistry, Uploader, ResizeObserver, events, $t) {
+    'mage/translate',
+    'mage/adminhtml/browser'
+], function ($, _, uiRegistry, Uploader, ResizeObserver, events, $t, browser) {
     'use strict';
 
     var initializedOnce = false;
@@ -70,7 +71,15 @@ define([
                 initializedOnce = true;
             }
         },
-
+        
+        /**
+         * {@inheritDoc}
+         */
+        openMediaBrowserDialog: function (imageUploader, e) {
+            browser.modalLoaded = false;
+            this._super(imageUploader, e);
+        },
+        
         /**
          * {@inheritDoc}
          */

app/code/Magento/PageBuilderAnalytics/composer.json

@@ -5,7 +5,7 @@
         "magento/module-analytics": "*",
         "magento/module-page-builder": "*",
         "magento/framework": "*",
-        "php": "~7.1.3||~7.2.0"
+        "php": "~7.1.3||~7.2.0||~7.3.0"
     },
     "type": "magento2-module",
     "license": [

dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php

@@ -47,8 +47,8 @@ protected function setUp()
     public function testFiltering(string $preFiltered, string $postFiltered, string $preFilteredBasename)
     {
         $this->assertEquals(
-            $postFiltered,
-            $this->templateFilter->filter($preFiltered),
+            $this->formatHtml($postFiltered),
+            $this->formatHtml($this->templateFilter->filter($preFiltered)),
             "Failed asserting that two strings are equal after filtering $preFilteredBasename"
         );
     }
@@ -79,4 +79,15 @@ public function filterDataProvider(): array
 
         return $dataProviderArgs;
     }
+
+    /**
+     * Strip whitespace from the HTML to conduct a fairer comparison
+     *
+     * @param string $html
+     * @return string|string[]|null
+     */
+    private function formatHtml(string $html): string
+    {
+        return preg_replace('/(?<=>)\s+|\s+(?=<)/m', '', $html);
+    }
 }