[Filesystem] Fixed warnings in makePathRelative().

symfony · Apr 7, 2012 · ab724d7 · ab724d7
1 parent c9ed9c2
commit ab724d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Filesystem.php b/Filesystem.php
@@ -180,7 +180,7 @@ public function makePathRelative($endPath, $startPath)
     {
         // Find for which character the the common path stops
         $offset = 0;
-        while ($startPath[$offset] === $endPath[$offset]) {
+        while (isset($startPath[$offset]) && isset($endPath[$offset]) && $startPath[$offset] === $endPath[$offset]) {
             $offset++;
         }
 

diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -444,7 +444,8 @@ public function providePathsForMakePathRelative()
         $paths = array(
             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('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
+            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', '../src/Symfony/'),
         );
 
         // fix directory separator