bug #16734 Make sure security.role_hierarchy.roles always exists (WouterJ)

fabpot · fabpot · commit ff2addc4f9cc · 2015-11-29T09:13:24.000+01:00
This PR was squashed before being merged into the 2.8 branch (closes #16734). Discussion ---------- Make sure security.role_hierarchy.roles always exists | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16731 | License | MIT | Doc PR | - Commits ------- b272ab5 Make sure security.role_hierarchy.roles always exists
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -47,6 +47,7 @@
         <parameter key="security.validator.user_password.class">Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator</parameter>
 
         <parameter key="security.expression_language.class">Symfony\Component\Security\Core\Authorization\ExpressionLanguage</parameter>
+        <parameter key="security.role_hierarchy.roles" type="collection" />
     </parameters>
 
     <services>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -115,10 +115,7 @@ public function testDisableRoleHierarchyVoter()
 
         $container->compile();
 
-        $admDefinition = $container->getDefinition('security.access.decision_manager');
-        $registeredVoters = array_map('strval', $admDefinition->getArgument(0));
-
-        $this->assertNotContains('security.access.role_hierarchy_voter', $registeredVoters);
+        $this->assertFalse($container->hasDefinition('security.access.role_hierarchy_voter'));
     }
 
     protected function getRawContainer()

Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,7 @@ public function testDisableRoleHierarchyVoter()`
`115`	`115`
`116`	`116`	`$container->compile();`
`117`	`117`
`118`		`- $admDefinition = $container->getDefinition('security.access.decision_manager');`
`119`		`- $registeredVoters = array_map('strval', $admDefinition->getArgument(0));`
`120`		`-`
`121`		`- $this->assertNotContains('security.access.role_hierarchy_voter', $registeredVoters);`
	`118`	`+ $this->assertFalse($container->hasDefinition('security.access.role_hierarchy_voter'));`
`122`	`119`	`}`
`123`	`120`
`124`	`121`	`protected function getRawContainer()`