Merge remote-tracking branch 'origin/MAGETWO-58335-Uploaded-Image-2.1.3' into MAGETWO-58335-Uploaded-Image-2.1.3

Author: mtanniru

app/code/Magento/Customer/Model/FileProcessor.php

@@ -9,6 +9,7 @@
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Url\EncoderInterface;
@@ -56,12 +57,18 @@ class FileProcessor
      */
     private $allowedExtensions = [];
 
+    /**
+     * @var Mime
+     */
+    private $mime;
+
     /**
      * @param Filesystem $filesystem
      * @param UploaderFactory $uploaderFactory
      * @param UrlInterface $urlBuilder
      * @param EncoderInterface $urlEncoder
      * @param string $entityTypeCode
+     * @param Mime $mime
      * @param array $allowedExtensions
      */
     public function __construct(
@@ -70,13 +77,15 @@ public function __construct(
         UrlInterface $urlBuilder,
         EncoderInterface $urlEncoder,
         $entityTypeCode,
+        Mime $mime,
         array $allowedExtensions = []
     ) {
         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->uploaderFactory = $uploaderFactory;
         $this->urlBuilder = $urlBuilder;
         $this->urlEncoder = $urlEncoder;
         $this->entityTypeCode = $entityTypeCode;
+        $this->mime = $mime;
         $this->allowedExtensions = $allowedExtensions;
     }
 
@@ -110,6 +119,21 @@ public function getStat($fileName)
         return $result;
     }
 
+    /**
+     * Retrieve MIME type of requested file
+     *
+     * @param string $fileName
+     * @return string
+     */
+    public function getMimeType($fileName)
+    {
+        $filePath = $this->entityTypeCode . '/' . ltrim($fileName, '/');
+        $absoluteFilePath = $this->mediaDirectory->getAbsolutePath($filePath);
+
+        $result = $this->mime->getMimeType($absoluteFilePath);
+        return $result;
+    }
+
     /**
      * Check if the file exists
      *

app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php

@@ -37,6 +37,11 @@ class FileProcessorTest extends \PHPUnit_Framework_TestCase
      */
     private $mediaDirectory;
 
+    /**
+     * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mime;
+
     protected function setUp()
     {
         $this->mediaDirectory = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\WriteInterface')
@@ -60,6 +65,10 @@ protected function setUp()
 
         $this->urlEncoder = $this->getMockBuilder('Magento\Framework\Url\EncoderInterface')
             ->getMockForAbstractClass();
+
+        $this->mime = $this->getMockBuilder(\Magento\Framework\File\Mime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     private function getModel($entityTypeCode, array $allowedExtensions = [])
@@ -70,6 +79,7 @@ private function getModel($entityTypeCode, array $allowedExtensions = [])
             $this->urlBuilder,
             $this->urlEncoder,
             $entityTypeCode,
+            $this->mime,
             $allowedExtensions
         );
         return $model;
@@ -376,4 +386,26 @@ public function testMoveTemporaryFileWithException()
         $model = $this->getModel(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
         $model->moveTemporaryFile($filePath);
     }
+
+    public function testGetMimeType()
+    {
+        $fileName = '/filename.ext1';
+        $absoluteFilePath = '/absolute_path/customer/filename.ext1';
+
+        $expected = 'ext1';
+
+        $this->mediaDirectory->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER . '/' . ltrim($fileName, '/'))
+            ->willReturn($absoluteFilePath);
+
+        $this->mime->expects($this->once())
+            ->method('getMimeType')
+            ->with($absoluteFilePath)
+            ->willReturn($expected);
+
+        $model = $this->getModel(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
+
+        $this->assertEquals($expected, $model->getMimeType($fileName));
+    }
 }