[Filesystem] Fixed relative path calculation for paths with various combinations of trailing directory separators.

jakzal · jakzal · commit bc93787a0d77 · 2012-04-07T21:19:12.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -185,7 +185,8 @@ public function makePathRelative($endPath, $startPath)
         }
 
         // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        $depth = substr_count(substr($startPath, $offset), DIRECTORY_SEPARATOR) + 1;
+        $diffPath = trim(substr($startPath, $offset), DIRECTORY_SEPARATOR);
+        $depth = substr_count($diffPath, DIRECTORY_SEPARATOR) + 1;
 
         // Repeated "../" for each level need to reach the common path
         $traverser = str_repeat('../', $depth);
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -443,6 +443,9 @@ public function providePathsForMakePathRelative()
     {
         $paths = array(
             array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component', '../'),
+            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'),
+            array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'),
+            array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
             array('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../'),
             array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
             array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', '../src/Symfony/'),

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ public function makePathRelative($endPath, $startPath)`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`// Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)`
`188`		`- $depth = substr_count(substr($startPath, $offset), DIRECTORY_SEPARATOR) + 1;`
	`188`	`+ $diffPath = trim(substr($startPath, $offset), DIRECTORY_SEPARATOR);`
	`189`	`+ $depth = substr_count($diffPath, DIRECTORY_SEPARATOR) + 1;`
`189`	`190`
`190`	`191`	`// Repeated "../" for each level need to reach the common path`
`191`	`192`	`$traverser = str_repeat('../', $depth);`