Merge remote-tracking branch 'remotes/origin/MAGETWO-51116' into PR-3

Author: aohorodnyk

app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php

@@ -38,7 +38,7 @@ public function __construct(
         \Magento\Framework\File\Size $fileSize
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
+        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $this->fileSize = $fileSize;
     }
 

app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Api\Data\ImageContentInterface;
-use Magento\Catalog\Model\Product\Option\Type\File\ValidateFactory;
 use Magento\Framework\Api\ImageProcessor;
 use Magento\Framework\Filesystem;
 
@@ -20,7 +19,7 @@ class Processor
     protected $imageProcessor;
 
     /** @var string */
-    protected $destinationFolder = '/custom_options/quote';
+    protected $destinationFolder = 'custom_options/quote';
 
     /**
      * @param Filesystem $filesystem
@@ -40,9 +39,8 @@ public function __construct(
      */
     protected function saveFile(ImageContentInterface $imageContent)
     {
-        $uri = $this->filesystem->getUri(DirectoryList::MEDIA);
         $filePath = $this->imageProcessor->processImageContent($this->destinationFolder, $imageContent);
-        return $uri . $this->destinationFolder . $filePath;
+        return $this->destinationFolder . $filePath;
     }
 
     /**
@@ -54,8 +52,8 @@ public function processFileContent(ImageContentInterface $imageContent)
     {
         $filePath = $this->saveFile($imageContent);
 
-        $fileAbsolutePath = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath($filePath);
-        $fileHash = md5($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->readFile($filePath));
+        $fileAbsolutePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($filePath);
+        $fileHash = md5($this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->readFile($filePath));
         $imageSize = getimagesize($fileAbsolutePath);
         $result = [
             'type' => $imageContent->getType(),

app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Validator.php

@@ -8,7 +8,6 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Catalog\Model\Product\Option\Type\Date" type="Magento\Catalog\Model\Webapi\Product\Option\Type\Date" />
-    <preference for="Magento\Catalog\Model\Product\Option\Type\File\ValidatorInfo" type="Magento\Catalog\Model\Webapi\Product\Option\Type\File\Validator" />
 
     <type name="Magento\Catalog\Helper\Product\ConfigurationPool">
         <arguments>

app/code/Magento/Catalog/Test/Unit/Webapi/Product/Option/Type/File/ValidatorTest.php

@@ -16,7 +16,7 @@ class ValidatorInfoTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\ObjectManager
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;
 
@@ -164,11 +164,13 @@ protected function getProductOption(array $options = [])
      */
     protected function getOptionValue()
     {
-        $file     = 'var/tmp/magento_small_image.jpg';
+        /** @var \Magento\Catalog\Model\Product\Media\Config $config */
+        $config = $this->objectManager->get('Magento\Catalog\Model\Product\Media\Config');
+        $file = $config->getBaseTmpMediaPath() . '/magento_small_image.jpg';
 
-        /** @var \Magento\Framework\App\Filesystem $filesystem */
+        /** @var \Magento\Framework\Filesystem $filesystem */
         $filesystem = $this->objectManager->get('Magento\Framework\Filesystem');
-        $tmpDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::ROOT);
+        $tmpDirectory = $filesystem->getDirectoryRead(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
         $filePath = $tmpDirectory->getAbsolutePath($file);
 
         return [