Commit15982d4

committed

Normalize ./ path segments

1 parent3a29c1d commit15982d4Copy full SHA for 15982d4

File tree

-1

lines changed

src/Symfony/Component/Filesystem
- Filesystem.php
- Tests
  - FilesystemTest.php

-1

lines changed

Lines changed: 1 addition & 1 deletion

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

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -881,6 +881,9 @@ public function providePathsForMakePathRelative()`
`881`	`881`	`array('C:/../../aa/../bb/cc','C:/aa/dd/..','../bb/cc/'),`
`882`	`882`	`array('aa/bb','aa/cc','../bb/'),`
`883`	`883`	`array('aa/cc','bb/cc','../../aa/cc/'),`
	`884`	`+array('aa/bb','aa/./cc','../bb/'),`
	`885`	`+array('aa/./bb','aa/cc','../bb/'),`
	`886`	`+array('aa/./bb','aa/./cc','../bb/'),`
`884`	`887`	`);`
`885`	`888`
`886`	`889`	`if ('\\' ===DIRECTORY_SEPARATOR) {`

Comments

(0)