Skip to content

Commit 8a1c213

Browse files
author
Ivan Gavryshko
committed
Merge commit 'refs/pull/1486/head' of https://github.com/magento/magento2 into MAGETWO-47811-pull-1486
MAGETWO-47811: [Github][PR] Change misleading class method name #1486
2 parents d31d651 + 3dae271 commit 8a1c213

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/internal/Magento/Framework/Filesystem/DirectoryList.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static function validate($config)
9494
public function __construct($root, array $config = [])
9595
{
9696
static::validate($config);
97-
$this->root = $this->filterPath($root);
97+
$this->root = $this->normalizePath($root);
9898
$this->directories = static::getDefaultConfig();
9999
$this->directories[self::SYS_TMP] = [self::PATH => realpath(sys_get_temp_dir())];
100100

@@ -109,7 +109,7 @@ public function __construct($root, array $config = [])
109109

110110
// filter/validate values
111111
foreach ($this->directories as $code => $dir) {
112-
$path = $this->filterPath($dir[self::PATH]);
112+
$path = $this->normalizePath($dir[self::PATH]);
113113
if (!$this->isAbsolute($path)) {
114114
$path = $this->prependRoot($path);
115115
}
@@ -127,7 +127,7 @@ public function __construct($root, array $config = [])
127127
* @param string $path
128128
* @return string
129129
*/
130-
private function filterPath($path)
130+
private function normalizePath($path)
131131
{
132132
return str_replace('\\', '/', $path);
133133
}

0 commit comments

Comments
 (0)