Merge remote branch 'kriswallsmith/assetic/filter-pass-fix'

fabpot · fabpot · commit 1b71e35770a2 · 2011-05-16T07:52:14.000+02:00
* kriswallsmith/assetic/filter-pass-fix:
  [AsseticBundle] fixed compiler pass when closure filter is enabled but no jar registered
diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/CheckClosureFilterPass.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/CheckClosureFilterPass.php
@@ -23,8 +23,7 @@ class CheckClosureFilterPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if ($container->hasDefinition('assetic.filter.closure.jar') &&
-            $container->getParameterBag()->resolveValue($container->getParameter('assetic.filter.closure.jar'))) {
+        if ($container->hasDefinition('assetic.filter.closure.jar') && $container->hasParameter('assetic.filter.closure.jar')) {
             $container->removeDefinition('assetic.filter.closure.api');
         } elseif ($container->hasDefinition('assetic.filter.closure.api')) {
             $container->removeDefinition('assetic.filter.closure.jar');

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ class CheckClosureFilterPass implements CompilerPassInterface`
`23`	`23`	`{`
`24`	`24`	`public function process(ContainerBuilder $container)`
`25`	`25`	`{`
`26`		`- if ($container->hasDefinition('assetic.filter.closure.jar') &&`
`27`		`- $container->getParameterBag()->resolveValue($container->getParameter('assetic.filter.closure.jar'))) {`
	`26`	`+ if ($container->hasDefinition('assetic.filter.closure.jar') && $container->hasParameter('assetic.filter.closure.jar')) {`
`28`	`27`	`$container->removeDefinition('assetic.filter.closure.api');`
`29`	`28`	`} elseif ($container->hasDefinition('assetic.filter.closure.api')) {`
`30`	`29`	`$container->removeDefinition('assetic.filter.closure.jar');`