Merge branch 'ACP2E-3430' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-11-14-2024

Author: chittima

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

@@ -1,40 +1,43 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\Cms\Model\Wysiwyg;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Asset\Repository;
+
 /**
  * Class DefaultConfigProvider returns data required to render tinymce editor
  */
 class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
     /**
-     * @var \Magento\Framework\View\Asset\Repository
+     * @var Repository
      */
-    private $assetRepo;
+    private Repository $assetRepo;
 
     /**
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param Repository $assetRepo
      */
-    public function __construct(\Magento\Framework\View\Asset\Repository $assetRepo)
+    public function __construct(Repository $assetRepo)
     {
         $this->assetRepo = $assetRepo;
     }
 
     /**
      * @inheritdoc
      */
-    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    public function getConfig(DataObject $config) : DataObject
     {
         $config->addData([
             'tinymce' => [
-                'toolbar' => ' blocks | formatselect | bold italic underline | alignleft aligncenter alignright | '
-                    . 'bullist numlist | link table charmap',
+                'toolbar' => ' blocks fontfamily fontsize| formatselect | bold italic underline ' .
+                    '| alignleft aligncenter alignright | bullist numlist | link table charmap',
                 'plugins' => implode(
                     ' ',
                     [

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

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\Wysiwyg;
+
+use Magento\Cms\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']);
+    }
+}