Normalize ./ path segments

symfony · Apr 6, 2017 · 15982d4 · 15982d4
1 parent 3a29c1d
commit 15982d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -378,7 +378,7 @@ public function makePathRelative($endPath, $startPath)
             foreach ($pathSegments as $segment) {
                 if ('..' === $segment) {
                     array_pop($result);
-                } else {
+                } elseif ('.' !== $segment) {
                     $result[] = $segment;
                 }
             }

diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -881,6 +881,9 @@ public function providePathsForMakePathRelative()
             array('C:/../../aa/../bb/cc', 'C:/aa/dd/..', '../bb/cc/'),
             array('aa/bb', 'aa/cc', '../bb/'),
             array('aa/cc', 'bb/cc', '../../aa/cc/'),
+            array('aa/bb', 'aa/./cc', '../bb/'),
+            array('aa/./bb', 'aa/cc', '../bb/'),
+            array('aa/./bb', 'aa/./cc', '../bb/'),
         );
 
         if ('\\' === DIRECTORY_SEPARATOR) {