Merge branch 'develop' into AC-13289-latest

Author: jayrangnani-gl

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||~8.3.0"
+        "php": "~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||~8.3.0"
+        "php": "~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||~8.3.0"
+        "php": "~8.2.0||~8.3.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php

@@ -1,31 +1,34 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Wysiwyg;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Asset\Repository;
+
 /**
  * This DefaultConfigProvider overrides existing configuration provided from the cms module
  */
 class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
     /**
-     * @var \Magento\Framework\View\Asset\Repository
+     * @var Repository
      */
-    private $assetRepo;
+    private Repository $assetRepo;
     /**
      * @var array
      */
     private $additionalSettings;
     /**
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param Repository $assetRepo
      * @param array $additionalSettings
      */
     public function __construct(
-        \Magento\Framework\View\Asset\Repository $assetRepo,
+        Repository $assetRepo,
         array $additionalSettings
     ) {
         $this->assetRepo = $assetRepo;
@@ -34,15 +37,15 @@ public function __construct(
     /**
      * Returns configuration data
      *
-     * @param \Magento\Framework\DataObject $config
-     * @return \Magento\Framework\DataObject
+     * @param DataObject $config
+     * @return DataObject
      */
-    public function getConfig(\Magento\Framework\DataObject $config): \Magento\Framework\DataObject
+    public function getConfig(DataObject $config): DataObject
     {
         $config->addData(
             [
                 'tinymce' => [
-                    'toolbar' => 'undo redo | styles | fontsizeselect | lineheight | forecolor backcolor ' .
+                    'toolbar' => 'undo redo | styles | fontfamily fontsize | lineheight | forecolor backcolor ' .
                         '| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
                         '| link image table charmap',
 

app/code/Magento/PageBuilder/Test/Unit/Model/Wysiwyg/DefaultConfigProviderTest.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model\Wysiwyg;
+
+use Magento\PageBuilder\Model\Wysiwyg\DefaultConfigProvider;
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Asset\Repository;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class DefaultConfigProviderTest extends TestCase
+{
+    /**
+     * @var Repository|MockObject
+     */
+    private Repository $assetRepo;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->assetRepo = $this->createMock(Repository::class);
+        parent::setUp();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetConfig(): void
+    {
+        $config = new DataObject();
+        $configProvider = new DefaultConfigProvider($this->assetRepo, []);
+        $result = $configProvider->getConfig($config);
+        $this->assertStringContainsString('fontfamily fontsize', $result->getTinymce()['toolbar']);
+    }
+}

app/code/Magento/PageBuilder/composer.json

@@ -21,7 +21,7 @@
         "magento/module-wishlist": "*",
         "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "phpgt/dom": "^4.1"
     },
     "suggest": {

app/code/Magento/PageBuilderAdminAnalytics/composer.json

@@ -6,7 +6,7 @@
     },
     "require": {
         "magento/framework": "*",
-        "php": "~8.1.0||~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0"
     },
     "suggest": {
         "magento/module-admin-analytics": "*",

app/code/Magento/PageBuilderAnalytics/composer.json

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

app/code/Magento/PageBuilderImageAttribute/composer.json

@@ -3,7 +3,7 @@
     "description": "Width & Height attribute - Pagebuilder image",
     "require": {
         "magento/framework": "*",
-        "php": "~8.1.0||~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0"
     },
     "type": "magento2-module",
     "license": [