Skip to content

Commit e0b8d87

Browse files
author
Joan He
committed
MAGETWO-29705: Fixed confusing Filesystem Read/Write Interfaces
1 parent ad2be67 commit e0b8d87

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public function setup()
7272
->will(
7373
$this->returnValueMap(
7474
[
75-
[DirectoryList::LIB_WEB, $this->libraryDirectoryMock],
76-
[DirectoryList::THEMES, $this->themesDirectoryMock],
75+
[DirectoryList::LIB_WEB, Filesystem\DriverPool::FILE, $this->libraryDirectoryMock],
76+
[DirectoryList::THEMES, Filesystem\DriverPool::FILE, $this->themesDirectoryMock],
7777
]
7878
)
7979
);

dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Framework\View\Asset;
77

88
use Magento\Framework\App\Filesystem\DirectoryList;
9+
use Magento\Framework\Filesystem\DriverPool;
910

1011
class MinifiedTest extends \PHPUnit_Framework_TestCase
1112
{
@@ -62,8 +63,8 @@ protected function setUp()
6263
$this->_filesystem->expects($this->any())
6364
->method('getDirectoryRead')
6465
->will($this->returnValueMap([
65-
[DirectoryList::STATIC_VIEW, $this->_staticViewDir],
66-
[DirectoryList::ROOT, $this->_rootDir],
66+
[DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->_staticViewDir],
67+
[DirectoryList::ROOT, DriverPool::FILE, $this->_rootDir],
6768
]));
6869
$this->_filesystem->expects($this->any())
6970
->method('getDirectoryWrite')

dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Framework\View\Asset;
88

99
use Magento\Framework\App\Filesystem\DirectoryList;
10+
use Magento\Framework\Filesystem\DriverPool;
1011

1112
/**
1213
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -245,9 +246,9 @@ protected function initFilesystem()
245246
$this->varDir = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\WriteInterface');
246247

247248
$readDirMap = [
248-
[DirectoryList::ROOT, $this->rootDirRead],
249-
[DirectoryList::STATIC_VIEW, $this->staticDirRead],
250-
[DirectoryList::VAR_DIR, $this->varDir],
249+
[DirectoryList::ROOT, DriverPool::FILE, $this->rootDirRead],
250+
[DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->staticDirRead],
251+
[DirectoryList::VAR_DIR, DriverPool::FILE, $this->varDir],
251252
];
252253

253254
$this->filesystem->expects($this->any())

dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Framework\View\Element;
77

8+
use Magento\Framework\Filesystem\DriverPool;
9+
810
class TemplateTest extends \PHPUnit_Framework_TestCase
911
{
1012
/**
@@ -50,9 +52,9 @@ protected function setUp()
5052
$this->_filesystem->expects($this->any())
5153
->method('getDirectoryRead')
5254
->will($this->returnValueMap([
53-
[\Magento\Framework\App\Filesystem\DirectoryList::THEMES, $themesDirMock],
54-
[\Magento\Framework\App\Filesystem\DirectoryList::APP, $appDirMock],
55-
[\Magento\Framework\App\Filesystem\DirectoryList::ROOT, $this->rootDirMock],
55+
[\Magento\Framework\App\Filesystem\DirectoryList::THEMES, DriverPool::FILE, $themesDirMock],
56+
[\Magento\Framework\App\Filesystem\DirectoryList::APP, DriverPool::FILE, $appDirMock],
57+
[\Magento\Framework\App\Filesystem\DirectoryList::ROOT, DriverPool::FILE, $this->rootDirMock],
5658
]));
5759

5860
$this->_templateEngine = $this->getMock(

0 commit comments

Comments
 (0)