Merge branch '2.2' into 2.3

fabpot · fabpot · commit 91e5b10d0595 · 2013-08-15T19:08:02.000+02:00
* 2.2:
  Added sleep() workaround for windows php rename bug
  [HttpKernel] removed unused variable

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -83,6 +83,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
 
             $filesystem->rename($realCacheDir, $oldCacheDir);
+            if (defined('PHP_WINDOWS_VERSION_BUILD')) {
+                sleep(1);  // workaround for windows php rename bug
+            }
             $filesystem->rename($warmupDir, $realCacheDir);
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,8 +58,8 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $booted;
     protected $name;
     protected $startTime;
-    protected $classes;
     protected $loadClassCache;
+    protected $errorReportingLevel;
 
     const VERSION         = '2.3.4-DEV';
     const VERSION_ID      = '20304';
@@ -83,7 +83,6 @@ public function __construct($environment, $debug)
         $this->booted = false;
         $this->rootDir = $this->getRootDir();
         $this->name = $this->getName();
-        $this->classes = array();
         $this->bundles = array();
 
         if ($this->debug) {

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`83`	`83`	`$this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));`
`84`	`84`
`85`	`85`	`$filesystem->rename($realCacheDir, $oldCacheDir);`
	`86`	`+ if (defined('PHP_WINDOWS_VERSION_BUILD')) {`
	`87`	`+ sleep(1); // workaround for windows php rename bug`
	`88`	`+ }`
`86`	`89`	`$filesystem->rename($warmupDir, $realCacheDir);`
`87`	`90`	`}`
`88`	`91`