[Filesystem] Fixed warnings in makePathRelative().

jakzal · jakzal · commit 100e97ebe736 · 2012-04-07T08:23:20.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/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/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/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

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public function makePathRelative($endPath, $startPath)`
`180`	`180`	`{`
`181`	`181`	`// Find for which character the the common path stops`
`182`	`182`	`$offset = 0;`
`183`		`- while ($startPath[$offset] === $endPath[$offset]) {`
	`183`	`+ while (isset($startPath[$offset]) && isset($endPath[$offset]) && $startPath[$offset] === $endPath[$offset]) {`
`184`	`184`	`$offset++;`
`185`	`185`	`}`
`186`	`186`