From 282b05cbc197275d8c35a2abffbf4d1419d9d1f4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 15 Aug 2013 15:02:15 +0200 Subject: [PATCH 1/2] [HttpKernel] removed unused variable --- src/Symfony/Component/HttpKernel/Kernel.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 0ca2e990ba..9d9295f326 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -59,7 +59,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $booted; protected $name; protected $startTime; - protected $classes; protected $errorReportingLevel; const VERSION = '2.2.6-DEV'; @@ -84,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) { From dbd08551f8ac780f64152e548c798c8d94027d99 Mon Sep 17 00:00:00 2001 From: Christian Morgan Date: Thu, 15 Aug 2013 14:21:20 +0100 Subject: [PATCH 2/2] Added sleep() workaround for windows php rename bug --- .../Bundle/FrameworkBundle/Command/CacheClearCommand.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index e2bade38a7..dcefd6857b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -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); }