Merge branch '2.2' into 2.3
* 2.2: Added sleep() workaround for windows php rename bug [HttpKernel] removed unused variable Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
This commit is contained in:
commit
91e5b10d05
@ -83,6 +83,9 @@ EOF
|
||||
$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);
|
||||
}
|
||||
|
||||
|
@ -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 @@ abstract class Kernel implements KernelInterface, TerminableInterface
|
||||
$this->booted = false;
|
||||
$this->rootDir = $this->getRootDir();
|
||||
$this->name = $this->getName();
|
||||
$this->classes = array();
|
||||
$this->bundles = array();
|
||||
|
||||
if ($this->debug) {
|
||||
|
Reference in New Issue
Block a user