MAGETWO-95532: Unable to upload image from TinyMCE3

Author: irenelagno

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

@@ -89,8 +89,6 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
 
     /**
      * @var array
-     * @deprecated
-     * @see \Magento\Cms\Model\Wysiwyg\Gallery\DefaultConfigProvider
      */
     protected $_windowSize;
 
@@ -207,6 +205,12 @@ public function getConfig($data = [])
 
         if ($this->_authorization->isAllowed('Magento_Cms::media_gallery')) {
             $this->configProvider->processGalleryConfig($config);
+            $config->addData(
+                [
+                    'files_browser_window_width' => $this->_windowSize['width'],
+                    'files_browser_window_height' => $this->_windowSize['height'],
+                ]
+            );
         }
         if ($config->getData('add_widgets')) {
             $this->configProvider->processWidgetConfig($config);

app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tinymce3\Model\Config\Gallery;
+
+/**
+ * Class Config adds information about required configurations to display media gallery of tinymce3 editor
+ *
+ * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
+ */
+class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
+{
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    private $backendUrl;
+
+    /**
+     * @param \Magento\Backend\Model\UrlInterface $backendUrl
+     */
+    public function __construct(
+        \Magento\Backend\Model\UrlInterface $backendUrl
+    ) {
+        $this->backendUrl = $backendUrl;
+    }
+
+    /**
+     * Returns media gallery config
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        $config->addData(
+            [
+                'add_images' => true,
+                'files_browser_window_url' => $this->backendUrl->getUrl('cms/wysiwyg_images/index'),
+            ]
+        );
+
+        return $config;
+    }
+}

app/code/Magento/Tinymce3/composer.json

@@ -4,9 +4,11 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-backend": "*",
         "magento/module-ui": "*",
         "magento/module-variable": "*",
         "magento/module-widget": "*"
+
     },
     "suggest": {
         "magento/module-cms": "*"

app/code/Magento/Tinymce3/etc/adminhtml/di.xml

@@ -22,7 +22,7 @@
                 <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Widget\Config</item>
             </argument>
             <argument name="galleryConfigProvider" xsi:type="array">
-                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Cms\Model\WysiwygDefaultConfig</item>
+                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string">Magento\Tinymce3\Model\Config\Gallery\Config</item>
             </argument>
         </arguments>
     </type>

dev/tests/integration/testsuite/Magento/Tinymce3/Model/Wysiwyg/CompositeConfigProviderTest.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+namespace Magento\Tinymce3\Model\Wysiwyg;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\AuthorizationInterface;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class CompositeConfigProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test enabled module is able to modify WYSIWYG config
+     *
+     * @return void
+     *
+     * @magentoConfigFixture default/cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter
+     */
+    public function testTestModuleEnabledModuleIsAbleToModifyConfig()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $objectManager->configure([
+            'preferences' => [
+                AuthorizationInterface::class => \Magento\Backend\Model\Search\AuthorizationMock::class
+            ]
+        ]);
+        $compositeConfigProvider = $objectManager->create(\Magento\Cms\Model\Wysiwyg\CompositeConfigProvider::class);
+        $model = $objectManager->create(
+            \Magento\Cms\Model\Wysiwyg\Config::class,
+            ['configProvider' => $compositeConfigProvider]
+        );
+        $config = $model->getConfig();
+        $this->assertArrayHasKey('add_images', $config);
+        $this->assertArrayHasKey('files_browser_window_url', $config);
+        $this->assertTrue($config['add_images']);
+    }
+}