Permalink
Browse files

Fixed notice in AddCacheWarmerPass if there is no cache warmer defined.

  • Loading branch information...
jakzal committed May 24, 2012
1 parent 8c6c86c commit 8da880c394b8e91d9797e1f1dfc384f2b46b910f
@@ -37,6 +37,10 @@ public function process(ContainerBuilder $container)
$warmers[$priority][] = new Reference($id);
}
+ if (empty($warmers)) {
+ return;
+ }
+
// sort by priority and flatten
krsort($warmers);
$warmers = call_user_func_array('array_merge', $warmers);
@@ -69,4 +69,24 @@ public function testThatCompilerPassIsIgnoredIfThereIsNoCacheWarmerDefinition()
$addCacheWarmerPass = new AddCacheWarmerPass();
$addCacheWarmerPass->process($container);
}
+
+ public function testThatCacheWarmersMightBeNotDefined()
+ {
+ $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+
+ $container->expects($this->atLeastOnce())
+ ->method('findTaggedServiceIds')
+ ->will($this->returnValue(array()));
+ $container->expects($this->never())->method('getDefinition');
+ $container->expects($this->atLeastOnce())
+ ->method('hasDefinition')
+ ->with('cache_warmer')
+ ->will($this->returnValue(true));
+
+ $definition->expects($this->never())->method('replaceArgument');
+
+ $addCacheWarmerPass = new AddCacheWarmerPass();
+ $addCacheWarmerPass->process($container);
+ }
}

0 comments on commit 8da880c

Please sign in to comment.