merged branch mvrhov/cache_warmup_exception (PR symfony#2445)

fabpot · fabpot · commit 76148d0da692 · 2011-10-23T09:52:48.000+02:00
Commits ------- 6b872cf Check if cache_warmer service is available before doing the actual cache warmup Discussion ---------- fix cache warump exception when service is not available Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: N/A fixes [Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException] You have requested a non-existent service "cache_warmer". in console when FrameworkBundle is removed from kernel.
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -553,7 +553,7 @@ protected function initializeContainer()
         $this->container = new $class();
         $this->container->set('kernel', $this);
 
-        if (!$fresh) {
+        if (!$fresh && $this->container->has('cache_warmer')) {
             $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ protected function initializeContainer()`
`553`	`553`	`$this->container = new $class();`
`554`	`554`	`$this->container->set('kernel', $this);`
`555`	`555`
`556`		`- if (!$fresh) {`
	`556`	`+ if (!$fresh && $this->container->has('cache_warmer')) {`
`557`	`557`	`$this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));`
`558`	`558`	`}`
`559`	`559`	`}`