Changeset 12847

Timestamp:

11/09/08 20:01:49 (8 months ago)

Author:

FabianLange

Message:

[1.2] needed to move relative path calculation into sfFilesystem to prevent collision with the mirror command

Files:

• branches/1.2/lib/plugin/sfSymfonyPluginManager.class.php (modified) (2 diffs)
• branches/1.2/lib/task/sfFilesystem.class.php (modified) (2 diffs)
• branches/1.2/test/unit/plugin/sfSymfonyPluginManagerTest.php (deleted)

branches/1.2/lib/plugin/sfSymfonyPluginManager.class.php

@@ -73 +73 @@
-
-      $filesystem = new sfFilesystem();
-
-
+
-    }
-  }
@@ -173 +172 @@
-    return true;
-  }
-
-  /**
-   * Calculates the relative path from one to another directory.
-   * If it would go beyond sf_root_dir the absolute path of $to is returned.
-   *
-   * @param string $from directory from that the relative path shall be calculated
-   * @param string $to target directory
-   */ 
-  protected function getRelativePath($from, $to)
-  {
-    $root = $this->environment->getOption('sf_root_dir').DIRECTORY_SEPARATOR;
-    if (strstr($from, $root) && strstr($to, $root))
-    {
-      $levelUp = substr_count($from, DIRECTORY_SEPARATOR, strlen($root));
-      // up that many level
-      $relativePath  = str_repeat("..".DIRECTORY_SEPARATOR, $levelUp);
-      // down the remaining $to path
-      $relativePath .= substr($to, strlen($root));
-      return $relativePath;
-    }
-    else
-    {
-      // $to is outside sf_root_dir so return absolute path
-      return $to;
-    }
-  }
-}

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

@@ -227 +227 @@
-
-  /**
+   * Creates a symbolic link using a relative path if possible.
+   *
+   * @param string $originDir      The origin directory path
+   * @param string $targetDir      The symbolic link name
+   * @param bool   $copyOnWindows  Whether to copy files if on windows
+   */
+  public function relativeSymlink($originDir, $targetDir, $copyOnWindows = false)
+  {
+    if (function_exists('symlink') || !$copyOnWindows)
+    {
+      $originDir = $this->calculateRelativeDir($targetDir, $originDir);
+    }
+    $this->symlink($originDir, $targetDir, $copyOnWindows);
+  }
+
+  /**
-   * Mirrors a directory to another.
-   *
@@ -326 +342 @@
-    $this->dispatcher->notify(new sfEvent($this, 'command.log', array($message)));
-  }
+
+  /**
+   * Calculates the relative path from one to another directory.
+   * If they share no common path the absolute target dir is returned
+   *
+   * @param string $from directory from that the relative path shall be calculated
+   * @param string $to target directory
+   */ 
+  protected function calculateRelativeDir($from, $to)
+  {
+    $commonChars = 0;
+    $minPathLength = min(strlen($from), strlen($to));
+    // count how many chars the strings have in common
+    for ($i = 0; $i < $minPathLength; $i++)
+    {
+      if ($from[$i] != $to[$i]) break;
+      $commonChars++;
+    }
+    if ($commonChars)
+    {
+      $levelUp = substr_count($from, DIRECTORY_SEPARATOR, $commonChars);
+      // up that many level
+      $relativeDir  = str_repeat("..".DIRECTORY_SEPARATOR, $levelUp);
+      // down the remaining $to path
+      $relativeDir .= substr($to, $commonChars);
+      return $relativeDir;
+    }
+    return $to;
+  }
-}