Merge remote-tracking branch 'remotes/origin/MAGETWO-89695-tinymce3' into team3-delivery

danmooney2 · danmooney2 · commit 1c8579abaff9 · 2018-05-18T10:15:35.000-05:00
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php b/app/code/Magento/Cms/Model/Wysiwyg/DefaultConfigProvider.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Cms\Model\Wysiwyg;
 
 /**
@@ -27,7 +29,7 @@ public function __construct(\Magento\Framework\View\Asset\Repository $assetRepo)
     /**
      * {@inheritdoc}
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $config->addData([
             'tinymce4' => [
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php b/app/code/Magento/Cms/Model/Wysiwyg/Gallery/DefaultConfigProvider.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Cms\Model\Wysiwyg\Gallery;
 
 class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
@@ -49,7 +51,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $pluginData = (array) $config->getData('plugins');
         $imageData = [
diff --git a/app/code/Magento/Cms/Model/WysiwygDefaultConfig.php b/app/code/Magento/Cms/Model/WysiwygDefaultConfig.php
@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cms\Model;
 
 class WysiwygDefaultConfig implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         return $config;
     }
diff --git a/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php b/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php
@@ -3,8 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Tinymce3\Model\Config\Source\Wysiwyg;
 
+/**
+ * Class Editor provides configuration value for TinyMCE3 editor
+ * @deprecated use as configuration value tinymce4 path: mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter
+ */
 class Editor
 {
     /**
diff --git a/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php b/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
 namespace Magento\Tinymce3\Model\Config\Variable;
 
 /**
  * Class Config adds variable plugin information required for tinymce3 editor
+ * @deprecated use \Magento\Variable\Model\Variable\ConfigProvider instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
@@ -38,7 +41,7 @@ public function __construct(
      * @param \Magento\Framework\DataObject $config
      * @return \Magento\Framework\DataObject
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $settings = $this->defaultVariableConfig->getWysiwygPluginSettings($config);
         $pluginConfig = isset($settings['plugins']) ? $settings['plugins'] : [];
diff --git a/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php b/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Tinymce3\Model\Config\Widget;
 
 /**
  * Class Config adds widget plugin information required for tinymce3 editor
+ * @deprecated use \Magento\Widget\Model\Widget\Config instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
@@ -35,7 +38,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $settings = [
             'widget_plugin_src' => $this->getWysiwygJsPluginSrc(),
@@ -52,7 +55,7 @@ public function getConfig($config)
      *
      * @return string
      */
-    private function getWysiwygJsPluginSrc()
+    private function getWysiwygJsPluginSrc() : string
     {
         $editorPluginJs = 'Magento_Tinymce3::tiny_mce/plugins/magentowidget/editor_plugin.js';
         $result = $this->assetRepo->getUrl($editorPluginJs);
diff --git a/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php b/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+declare(strict_types=1);
 namespace Magento\Tinymce3\Model\Config\Widget;
 
 /**
  * Class PlaceholderImages provide ability to override placeholder images for Widgets
+ * @deprecated
  */
 class PlaceholderImagesPool
 {
@@ -29,7 +30,7 @@ public function __construct(
     /**
      * @return array
      */
-    public function getWidgetPlaceholders()
+    public function getWidgetPlaceholders() : array
     {
         return $this->widgetPlaceholders;
     }
diff --git a/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php b/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Tinymce3\Model\Config\Wysiwyg;
 
 /**
  * Class Config adds information about required css files for tinymce3 editor
+ * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
@@ -27,7 +30,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $config->addData([
             'popup_css' => $this->assetRepo->getUrl(
diff --git a/app/code/Magento/Tinymce3/Model/Plugin/Widget.php b/app/code/Magento/Tinymce3/Model/Plugin/Widget.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
 namespace Magento\Tinymce3\Model\Plugin;
 
 use Magento\Tinymce3\Model\Config\Source\Wysiwyg\Editor;
@@ -44,16 +46,16 @@ public function __construct(
 
     /**
      * @param \Magento\Widget\Model\Widget $subject
-     * @param $proceed
-     * @param $type
+     * @param \Closure $proceed
+     * @param string $type
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundGetPlaceholderImageUrl(
         \Magento\Widget\Model\Widget $subject,
-        $proceed,
-        $type
-    ) {
+        \Closure $proceed,
+        string $type
+    ) : string {
         if ($this->activeEditor->getWysiwygAdapterPath() !== Editor::WYSIWYG_EDITOR_CONFIG_VALUE) {
             return $proceed($type);
         }
diff --git a/app/code/Magento/Tinymce3/README.md b/app/code/Magento/Tinymce3/README.md
@@ -1,3 +1 @@
-This moodule provides backwards compatibility for TinyMCE3 for clients
-that have modified the TinyMCE3 editor in Magento and don't want to 
-lose functionality.
+We have updated the TinyMCE module to the latest available version, 4.6.4. TinyMCE v4.6.4 provides backwards-compatibility for modified editor modules to prevent the loss of functionality. The TinyMCE3 module is now deprecated and will be removed in a future release.
diff --git a/app/code/Magento/Tinymce3/etc/di.xml b/app/code/Magento/Tinymce3/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Ui\Block\Wysiwyg\ActiveEditor">
+        <arguments>
+            <argument name="availableAdapterPaths" xsi:type="array">
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string"/>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Tinymce3/view/adminhtml/web/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/app/code/Magento/Tinymce3/view/adminhtml/web/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated use lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js instead
+ */
 /* global tinyMCE, tinymce, MagentovariablePlugin */
 /* eslint-disable strict */
 tinyMCE.addI18n({
diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated use lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js instead
+ */
 /* global varienGlobalEvents, tinyMceEditors, MediabrowserUtility, closeEditorPopup, Base64 */
 /* eslint-disable strict */
 define([
diff --git a/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php b/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
@@ -16,20 +16,38 @@
  */
 class ActiveEditor extends \Magento\Framework\View\Element\Template
 {
+    const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter';
     /**
      * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var array
+     */
+    private $availableAdapterPaths;
+
     /**
      * @param Context $context
      * @param ScopeConfigInterface $scopeConfig
      * @param array $data
      */
-    public function __construct(Context $context, ScopeConfigInterface $scopeConfig, array $data = [])
-    {
+    /**
+     * ActiveEditor constructor.
+     * @param Context $context
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $availableAdapterPaths
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        ScopeConfigInterface $scopeConfig,
+        $availableAdapterPaths = [],
+        array $data = []
+    ) {
         parent::__construct($context, $data);
         $this->scopeConfig = $scopeConfig;
+        $this->availableAdapterPaths = $availableAdapterPaths;
     }
 
     /**
@@ -40,6 +58,9 @@ public function __construct(Context $context, ScopeConfigInterface $scopeConfig,
     public function getWysiwygAdapterPath()
     {
         $adapterPath = $this->scopeConfig->getValue(Model\Config::WYSIWYG_EDITOR_CONFIG_PATH);
+        if ($adapterPath !== self::DEFAULT_EDITOR_PATH && !isset($this->availableAdapterPaths[$adapterPath])) {
+            $adapterPath = self::DEFAULT_EDITOR_PATH;
+        }
         return $this->escapeHtml($adapterPath);
     }
 }
diff --git a/app/code/Magento/Variable/Model/Variable/ConfigProvider.php b/app/code/Magento/Variable/Model/Variable/ConfigProvider.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Variable\Model\Variable;
 
@@ -30,7 +31,7 @@ public function __construct(Config $variableConfig)
     * {@inheritdoc}
     *
     */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $settings = $this->variableConfig->getWysiwygPluginSettings($config);
         return $config->addData($settings);
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -75,7 +75,7 @@ public function __construct(
      * @param \Magento\Framework\DataObject $config
      * @return \Magento\Framework\DataObject
      */
-    public function getConfig($config)
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
     {
         $settings = $this->getPluginSettings($config);
         return $config->addData($settings);
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
@@ -46,7 +46,6 @@
         <element name="v4" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']" />
         <element name="v3" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 3.6(Deprecated)']" />
         <element name="TinymceDescription3" type ="button" selector="//span[text()='Description']" />
-        <element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
         <element name="SaveConfig" type ="button" selector="#save" />
         <element name="v4" type="button" selector="#category_form_description_v4"/>
         <element name="WYSIWYGBtn" type="button" selector=".//button[@class='action-default scalable action-wysiwyg']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml
@@ -12,7 +12,6 @@
         <element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
         <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
         <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
-        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
         <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
         <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/NewsletterTemplateSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/NewsletterTemplateSection.xml
@@ -19,7 +19,6 @@
     <section name="NewsletterWYSIWYGSection">
         <element name="TextArea" type="text" selector="#text" />
         <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
-        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
         <element name="ShowHideBtn" type="button" selector="#toggletext"/>
         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
         <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/README.md
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Section/AdminTinymce3FileldsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Section/AdminTinymce3FileldsSection.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Test/AdminSwitchWYSIWYGOptionsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Test/AdminSwitchWYSIWYGOptionsTest.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/composer.json
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php
diff --git a/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/di.xml b/dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/di.xml
diff --git a/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php b/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,16 @@`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
	`6`	`+declare(strict_types=1);`
	`7`	`+`
`6`	`8`	`namespace Magento\Cms\Model;`
`7`	`9`
`8`	`10`	`class WysiwygDefaultConfig implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface`
`9`	`11`	`{`
`10`	`12`	`/**`
`11`	`13`	`* {@inheritdoc}`
`12`	`14`	`*/`
`13`		`- public function getConfig($config)`
	`15`	`+ public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject`
`14`	`16`	`{`
`15`	`17`	`return $config;`
`16`	`18`	`}`