[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml

@@ -62,7 +62,7 @@
       <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
         <script>
         require([
-            'tinymceDeprecated'
+            "wysiwygAdapter"
         ], function(tinyMCE){
 
             tinyMCE.init({

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php

@@ -125,17 +125,6 @@ protected function _prepareForm()
             ]
         );
 
-        $fieldset->addField(
-            'is_wysiwyg_enabled',
-            'select',
-            [
-                'name' => 'is_wysiwyg_enabled',
-                'label' => __('Enable WYSIWYG'),
-                'title' => __('Enable WYSIWYG'),
-                'values' => $yesnoSource,
-            ]
-        );
-
         $fieldset->addField(
             'is_html_allowed_on_front',
             'select',

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php

@@ -40,9 +40,13 @@ public function execute()
 
         // set entered data if was error when we do save
         $data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAttributeData(true);
+        $presentation = $this->_objectManager->get(
+            \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class
+        );
         if (!empty($data)) {
             $model->addData($data);
         }
+        $model->setFrontendInput($presentation->getPresentationInputType($model));
         $attributeData = $this->getRequest()->getParam('attribute');
         if (!empty($attributeData) && $id === null) {
             $model->addData($attributeData);

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -12,12 +12,14 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 use Magento\Catalog\Helper\Product;
+use Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation;
 use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
 use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
@@ -67,19 +69,24 @@ class Save extends Attribute
      * @var LayoutFactory
      */
     private $layoutFactory;
+    /**
+     * @var Presentation
+     */
+    private $presentation;
 
     /**
      * @param Context $context
      * @param FrontendInterface $attributeLabelCache
      * @param Registry $coreRegistry
-     * @param BuildFactory $buildFactory
      * @param PageFactory $resultPageFactory
+     * @param BuildFactory $buildFactory
      * @param AttributeFactory $attributeFactory
      * @param ValidatorFactory $validatorFactory
      * @param CollectionFactory $groupCollectionFactory
      * @param FilterManager $filterManager
      * @param Product $productHelper
      * @param LayoutFactory $layoutFactory
+     * @param Presentation|null $presentation
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -93,7 +100,8 @@ public function __construct(
         CollectionFactory $groupCollectionFactory,
         FilterManager $filterManager,
         Product $productHelper,
-        LayoutFactory $layoutFactory
+        LayoutFactory $layoutFactory,
+        Presentation $presentation = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->buildFactory = $buildFactory;
@@ -103,6 +111,7 @@ public function __construct(
         $this->validatorFactory = $validatorFactory;
         $this->groupCollectionFactory = $groupCollectionFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->presentation = $presentation ?: ObjectManager::getInstance()->get(Presentation::class);
     }
 
     /**
@@ -191,6 +200,8 @@ public function execute()
                 }
             }
 
+            $data = $this->presentation->convertPresentationDataToInputType($data);
+
             if ($attributeId) {
                 if (!$model->getId()) {
                     $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
@@ -205,7 +216,6 @@ public function execute()
 
                 $data['attribute_code'] = $model->getAttributeCode();
                 $data['is_user_defined'] = $model->getIsUserDefined();
-                $data['frontend_input'] = $model->getFrontendInput();
             } else {
                 /**
                  * @todo add to helper and specify all relations for properties

app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Inputtype/Presentation.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype;
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+/**
+ * Class Input type preprocessor.
+ *
+ * @package Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype
+ */
+class Presentation
+{
+    /**
+     * Get input type for presentation layer from stored input type.
+     *
+     * @param Attribute $attribute
+     * @return string
+     */
+    public function getPresentationInputType(Attribute $attribute)
+    {
+        $inputType = $attribute->getFrontendInput();
+        if ($inputType == 'textarea' && $attribute->getIsWysiwygEnabled()) {
+            return 'texteditor';
+        }
+        return $inputType;
+    }
+
+    /**
+     * Convert presentation to storable input type.
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function convertPresentationDataToInputType(array $data)
+    {
+        if ($data['frontend_input'] === 'texteditor') {
+            $data['is_wysiwyg_enabled'] = 1;
+            $data['frontend_input'] = 'textarea';
+        } elseif ($data['frontend_input'] === 'textarea') {
+            $data['is_wysiwyg_enabled'] = 0;
+        }
+        return $data;
+    }
+}

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -96,11 +96,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Catalog\Model\Product\ReservedAttributeList $reservedAttributeList
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productFlatIndexerHelper
      * @param LockValidatorInterface $lockValidator
-     * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/EditTest.php

@@ -62,6 +62,11 @@ class EditTest extends \PHPUnit\Framework\TestCase
      */
     protected $session;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $presentation;
+
     /**
      * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -82,11 +87,6 @@ class EditTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultPageFactory;
 
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManager;
-
     protected function setUp()
     {
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)->getMock();
@@ -128,6 +128,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->presentation = $this->getMockBuilder(
+            \Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class
+        )->disableOriginalConstructor()
+            ->getMock();
+
         $this->blockTemplate = $this->getMockBuilder(\Magento\Backend\Block\Template::class)
             ->setMethods(['setIsPopup'])
             ->disableOriginalConstructor()
@@ -142,8 +147,8 @@ protected function setUp()
         $this->context->expects($this->any())->method('getResultPageFactory')->willReturn($this->resultPageFactory);
         $this->context->expects($this->any())->method('getSession')->willReturn($this->session);
 
-        $this->objectManager = new ObjectManager($this);
-        $this->editController = $this->objectManager->getObject(
+        $objectManager = new ObjectManager($this);
+        $this->editController = $objectManager->getObject(
             \Magento\Catalog\Controller\Adminhtml\Product\Attribute\Edit::class,
             [
                 'context' => $this->context,
@@ -169,9 +174,10 @@ public function testExecutePopup()
             ->with(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->willReturn($this->eavAttribute);
         $this->objectManagerMock->expects($this->any())->method('get')
-            ->with(\Magento\Backend\Model\Session::class)
-            ->willReturn($this->session);
-
+            ->willReturnMap([
+                [\Magento\Backend\Model\Session::class, $this->session],
+                [\Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class, $this->presentation]
+            ]);
         $this->eavAttribute->expects($this->once())->method('setEntityTypeId')->willReturnSelf();
         $this->eavAttribute->expects($this->once())->method('addData')->with($attributesData)->willReturnSelf();
         $this->eavAttribute->expects($this->any())->method('getName')->willReturn(null);
@@ -219,8 +225,10 @@ public function testExecuteNoPopup()
             ->with(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->willReturn($this->eavAttribute);
         $this->objectManagerMock->expects($this->any())->method('get')
-            ->with(\Magento\Backend\Model\Session::class)
-            ->willReturn($this->session);
+            ->willReturnMap([
+                [\Magento\Backend\Model\Session::class, $this->session],
+                [\Magento\Catalog\Model\Product\Attribute\Frontend\Inputtype\Presentation::class, $this->presentation]
+            ]);
 
         $this->eavAttribute->expects($this->once())->method('setEntityTypeId')->willReturnSelf();
         $this->eavAttribute->expects($this->once())->method('addData')->with($attributesData)->willReturnSelf();

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Source/InputtypeTest.php

@@ -37,6 +37,7 @@ public function testToOptionArray()
         $inputTypesSet = [
             ['value' => 'text', 'label' => 'Text Field'],
             ['value' => 'textarea', 'label' => 'Text Area'],
+            ['value' => 'texteditor', 'label' => 'Text Editor'],
             ['value' => 'date', 'label' => 'Date'],
             ['value' => 'boolean', 'label' => 'Yes/No'],
             ['value' => 'multiselect', 'label' => 'Multiple Select'],

app/code/Magento/Catalog/Ui/DataProvider/Category/Form/Modifier/WysiwygConfigModifier.php

@@ -187,19 +187,4 @@
     <type name="Magento\Eav\Api\AttributeSetRepositoryInterface">
         <plugin name="remove_products" type="Magento\Catalog\Plugin\Model\AttributeSetRepository\RemoveProducts"/>
     </type>
-    <virtualType name="UiModifierPool" type="Magento\Ui\DataProvider\Modifier\Pool">
-        <arguments>
-            <argument name="modifiers" xsi:type="array">
-                <item name="wysiwyg-category" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Category\Form\Modifier\WysiwygConfigModifier</item>
-                    <item name="sortOrder" xsi:type="number">10</item>
-                </item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Catalog\Model\Category\DataProvider">
-        <arguments>
-            <argument name="pool" xsi:type="object">UiModifierPool</argument>
-        </arguments>
-    </type>
 </config>