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

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

Revision: 210
          http://sourceforge.net/p/beeframework/code/210
Author:   m_plomer
Date:     2014-09-08 13:49:56 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
 - introduced UserManagerBase

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

Modified: trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserDetailsService.php
===================================================================
--- trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserDetailsService.php	2014-09-08 13:37:14 UTC (rev 209)
+++ trunk/framework/Bee/Security/UserDetails/Doctrine2/SimpleUserDetailsService.php	2014-09-08 13:49:56 UTC (rev 210)
@@ -105,10 +105,12 @@
 
 	/**
 	 * @param UserBase $user
+	 * @return UserBase
 	 */
 	public function addUser(UserBase $user) {
 		$this->getEntityManager()->persist($user);
 		$this->getEntityManager()->flush($user);
+		return $user;
 	}
 
 	/**

Modified: trunk/framework/Bee/Security/UserDetails/UserManagerBase.php
===================================================================
--- trunk/framework/Bee/Security/UserDetails/UserManagerBase.php	2014-09-08 13:37:14 UTC (rev 209)
+++ trunk/framework/Bee/Security/UserDetails/UserManagerBase.php	2014-09-08 13:49:56 UTC (rev 210)
@@ -70,9 +70,13 @@
 		return $this->saltSource;
 	}
 
-	public function createOrUpdateUser($frmdata) {
+	/**
+	 * @param array $frmdata
+	 * @return UserBase
+	 * @throws Exception
+	 */
+	public function createOrUpdateUser(array $frmdata) {
 		$user = is_numeric($frmdata['id']) ? $this->loadById($frmdata['id']) : $this->createUserInstance();
-		$model['user'] = $user;
 		$user->setUsername($frmdata['username']);
 		$user->setName($frmdata['fullname']);
 		if (Bee_Utils_Strings::hasText($frmdata['password'])) {
@@ -83,7 +87,7 @@
 		}
 		$user->setDisabled(filter_var($frmdata['deactivated'], FILTER_VALIDATE_BOOLEAN));
 		$this->setRoles($frmdata, $user);
-		$this->addUser($user);
+		return $this->addUser($user);
 	}
 
 	/**
@@ -124,7 +128,7 @@
 
 	/**
 	 * @param UserBase $user
-	 * @return void
+	 * @return UserBase
 	 */
 	abstract public function addUser(UserBase $user);
 

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