Merge branch 'pre-release' into AC-11662

Author: admanesachin

app/code/Magento/AwsS3PageBuilder/composer.json

@@ -3,7 +3,7 @@
     "description": "Aws S3 Page Builder module",
     "require": {
         "magento/framework": "*",
-        "php": "~8.1.0||~8.2.0"
+        "php": "~8.1.0||~8.2.0||~8.3.0"
     },
     "suggest": {
         "magento/module-page-builder": "*",

app/code/Magento/CatalogPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
-        "php": "~8.1.0||~8.2.0"
+        "php": "~8.1.0||~8.2.0||~8.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": "~8.1.0||~8.2.0"
+        "php": "~8.1.0||~8.2.0||~8.3.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/PageBuilder/Block/GoogleMapsApi.php

@@ -16,9 +16,9 @@
  */
 class GoogleMapsApi extends \Magento\Framework\View\Element\Template
 {
-    const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
-    const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3&key=%s';
-    const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
+    public const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
+    public const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3.53&key=%s';
+    public const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
 
     /**
      * Retrieve the Google Maps API key

app/code/Magento/PageBuilder/Model/Dom/Document.php

@@ -8,7 +8,7 @@
 namespace Magento\PageBuilder\Model\Dom;
 
 use DOMNode;
-use Gt\Dom\Document as GtDomDocument;
+use Magento\PageBuilder\Model\Dom\DomDocument;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\DocumentFragmentInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\DocumentInterface;
@@ -26,21 +26,29 @@ class Document implements DocumentInterface
     protected $objectManager;
 
     /**
-     * @var GtDomDocument
+     * @var DOMDocument
      */
     protected $document;
 
     /**
      * Document constructor.
      * @param ObjectManagerInterface $objectManager
-     * @param string $document
+     * @param string $characterSet
+     * @param string $contentType
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $document = ""
+        string $characterSet,
+        string $contentType
     ) {
         $this->objectManager = $objectManager;
-        $this->document = $this->objectManager->create(GtDomDocument::class, [ 'document' => $document ]);
+        $this->document = $this->objectManager->create(
+            DomDocument::class,
+            [
+                'characterSet' => $characterSet,
+                'contentType' => $contentType
+            ]
+        );
     }
 
     /**

app/code/Magento/PageBuilder/Model/Dom/DomDocument.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Dom;
+
+use Gt\Dom\Document as GtDomDocument;
+
+/**
+ * PhpGt DOM Document wrapper.
+ */
+class DomDocument extends GtDomDocument
+{
+}

app/code/Magento/PageBuilder/Model/Dom/HtmlCollection.php

@@ -9,7 +9,7 @@
 
 use ArrayAccess;
 use Countable;
-use Gt\Dom\HTMLCollection as GtDomHTMLCollection;
+use Gt\Dom\NodeList as GtDomNodeList;
 use Iterator;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\ElementInterface;
@@ -26,19 +26,19 @@ class HtmlCollection implements Iterator, ArrayAccess, Countable, HtmlCollection
     private $objectManager;
 
     /**
-     * @var GtDomHTMLCollection
+     * @var GtDomNodeList
      */
     private $collection;
 
     /**
      * HtmlCollection constructor.
      *
      * @param ObjectManagerInterface $objectManager
-     * @param GtDomHTMLCollection $collection
+     * @param GtDomNodeList $collection
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        GtDomHTMLCollection $collection
+        GtDomNodeList $collection
     ) {
         $this->objectManager = $objectManager;
         $this->collection = $collection;

app/code/Magento/PageBuilder/Model/Dom/HtmlDocument.php

@@ -21,13 +21,23 @@ class HtmlDocument extends Document implements HtmlDocumentInterface
      * HtmlDocument constructor.
      * @param ObjectManagerInterface $objectManager
      * @param string $document
+     * @param string $characterSet
+     * @param string $contentType
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $document = ""
+        string $document,
+        string $characterSet = "UTF-8",
+        string $contentType = "text/html"
     ) {
-        parent::__construct($objectManager, $document);
-        $this->document = $this->objectManager->create(GtDomHTMLDocument::class, [ 'document' => $document ]);
+        parent::__construct($objectManager, $characterSet, $contentType);
+        $this->document = $this->objectManager->create(
+            GtDomHTMLDocument::class,
+            [
+                "html" => $document,
+                "characterSet" => $characterSet
+            ]
+        );
     }
 
     /**

app/code/Magento/PageBuilder/Model/Dom/StringMap.php

@@ -7,7 +7,7 @@
 
 namespace Magento\PageBuilder\Model\Dom;
 
-use Gt\Dom\StringMap as GtDomStringMap;
+use Gt\Dom\DOMStringMap as GtDomStringMap;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\StringMapInterface;
 

app/code/Magento/PageBuilder/Model/Dom/TokenList.php

@@ -7,7 +7,7 @@
 
 namespace Magento\PageBuilder\Model\Dom;
 
-use Gt\Dom\TokenList as GtDomTokenList;
+use Gt\Dom\DOMTokenList as GtDomTokenList;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\TokenListInterface;