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

[FrameworkBundle] fix cache:clear command

This commit is contained in:
Nicolas Grekas 2014-12-15 22:18:00 +01:00
parent 206ebc7844
commit a14153a4fd
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ EOF
} else { } else {
// the warmup cache dir name must have the same length than the real one // the warmup cache dir name must have the same length than the real one
// to avoid the many problems in serialized resources files // to avoid the many problems in serialized resources files
$realCacheDir = realpath($realCacheDir);
$warmupDir = substr($realCacheDir, 0, -1).'_'; $warmupDir = substr($realCacheDir, 0, -1).'_';
if ($filesystem->exists($warmupDir)) { if ($filesystem->exists($warmupDir)) {
@ -165,12 +166,14 @@ EOF
*/ */
protected function getTempKernel(KernelInterface $parent, $namespace, $parentClass, $warmupDir) protected function getTempKernel(KernelInterface $parent, $namespace, $parentClass, $warmupDir)
{ {
$rootDir = $parent->getRootDir(); $cacheDir = var_export($warmupDir, true);
$rootDir = var_export(realpath($parent->getRootDir()), true);
$logDir = var_export(realpath($parent->getLogDir()), true);
// the temp kernel class name must have the same length than the real one // the temp kernel class name must have the same length than the real one
// to avoid the many problems in serialized resources files // to avoid the many problems in serialized resources files
$class = substr($parentClass, 0, -1).'_'; $class = substr($parentClass, 0, -1).'_';
// the temp kernel name must be changed too // the temp kernel name must be changed too
$name = substr($parent->getName(), 0, -1).'_'; $name = var_export(substr($parent->getName(), 0, -1).'_', true);
$code = <<<EOF $code = <<<EOF
<?php <?php
@ -180,17 +183,22 @@ namespace $namespace
{ {
public function getCacheDir() public function getCacheDir()
{ {
return '$warmupDir'; return $cacheDir;
} }
public function getName() public function getName()
{ {
return '$name'; return $name;
} }
public function getRootDir() public function getRootDir()
{ {
return '$rootDir'; return $rootDir;
}
public function getLogDir()
{
return $logDir;
} }
protected function buildContainer() protected function buildContainer()

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

@ -586,12 +586,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
return array_merge( return array_merge(
array( array(
'kernel.root_dir' => $this->rootDir, 'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
'kernel.environment' => $this->environment, 'kernel.environment' => $this->environment,
'kernel.debug' => $this->debug, 'kernel.debug' => $this->debug,
'kernel.name' => $this->name, 'kernel.name' => $this->name,
'kernel.cache_dir' => $this->getCacheDir(), 'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
'kernel.logs_dir' => $this->getLogDir(), 'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
'kernel.bundles' => $bundles, 'kernel.bundles' => $bundles,
'kernel.charset' => $this->getCharset(), 'kernel.charset' => $this->getCharset(),
'kernel.container_class' => $this->getContainerClass(), 'kernel.container_class' => $this->getContainerClass(),