[Beeframework-svn] SF.net SVN: beeframework:[110] trunk/framework/Bee/Security/UserDetails/ Doctrine2

[<m_p...@us...>]

Revision: 110
          http://sourceforge.net/p/beeframework/code/110
Author:   m_plomer
Date:     2013-11-04 16:39:45 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
- SimpleUser: extracted SimpleUserBase to facilitate sub-classing

Modified Paths:
--------------
    trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUser.php

Added Paths:
-----------
    trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserBase.php

Modified: trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUser.php
===================================================================
--- trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUser.php	2013-11-04 15:24:57 UTC (rev 109)
+++ trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUser.php	2013-11-04 16:39:45 UTC (rev 110)
@@ -4,58 +4,12 @@
 use Bee_Security_IUserDetails;
 
 /**
- * Base class for user entities - also usable as simple user entity (WIP)
+ * Simple user entity class
  * @package Bee\Security\UserDetails\Doctrine2
  * @Entity
  * @Table(name="bee_security_user")
  */
-class SimpleUser extends UserBase {
-
-	/**
-	 * @var array
-	 * @Column(name="roles", type="simple_array", nullable=true)
-	 */
-	protected $roles = array();
-
-	/**
-	 * @var null|array
-	 */
-	private $rolesTransformed = null;
-
-	/**
-	 * Returns the authorities granted to the user. Cannot return <code>null</code>.
-	 *
-	 * @return Bee_Security_IGrantedAuthority[] the authorities, sorted by natural key (never <code>null</code>)
-	 */
-	public function getAuthorities() {
-		if(!$this->rolesTransformed) {
-			$this->rolesTransformed = array_fill_keys($this->roles, true);
-		}
-		return $this->rolesTransformed;
-	}
-
-	/**
-	 * @param string $role
-	 */
-	public function addRole($role) {
-		$this->getAuthorities();
-		$this->rolesTransformed[$role] = true;
-		$this->updateRoles();
-	}
-
-	public function removeRole($role) {
-		$this->getAuthorities();
-		unset($this->rolesTransformed[$role]);
-		$this->updateRoles();
-	}
-
-	public function hasRole($role) {
-		return array_key_exists($role, $this->getAuthorities());
-	}
-
-	private function updateRoles() {
-		$this->roles = array_keys($this->rolesTransformed);
-	}
+class SimpleUser extends SimpleUserBase {
 }
 
 

Added: trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserBase.php
===================================================================
--- trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserBase.php	                        (rev 0)
+++ trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserBase.php	2013-11-04 16:39:45 UTC (rev 110)
@@ -0,0 +1,58 @@
+<?php
+namespace Bee\Security\UserDetails\Doctrine2;
+use \Bee_Security_IGrantedAuthority;
+
+
+/**
+ * Base class for user entities
+ * @package Bee\Security\UserDetails\Doctrine2
+ * @MappedSuperclass
+ */
+class SimpleUserBase extends UserBase {
+	/**
+	 * @var array
+	 * @Column(name="roles", type="simple_array", nullable=true)
+	 */
+	protected $roles = array();
+
+	/**
+	 * @var null|array
+	 */
+	private $rolesTransformed = null;
+
+	/**
+	 * Returns the authorities granted to the user. Cannot return <code>null</code>.
+	 *
+	 * @return Bee_Security_IGrantedAuthority[] the authorities, sorted by natural key (never <code>null</code>)
+	 */
+	public function getAuthorities() {
+		if(!$this->rolesTransformed) {
+			$this->rolesTransformed = array_fill_keys($this->roles, true);
+		}
+		return $this->rolesTransformed;
+	}
+
+	/**
+	 * @param string $role
+	 */
+	public function addRole($role) {
+		$this->getAuthorities();
+		$this->rolesTransformed[$role] = true;
+		$this->updateRoles();
+	}
+
+	public function removeRole($role) {
+		$this->getAuthorities();
+		unset($this->rolesTransformed[$role]);
+		$this->updateRoles();
+	}
+
+	public function hasRole($role) {
+		return array_key_exists($role, $this->getAuthorities());
+	}
+
+	private function updateRoles() {
+		$this->roles = array_keys($this->rolesTransformed);
+	}
+
+} 
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.