Merge branch '3.2'

fabpot · fabpot · commit 0e92e0a7bad0 · 2017-02-21T18:38:51.000-08:00
* 3.2:
  fixed bad merge
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -46,7 +46,6 @@ public function process(ContainerBuilder $container)
         }
 
         $adm = $container->getDefinition($container->hasDefinition('debug.security.access.decision_manager') ? 'debug.security.access.decision_manager' : 'security.access.decision_manager');
-        $adm->addMethodCall('setVoters', array(array_values($voters)));
         $adm->addMethodCall('setVoters', array($voters));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public function process(ContainerBuilder $container)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$adm = $container->getDefinition($container->hasDefinition('debug.security.access.decision_manager') ? 'debug.security.access.decision_manager' : 'security.access.decision_manager');`
`49`		`- $adm->addMethodCall('setVoters', array(array_values($voters)));`
`50`	`49`	`$adm->addMethodCall('setVoters', array($voters));`
`51`	`50`	`}`
`52`	`51`	`}`