diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source 
* 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:
Fabien Potencier 2013-08-15 19:08:02 +02:00
commit 91e5b10d05
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

@ -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);
}

3
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -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) {