symfony
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+4-7Lines changed: 4 additions & 7 deletions b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+4-7Lines changed: 4 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/DebugAccessDecisionManager.php
+1Lines changed: 1 addition & 0 deletions
@@ -45,10 +45,10 @@ public function process(ContainerBuilder $container)
             throw new LogicException('No security voters found. You need to tag at least one with "security.voter"');
         }
 
-        $container->getDefinition('security.access.decision_manager')->addMethodCall('setVoters', array(array_values($voters)));
-
-        if ($container->hasDefinition('debug.security.access.decision_manager')) {
-            $container->getDefinition('debug.security.access.decision_manager')->addMethodCall('setVoters', array(array_values($voters)));
-        }
+        $adm = $container->hasDefinition('debug.security.access.decision_manager')
+            ? $container->getDefinition('debug.security.access.decision_manager')
+            : $container->getDefinition('security.access.decision_manager')
+        ;
+        $adm->addMethodCall('setVoters', array(array_values($voters)));
     }
 }
@@ -66,6 +66,10 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('collectors.xml');
         $loader->load('guard.xml');
 
+        if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
+            $loader->load('security_debug.xml');
+        }
+
         if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
             $container->removeDefinition('security.expression_language');
             $container->removeDefinition('security.access.expression_voter');
@@ -97,13 +101,6 @@ public function load(array $configs, ContainerBuilder $container)
             $this->aclLoad($config['acl'], $container);
         }
 
-        if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
-            $loader->load('security_debug.xml');
-
-            $definition = $container->findDefinition('security.authorization_checker');
-            $definition->replaceArgument(2, new Reference('debug.security.access.decision_manager'));
-        }
-
         // add some required classes for compilation
         $this->addClassesToCompile(array(
             'Symfony\Component\Security\Http\Firewall',
 
@@ -61,6 +61,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
     public function setVoters(array $voters)
     {
         $this->voters = $voters;
+        $this->manager->setVoters($voters);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ public function process(ContainerBuilder $container)`
`45`	`45`	`throw new LogicException('No security voters found. You need to tag at least one with "security.voter"');`
`46`	`46`	`}`
`47`	`47`
`48`		`- $container->getDefinition('security.access.decision_manager')->addMethodCall('setVoters', array(array_values($voters)));`
`49`		`-`
`50`		`- if ($container->hasDefinition('debug.security.access.decision_manager')) {`
`51`		`- $container->getDefinition('debug.security.access.decision_manager')->addMethodCall('setVoters', array(array_values($voters)));`
`52`		`- }`
	`48`	`+ $adm = $container->hasDefinition('debug.security.access.decision_manager')`
	`49`	`+ ? $container->getDefinition('debug.security.access.decision_manager')`
	`50`	`+ : $container->getDefinition('security.access.decision_manager')`
	`51`	`+ ;`
	`52`	`+ $adm->addMethodCall('setVoters', array(array_values($voters)));`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)`
`61`	`61`	`public function setVoters(array $voters)`
`62`	`62`	`{`
`63`	`63`	`$this->voters = $voters;`
	`64`	`+ $this->manager->setVoters($voters);`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`/**`