Merge branch '2.1' into 2.2

* 2.1:
  [FrameworkBundle] Fix code status in dockblock
  Fixed test to use Reflection
  [Finder] fixed a potential issue on Solaris where INF value is wrong (refs #7269)
  Update RouteCompiler.php
  [FrameworkBundle] avoids cache:clear to break if new/old folders already exist
  [HttpKernel] Fixed possible profiler token collision (closes #7272, closes #7171)
  [ClassLoader] tweaked test
  [ClassLoader] made DebugClassLoader idempotent
  [DomCrawler] Fix relative path handling in links

Conflicts:
	src/Symfony/Component/DomCrawler/Link.php
	src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
	src/Symfony/Component/Routing/RouteCompiler.php

Author: fabpot

Command/CacheClearCommand.php

@@ -62,23 +62,32 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new \RuntimeException(sprintf('Unable to write in the "%s" directory', $realCacheDir));
         }
 
+        $filesystem = $this->getContainer()->get('filesystem');
         $kernel = $this->getContainer()->get('kernel');
         $output->writeln(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         $this->getContainer()->get('cache_clearer')->clear($realCacheDir);
 
+        if ($filesystem->exists($oldCacheDir)) {
+            $filesystem->remove($oldCacheDir);
+        }
+
         if ($input->getOption('no-warmup')) {
-            rename($realCacheDir, $oldCacheDir);
+            $filesystem->rename($realCacheDir, $oldCacheDir);
         } else {
             $warmupDir = $realCacheDir.'_new';
 
+            if ($filesystem->exists($warmupDir)) {
+                $filesystem->remove($warmupDir);
+            }
+
             $this->warmup($warmupDir, !$input->getOption('no-optional-warmers'));
 
-            rename($realCacheDir, $oldCacheDir);
-            rename($warmupDir, $realCacheDir);
+            $filesystem->rename($realCacheDir, $oldCacheDir);
+            $filesystem->rename($warmupDir, $realCacheDir);
         }
 
-        $this->getContainer()->get('filesystem')->remove($oldCacheDir);
+        $filesystem->remove($oldCacheDir);
     }
 
     protected function warmup($warmupDir, $enableOptionalWarmers = true)

Controller/RedirectController.php

@@ -26,8 +26,8 @@ class RedirectController extends ContainerAware
     /**
      * Redirects to another route with the given name.
      *
-     * The response status code is 301 if the permanent parameter is false (default),
-     * and 302 if the redirection is permanent.
+     * The response status code is 302 if the permanent parameter is false (default),
+     * and 301 if the redirection is permanent.
      *
      * In case the route name is empty, the status code will be 404 when permanent is false
      * and 410 otherwise.
@@ -52,8 +52,8 @@ public function redirectAction($route, $permanent = false)
     /**
      * Redirects to a URL.
      *
-     * The response status code is 301 if the permanent parameter is false (default),
-     * and 302 if the redirection is permanent.
+     * The response status code is 302 if the permanent parameter is false (default),
+     * and 301 if the redirection is permanent.
      *
      * In case the path is empty, the status code will be 404 when permanent is false
      * and 410 otherwise.