MC-31227: Media folder update

- Resolved MHI and static test failures

Author: Hwashiang Yu

app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php

@@ -13,15 +13,15 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Io\File;
+use Magento\Framework\Filesystem\Io\File as IoFile;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
 use Magento\Framework\UrlInterface;
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\MediaStorage\Model\File\UploaderFactory;
 use Magento\Theme\Model\Design\Backend\Image;
-use PHPUnit_Framework_MockObject_MockObject;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -31,9 +31,14 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /** @var Image */
     private $imageBackend;
 
-    /** @var File */
+    /** @var IoFile */
     private $ioFileSystem;
 
+    /**
+     * @var ReadFactory||\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $tmpDirectory;
+
     /**
      * @inheritdoc
      */
@@ -50,7 +55,9 @@ public function setUp()
         $databaseHelper = $this->getMockObject(Database::class);
         $abstractResource = $this->getMockObject(AbstractResource::class);
         $abstractDb = $this->getMockObject(AbstractDb::class);
-        $this->ioFileSystem = $this->getMockObject(File::class);
+        $this->ioFileSystem = $this->getMockObject(IoFile::class);
+        $this->tmpDirectory = $this->getMockObject(ReadFactory::class);
+
         $this->imageBackend = new Image(
             $context,
             $registry,
@@ -64,7 +71,8 @@ public function setUp()
             $abstractDb,
             [],
             $databaseHelper,
-            $this->ioFileSystem
+            $this->ioFileSystem,
+            $this->tmpDirectory
         );
     }
 
@@ -79,9 +87,9 @@ public function tearDown()
     /**
      * @param string $class
      * @param array $methods
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    private function getMockObject(string $class, array $methods = []): PHPUnit_Framework_MockObject_MockObject
+    protected function getMockObject($class, $methods = [])
     {
         $builder =  $this->getMockBuilder($class)
             ->disableOriginalConstructor();
@@ -95,7 +103,7 @@ private function getMockObject(string $class, array $methods = []): PHPUnit_Fram
      * Test for beforeSave method with invalid file extension.
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Something is wrong with the file upload settings.
+     * @expectedExceptionMessage Invalid file provided.
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -13,9 +13,8 @@
 use Magento\Framework\Filesystem\Glob;
 
 /**
- * Class File
+ * Class File for Filesystem Driver
  *
- * @package Magento\Framework\Filesystem\Driver
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class File implements DriverInterface
@@ -593,13 +592,19 @@ public function fileOpen($path, $mode)
      */
     public function fileReadLine($resource, $length, $ending = null)
     {
-        $result = @stream_get_line($resource, $length, $ending);
-        if (false === $result) {
+        try {
+            $result = @stream_get_line($resource, $length, $ending);
+            if (false === $result) {
+                throw new FileSystemException(
+                    new \Magento\Framework\Phrase('File cannot be read %1', [$this->getWarningMessage()])
+                );
+            }
+            return $result;
+        } catch (\Exception $e) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase('File cannot be read %1', [$this->getWarningMessage()])
             );
         }
-        return $result;
     }
 
     /**