MAGETWO-21201: CLONE - Apply SUPEE-1805: Issue with disablign allow_url_fopen using the CMS WYSIWYG editor (patch)

Author: Yuri Kovsher

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

@@ -195,16 +195,6 @@ public function getConfig($data = [])
         return $config;
     }
 
-    /**
-     * Return URL for skin images placeholder
-     *
-     * @return string
-     */
-    public function getSkinImagePlaceholderUrl()
-    {
-        return $this->_assetRepo->getUrl(self::WYSIWYG_SKIN_IMAGE_PLACEHOLDER_ID);
-    }
-
     /**
      * Return path for skin images placeholder
      *

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2008,5 +2008,6 @@
     ],
     ['getLinksConfig', 'Magento\Downloadable\Block\Catalog\Product\Links'],
     ['getAuthorizationAmounts', 'Magento\Paypal\Model\Config'],
-    ['cleanTransactions', 'Magento\Paypal\Model\Observer']
+    ['cleanTransactions', 'Magento\Paypal\Model\Observer'],
+    ['getSkinImagePlaceholderUrl', 'Magento\Cms\Model\Wysiwyg\Config']
 ];

dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php

@@ -9,8 +9,6 @@
  */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
-    const WYSIWYG_SKIN_IMAGE_PLACEHOLDER_ID = 'Magento_Cms::images/wysiwyg_skin_image.png';
-
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Config
      */
@@ -187,21 +185,6 @@ public function getConfigDataProvider()
         ];
     }
 
-    /**
-     * @covers \Magento\Cms\Model\Wysiwyg\Config::getSkinImagePlaceholderUrl
-     */
-    public function testGetSkinImagePlaceholderUrl()
-    {
-        $url = '/some/url';
-
-        $this->assetRepoMock->expects($this->atLeastOnce())
-            ->method('getUrl')
-            ->with(self::WYSIWYG_SKIN_IMAGE_PLACEHOLDER_ID)
-            ->willReturn($url);
-
-        $this->assertEquals($url, $this->wysiwygConfig->getSkinImagePlaceholderUrl());
-    }
-
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Config::getSkinImagePlaceholderPath
      */
@@ -219,7 +202,7 @@ public function testGetSkinImagePlaceholderPath()
             ->willReturn($staticPath);
         $this->assetRepoMock->expects($this->any())
             ->method('createAsset')
-            ->with(self::WYSIWYG_SKIN_IMAGE_PLACEHOLDER_ID)
+            ->with(\Magento\Cms\Model\Wysiwyg\Config::WYSIWYG_SKIN_IMAGE_PLACEHOLDER_ID)
             ->willReturn($this->assetFileMock);
         $this->assetFileMock->expects($this->once())
             ->method('getPath')

dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php

@@ -12,9 +12,6 @@
  */
 class StoreTest extends \PHPUnit_Framework_TestCase
 {
-    const MEDIA = 'media';
-    const STATIC_VIEW = 'static';
-
     /**
      * @var \Magento\Store\Model\Store
      */
@@ -604,7 +601,7 @@ public function testGetBaseMediaDir()
         $expectedResult = 'pub/media';
         $this->filesystemMock->expects($this->once())
             ->method('getUri')
-            ->with(self::MEDIA)
+            ->with(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA)
             ->willReturn($expectedResult);
         $this->assertEquals($expectedResult, $this->store->getBaseMediaDir());
     }
@@ -617,7 +614,7 @@ public function testGetBaseStaticDir()
         $expectedResult = 'pub/static';
         $this->filesystemMock->expects($this->once())
             ->method('getUri')
-            ->with(self::STATIC_VIEW)
+            ->with(\Magento\Framework\App\Filesystem\DirectoryList::STATIC_VIEW)
             ->willReturn($expectedResult);
         $this->assertEquals($expectedResult, $this->store->getBaseStaticDir());
     }