Normalize ./ path segments

ausi · ausi · commit 15982d4b0837 · 2017-04-06T20:15:45.000+02:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ public function makePathRelative($endPath, $startPath)`
`378`	`378`	`foreach ($pathSegments as $segment) {`
`379`	`379`	`if ('..' === $segment) {`
`380`	`380`	`array_pop($result);`
`381`		`- } else {`
	`381`	`+ } elseif ('.' !== $segment) {`
`382`	`382`	`$result[] = $segment;`
`383`	`383`	`}`
`384`	`384`	`}`