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

Author: jakzal

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);

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/'),