MAGETWO-29705: Fixed confusing Filesystem Read/Write Interfaces

Author: Joan He

app/code/Magento/Downloadable/Helper/Download.php

@@ -168,7 +168,7 @@ protected function _getHandle()
                     // Strip down protocol from path
                     $path = preg_replace('#.+://#', '', $path);
                 }
-                $this->_handle = $this->fileReadFactory->createWithDriverCode($path, $protocol);
+                $this->_handle = $this->fileReadFactory->create($path, $protocol);
             } elseif ($this->_linkType == self::LINK_TYPE_FILE) {
                 $this->_workingDirectory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
                 $fileExists = $this->_downloadableFile->ensureFileInFilesystem($this->_resourceFile);

dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php

@@ -30,7 +30,7 @@ public function testCreateWithDriverCode()
         $driverMock->expects($this->any())->method('isExists')->willReturn(true);
         $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
         $factory = new ReadFactory($driverPool);
-        $result = $factory->createWithDriverCode('path', 'driverCode');
+        $result = $factory->create('path', 'driverCode');
         $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
     }
 }

dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php

@@ -28,7 +28,7 @@ public function testCreateWithDriverCode()
         $driverMock->expects($this->any())->method('isExists')->willReturn(true);
         $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
         $factory = new WriteFactory($driverPool);
-        $result = $factory->createWithDriverCode('path', 'driverCode');
+        $result = $factory->create('path', 'driverCode');
         $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
     }
 

lib/internal/Magento/Framework/Filesystem.php

@@ -52,21 +52,23 @@ public function __construct(
     }
 
     /**
-     * Create an instance of directory with write permissions
+     * Create an instance of directory with read permissions
      *
-     * @param string $code
+     * @param string $directoryCode
+     * @param string $driverCode
      * @return \Magento\Framework\Filesystem\Directory\ReadInterface
      */
-    public function getDirectoryRead($code)
+    public function getDirectoryRead($directoryCode, $driverCode = DriverPool::FILE)
     {
+        $code = $directoryCode . '_' . $driverCode;
         if (!array_key_exists($code, $this->readInstances)) {
-            $this->readInstances[$code] = $this->readFactory->create($this->getDirPath($code));
+            $this->readInstances[$code] = $this->readFactory->create($this->getDirPath($directoryCode), $driverCode);
         }
         return $this->readInstances[$code];
     }
 
     /**
-     * Create an instance of directory with read permissions
+     * Create an instance of directory with write permissions
      *
      * @param string $directoryCode
      * @param string $driverCode

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

@@ -31,23 +31,14 @@ public function __construct(DriverPool $driverPool)
      * Create a readable file
      *
      * @param string $path
-     * @param DriverInterface $driver
+     * @param DriverInterface|string $driver Driver or driver code
      * @return \Magento\Framework\Filesystem\File\ReadInterface
      */
-    public function create($path, DriverInterface $driver = null)
+    public function create($path, $driver)
     {
+        if (is_string($driver)) {
+            return new Read($path, $this->driverPool->getDriver($driver));
+        }
         return new Read($path, $driver);
     }
-
-    /**
-     * Create a readable file
-     *
-     * @param string $path
-     * @param string|null $driverCode
-     * @return \Magento\Framework\Filesystem\File\ReadInterface
-     */
-    public function createWithDriverCode($path, $driverCode)
-    {
-        return new Read($path, $this->driverPool->getDriver($driverCode));
-    }
 }

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

@@ -31,25 +31,15 @@ public function __construct(DriverPool $driverPool)
      * Create a readable file.
      *
      * @param string $path
-     * @param DriverInterface $driver
+     * @param DriverInterface|string $driver Driver or driver code
      * @param string $mode [optional]
      * @return Write
      */
-    public function create($path, DriverInterface $driver, $mode = 'r')
+    public function create($path, $driver, $mode = 'r')
     {
+        if (is_string($driver)) {
+            return new Write($path, $this->driverPool->getDriver($driver), $mode);
+        }
         return new Write($path, $driver, $mode);
     }
-
-    /**
-     * Create a readable file.
-     *
-     * @param string $path
-     * @param string $driverCode
-     * @param string $mode [optional]
-     * @return Write
-     */
-    public function createWithDriverCode($path, $driverCode, $mode = 'r')
-    {
-        return new Write($path, $this->driverPool->getDriver($driverCode), $mode);
-    }
 }