Added Role hierarchy service.

Signed-off-by: Gergely Polonkai <polesz@w00d5t0ck.info>

src/KekRozsak/SecurityBundle/Entity/Role.php

@@ -78,62 +78,6 @@ class Role implements RoleInterface
 		return $this;
 	}
 
-	/**
-	 * @var boolean $admin
-	 * @ORM\Column(type="boolean", nullable=false)
-	 */
-	protected $admin;
-
-	/**
-	 * Set admin
-	 *
-	 * @param boolean $admin
-	 * @return Role
-	 */
-	public function setAdmin($admin)
-	{
-		$this->admin = $admin;
-		return $this;
-	}
-
-	/**
-	 * Get admin
-	 *
-	 * @return boolean
-	 */
-	public function isAdmin()
-	{
-		return $this->admin;
-	}
-
-	/**
-	 * @var boolean $superadmin
-	 * @ORM\Column(type="boolean", nullable=false)
-	 */
-	protected $superAdmin;
-
-	/**
-	 * Set superadmin
-	 *
-	 * @param boolean $superadmin
-	 * @return Role
-	 */
-	public function setSuperadmin($superadmin)
-	{
-		$this->superadmin = $superadmin;
-		return $this;
-	}
-
-	/**
-	 * Get superadmin
-	 *
-	 * @return boolean
-	 */
-	public function getSuperadmin()
-	{
-		return $this->superadmin;
-	}
-
 	/**
 	 * @var text description
 	 * @ORM\Column(type="string", length=150, nullable=true)
@@ -199,5 +143,27 @@ class Role implements RoleInterface
 	{
 		return $this->shortDescription;
 	}
+
+	/**
+	 * List of inherited Roles
+	 *
+	 * @ORM\ManyToMany(targetEntity="Role", fetch="LAZY")
+	 * @ORM\JoinTable(name="role_hierarchy", joinColumns={
+	 *     @ORM\JoinColumn(name="parent_role_id", referencedColumnName="id")
+	 * }, inverseJoinColumns={
+	 *     @ORM\JoinColumn(name="child_role_id", referencedColumnName="id")
+	 * })
+	 */
+	protected $inheritedRoles;
+
+	/**
+	 * Get all inherited roles
+	 *
+	 * @return Doctrine\Common\Collections\ArrayCollection
+	 */
+	public function getInheritedRoles()
+	{
+		return $this->inheritedRoles;
+	}
 }
 

src/KekRozsak/SecurityBundle/Entity/User.php

@@ -323,7 +323,18 @@ class User implements UserInterface, AdvancedUserInterface
 	}
 
 	/**
-	 * Get all roles
+	 * Get all roles as an ArrayCollection
+	 *
+	 * @return Doctrine\Common\Collections\ArrayCollection
+	 */
+	public function getRolesCollection()
+	{
+		return $this->roles;
+	}
+
+	/**
+	 * Get all roles, for UserInterface implementation. To get the
+	 * collection, use getRolesCollection() instead
 	 *
 	 * @return array
 	 */