MAGETWO-90070: Image uploader improvements

Author: OlgaVasyltsun

app/code/Magento/Catalog/Model/ImageUploader.php

@@ -230,7 +230,6 @@ public function moveFileFromTmp($imageName)
      * @return string[]
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Exception
      */
     public function saveFileToTmpDir($fileId)
     {

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -478,7 +478,6 @@ public function deleteFile($target)
      * @param string $type Type of storage, e.g. image, media etc.
      * @return array File info Array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Exception
      */
     public function uploadFile($targetPath, $type = null)
     {
@@ -757,7 +756,7 @@ protected function _getRelativePathToRoot($path)
     }
 
     /**
-     * Prepare mime types config settings
+     * Prepare mime types config settings.
      *
      * @param string|null $type Type of storage, e.g. image, media etc.
      * @return array Array of allowed file extensions
@@ -770,7 +769,7 @@ private function getAllowedMimeTypes($type = null): array
     }
 
     /**
-     * Get list of allowed file extensions with mime type in values
+     * Get list of allowed file extensions with mime type in values.
      *
      * @param string|null $type
      * @return array
@@ -782,6 +781,7 @@ private function getExtensionsList($type = null): array
         } else {
             $allowed = $this->_extensions['allowed'];
         }
+
         return $allowed;
     }
 }

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -250,26 +250,22 @@ public function testGetResizeHeight()
 
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Directory /storage/some/another/dir is not under storage root path.
      */
     public function testDeleteDirectoryOverRoot()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('Directory %s is not under storage root path.', self::INVALID_DIRECTORY_OVER_ROOT)
-        );
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::INVALID_DIRECTORY_OVER_ROOT);
     }
 
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage We can't delete root directory /storage/root/dir right now.
      */
     public function testDeleteRootDirectory()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR)
-        );
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR);
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php

@@ -34,6 +34,9 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
      */
     private $mediaDirectory;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -46,12 +49,15 @@ protected function setUp()
             [
                 'baseTmpPath' => $this->mediaDirectory->getRelativePath('tmp'),
                 'basePath' => __DIR__,
-                'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png']
+                'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
             ]
         );
     }
 
-    public function testSaveFileToTmpDir()
+    /**
+     * @return void
+     */
+    public function testSaveFileToTmpDir(): void
     {
         $fileName = 'magento_small_image.jpg';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
@@ -75,8 +81,9 @@ public function testSaveFileToTmpDir()
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage File validation failed.
+     * @return void
      */
-    public function testSaveFileToTmpDirWithWrongExtension()
+    public function testSaveFileToTmpDirWithWrongExtension(): void
     {
         $fileName = 'text.txt';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
@@ -100,8 +107,9 @@ public function testSaveFileToTmpDirWithWrongExtension()
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage File validation failed.
+     * @return void
      */
-    public function testSaveFileToTmpDirWithWrongFile()
+    public function testSaveFileToTmpDirWithWrongFile(): void
     {
         $fileName = 'file.gif';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);

lib/internal/Magento/Framework/File/Mime.php

@@ -59,7 +59,7 @@ class Mime
     ];
 
     /**
-     * List of mime types that can be defined by file extension
+     * List of mime types that can be defined by file extension.
      *
      * @var array $defineByExtensionList
      */
@@ -125,7 +125,7 @@ private function getNativeMimeType(string $file): string
     }
 
     /**
-     * Get file extension by file name
+     * Get file extension by file name.
      *
      * @param string $file
      * @return string