Skip to content

Commit 64b2842

Browse files
fix reference usage in compile pass (#408)
1 parent 55e0243 commit 64b2842

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/DependencyInjection/Compiler/TemplatingValidatorPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Cmf\Bundle\RoutingBundle\Validator\Constraints\RouteDefaultsTemplatingValidator;
1515
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1616
use Symfony\Component\DependencyInjection\ContainerBuilder;
17+
use Symfony\Component\DependencyInjection\Reference;
1718

1819
/**
1920
* To avoid a BC-Break: If templating component exists, we will use the validator using general templating
@@ -29,10 +30,9 @@ class TemplatingValidatorPass implements CompilerPassInterface
2930
public function process(ContainerBuilder $container)
3031
{
3132
if ($container->has('templating')) {
32-
$templatingDefinition = $container->findDefinition('templating');
3333
$validatorDefinition = $container->getDefinition('cmf_routing.validator.route_defaults');
3434
$validatorDefinition->setClass(RouteDefaultsTemplatingValidator::class);
35-
$validatorDefinition->replaceArgument(1, $templatingDefinition);
35+
$validatorDefinition->replaceArgument(1, new Reference('templating'));
3636
}
3737
}
3838
}

tests/Functional/Doctrine/Phpcr/RouteProviderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function testGetRouteCollectionForRequestFormat()
9595
$this->assertEquals('html', $testroute->getDefault('_format'));
9696
list($key, $root) = each($routes);
9797
$this->assertEquals(self::ROUTE_ROOT, $key);
98-
$this->assertEquals(null, $root->getDefault('_format'));
98+
$this->assertNull($root->getDefault('_format'));
9999
}
100100

101101
/**

0 commit comments

Comments
 (0)