[SecurityBundle] Retrieve kernel.debug without checking its existence

l-vo · l-vo · commit 8a28b3da8787 · 2018-10-18T19:25:21.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
             throw new LogicException('No security voters found. You need to tag at least one with "security.voter".');
         }
 
-        $debug = $container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug');
+        $debug = $container->getParameter('kernel.debug');
 
         foreach ($voters as $voter) {
             $voterServiceId = (string) $voter;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -102,7 +102,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('collectors.xml');
         $loader->load('guard.xml');
 
-        if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
+        if ($container->getParameter('kernel.debug')) {
             $loader->load('security_debug.xml');
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php
@@ -40,6 +40,8 @@ public function testNoVoters()
     public function testThatSecurityVotersAreProcessedInPriorityOrder()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
         $container
             ->register('security.access.decision_manager', AccessDecisionManager::class)
             ->addArgument(array())
@@ -111,6 +113,7 @@ public function testThatVotersAreDecoratedInDebugMode(): void
     public function testThatVotersAreNotDecoratedWithoutDebugMode(): void
     {
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
 
         $voterDef1 = new Definition(Voter::class);
         $voterDef1->addTag('security.voter');
@@ -138,6 +141,7 @@ public function testThatVotersAreNotDecoratedWithoutDebugMode(): void
     public function testVoterMissingInterface()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
         $container
             ->register('security.access.decision_manager', AccessDecisionManager::class)
             ->addArgument(array())
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -511,6 +511,8 @@ protected function getContainer($file)
         $file .= '.'.$this->getFileExtension();
 
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
         $security = new SecurityExtension();
         $container->registerExtension($security);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -346,6 +346,8 @@ public function testDoNotRegisterTheUserProviderAliasWithMultipleProviders()
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', false);
+
         $security = new SecurityExtension();
         $container->registerExtension($security);
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)`
`43`	`43`	`throw new LogicException('No security voters found. You need to tag at least one with "security.voter".');`
`44`	`44`	`}`
`45`	`45`
`46`		`- $debug = $container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug');`
	`46`	`+ $debug = $container->getParameter('kernel.debug');`
`47`	`47`
`48`	`48`	`foreach ($voters as $voter) {`
`49`	`49`	`$voterServiceId = (string) $voter;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function load(array $configs, ContainerBuilder $container)`
`102`	`102`	`$loader->load('collectors.xml');`
`103`	`103`	`$loader->load('guard.xml');`
`104`	`104`
`105`		`- if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {`
	`105`	`+ if ($container->getParameter('kernel.debug')) {`
`106`	`106`	`$loader->load('security_debug.xml');`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -346,6 +346,8 @@ public function testDoNotRegisterTheUserProviderAliasWithMultipleProviders()`
`346`	`346`	`protected function getRawContainer()`
`347`	`347`	`{`
`348`	`348`	`$container = new ContainerBuilder();`
	`349`	`+ $container->setParameter('kernel.debug', false);`
	`350`	`+`
`349`	`351`	`$security = new SecurityExtension();`
`350`	`352`	`$container->registerExtension($security);`
`351`	`353`