From b272ab569f0f7b4b1e44905d22dbba1c304bcc50 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Sat, 28 Nov 2015 23:24:25 +0100
Subject: [PATCH] Make sure security.role_hierarchy.roles always exists

---
 .../Bundle/SecurityBundle/Resources/config/security.xml      | 1 +
 .../Tests/DependencyInjection/SecurityExtensionTest.php      | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index a729b421f4..bbcae99853 100644
--- 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
index 859f5b4e2d..dce30c758b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -115,10 +115,7 @@ class SecurityExtensionTest extends \PHPUnit_Framework_TestCase
 
         $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()