merged branch jonathaningram/patch-1 (PR symfony#2466)

fabpot · fabpot · commit 68eb068fd848 · 2011-10-25T11:05:13.000+02:00
Commits ------- 6343bef [HttpKernel] Updated mirror method to check for symlinks before dirs and files Discussion ---------- [HttpKernel] Updated mirror method to check for symlinks before dirs and files Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#2436
diff --git a/src/Symfony/Component/HttpKernel/Util/Filesystem.php b/src/Symfony/Component/HttpKernel/Util/Filesystem.php
@@ -204,12 +204,12 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
         foreach ($iterator as $file) {
             $target = $targetDir.'/'.str_replace($originDir.DIRECTORY_SEPARATOR, '', $file->getPathname());
 
-            if (is_dir($file)) {
+            if (is_link($file)) {
+                $this->symlink($file, $target);
+            } else if (is_dir($file)) {
                 $this->mkdir($target);
             } else if (is_file($file) || ($copyOnWindows && is_link($file))) {
                 $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-            } else if (is_link($file)) {
-                $this->symlink($file, $target);
             } else {
                 throw new \RuntimeException(sprintf('Unable to guess "%s" file type.', $file));
             }
