Merge branch 'MC-19090' of https://github.com/magento-tango/magento2ce into PR-2019-08-22

Author: Oleksandr Iegorov

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -121,11 +121,15 @@ public function beforeSave($object)
 
         if ($this->fileResidesOutsideCategoryDir($value)) {
             // use relative path for image attribute so we know it's outside of category dir when we fetch it
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $value[0]['url'] = parse_url($value[0]['url'], PHP_URL_PATH);
             $value[0]['name'] = $value[0]['url'];
         }
 
         if ($imageName = $this->getUploadedImageName($value)) {
-            $imageName = $this->checkUniqueImageName($imageName);
+            if (!$this->fileResidesOutsideCategoryDir($value)) {
+                $imageName = $this->checkUniqueImageName($imageName);
+            }
             $object->setData($this->additionalData . $attributeName, $value);
             $object->setData($attributeName, $imageName);
         } elseif (!is_string($value)) {
@@ -182,7 +186,7 @@ private function fileResidesOutsideCategoryDir($value)
             return false;
         }
 
-        return strpos($fileUrl, $baseMediaDir) === 0;
+        return strpos($fileUrl, $baseMediaDir) !== false;
     }
 
     /**

app/code/Magento/Catalog/Model/Category/FileInfo.php

@@ -10,6 +10,8 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class FileInfo
@@ -48,16 +50,26 @@ class FileInfo
      */
     private $pubDirectory;
 
+    /**
+     * Store manager
+     *
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param Filesystem $filesystem
      * @param Mime $mime
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Filesystem $filesystem,
-        Mime $mime
+        Mime $mime,
+        StoreManagerInterface $storeManager
     ) {
         $this->filesystem = $filesystem;
         $this->mime = $mime;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -152,7 +164,8 @@ public function isExist($fileName)
      */
     private function getFilePath($fileName)
     {
-        $filePath = ltrim($fileName, '/');
+        $filePath = $this->removeStorePath($fileName);
+        $filePath = ltrim($filePath, '/');
 
         $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
         $isFileNameBeginsWithMediaDirectoryPath = $this->isBeginsWithMediaDirectoryPath($fileName);
@@ -177,14 +190,39 @@ private function getFilePath($fileName)
      */
     public function isBeginsWithMediaDirectoryPath($fileName)
     {
-        $filePath = ltrim($fileName, '/');
+        $filePath = $this->removeStorePath($fileName);
+        $filePath = ltrim($filePath, '/');
 
         $mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
         $isFileNameBeginsWithMediaDirectoryPath = strpos($filePath, (string) $mediaDirectoryRelativeSubpath) === 0;
 
         return $isFileNameBeginsWithMediaDirectoryPath;
     }
 
+    /**
+     * Clean store path in case if it's exists
+     *
+     * @param string $path
+     * @return string
+     */
+    private function removeStorePath(string $path): string
+    {
+        $result = $path;
+        try {
+            $storeUrl = $this->storeManager->getStore()->getBaseUrl();
+        } catch (NoSuchEntityException $e) {
+            return $result;
+        }
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $path = parse_url($path, PHP_URL_PATH);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $storePath = parse_url($storeUrl, PHP_URL_PATH);
+        $storePath = rtrim($storePath, '/');
+
+        $result = preg_replace('/^' . preg_quote($storePath, '/') . '/', '', $path);
+        return $result;
+    }
+
     /**
      * Get media directory subpath relative to base directory path
      *

app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php

@@ -179,37 +179,29 @@ public function testBeforeSaveAttributeFileNameOutsideOfCategoryDir()
     {
         $model = $this->setUpModelForAfterSave();
         $model->setAttribute($this->attribute);
-
-        $mediaDirectoryMock = $this->createMock(WriteInterface::class);
-        $this->filesystem->expects($this->once())
-            ->method('getDirectoryWrite')
-            ->with(DirectoryList::MEDIA)
-            ->willReturn($mediaDirectoryMock);
+        $imagePath = '/pub/media/wysiwyg/test123.jpg';
         $this->filesystem
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('getUri')
             ->with(DirectoryList::MEDIA)
             ->willReturn('pub/media');
-        $mediaDirectoryMock->expects($this->once())
-            ->method('getAbsolutePath')
-            ->willReturn('/pub/media/wysiwyg/test123.jpg');
 
         $object = new \Magento\Framework\DataObject(
             [
                 'test_attribute' => [
                     [
                         'name' => 'test123.jpg',
-                        'url' => '/pub/media/wysiwyg/test123.jpg',
+                        'url' => $imagePath,
                     ],
                 ],
             ]
         );
 
         $model->beforeSave($object);
 
-        $this->assertEquals('test123.jpg', $object->getTestAttribute());
+        $this->assertEquals($imagePath, $object->getTestAttribute());
         $this->assertEquals(
-            [['name' => '/pub/media/wysiwyg/test123.jpg', 'url' => '/pub/media/wysiwyg/test123.jpg']],
+            [['name' => $imagePath, 'url' => $imagePath]],
             $object->getData('_additional_data_test_attribute')
         );
     }

app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php

@@ -13,6 +13,8 @@
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Test for Magento\Catalog\Model\Category\FileInfo class.
@@ -44,6 +46,16 @@ class FileInfoTest extends TestCase
      */
     private $pubDirectory;
 
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var Store|MockObject
+     */
+    private $store;
+
     /**
      * @var FileInfo
      */
@@ -60,6 +72,16 @@ protected function setUp()
         $this->pubDirectory = $pubDirectory = $this->getMockBuilder(ReadInterface::class)
             ->getMockForAbstractClass();
 
+        $this->store = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->store);
+
         $this->filesystem = $this->getMockBuilder(Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -94,7 +116,8 @@ function ($arg) use ($baseDirectory, $pubDirectory) {
 
         $this->model = new FileInfo(
             $this->filesystem,
-            $this->mime
+            $this->mime,
+            $this->storeManager
         );
     }