Changeset 13319

Timestamp:

11/24/08 23:05:41 (7 months ago)

Author:

FabianLange

Message:

[1.2] fixed relative symlinks that were incorrectly when some directories had the same prefix. added plenty tests for this.

Files:

• branches/1.2/lib/task/sfFilesystem.class.php (modified) (1 diff)
• branches/1.2/test/unit/task/sfFilesystemTest.php (modified) (3 diffs)

branches/1.2/lib/task/sfFilesystem.class.php

@@ -352 +352 @@
-  protected function calculateRelativeDir($from, $to)
-  {
-Cha
+Di
-    $minPathLength = min(strlen($from), strlen($to));
+
-    // count how many chars the strings have in common
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-      // up that many level
-      $relativeDir  = str_repeat("..".DIRECTORY_SEPARATOR, $levelUp);
-      // down the remaining $to path
-Cha
+Di
-      return $relativeDir;
-    }

branches/1.2/test/unit/task/sfFilesystemTest.php

@@ -10 +10 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
+//lazy constant, cause it is so often used in this test
+define("DS", DIRECTORY_SEPARATOR);
+
-class myFilesystem extends sfFilesystem
-{
@@ -18 +21 @@
-}
-
-3
+6
-
-$dispatcher = new sfEventDispatcher();
@@ -24 +27 @@
-
-$t->diag('sfFilesystem calculates relative pathes');
-IRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'sfproject'.DIRECTORY_SEPARATOR
-IRECTORY_SEPARATOR
-IRECTORY_SEPARATOR.'myplugin'.DIRECTORY_SEPARATOR
-IRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'myplugin'.DIRECTORY_SEPARATOR
+S.'tmp'.DS.'sfproject'.DS
+S
+S.'myplugin'.DS
+S.'plugins'.DS.'myplugin'.DS
-
-
-
-
+
+
+
+
+
+
+
-
-$source = 'c:\sfproject\web\myplugin';
-$target = 'd:\symfony\plugins\myplugin\web';
-$t->is($filesystem->calculateRelativeDir($source, $target), 'd:\symfony\plugins\myplugin\web', '->calculateRelativeDir() returns absolute path when no relative path possible');
+
+$source = $common.'web'.DS.'myplugin';
+$target = $common.'web'.DS.'myotherplugin'.DS.'sub';
+$t->is($filesystem->calculateRelativeDir($source, $target), 'myotherplugin'.DS.'sub', '->calculateRelativeDir() correctly calculates the relative path for dirs that share chars');
+
+$source = $common.'web'.DS.'myplugin';
+$target = $common.'web'.DS.'motherplugin'.DS.'sub';
+$t->is($filesystem->calculateRelativeDir($source, $target), 'motherplugin'.DS.'sub', '->calculateRelativeDir() correctly calculates the relative path for dirs that share chars');