diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] changed the implementation of Controller::getUser() to be similar to the one from GlobalVariables::getUser()

Browse Source
This commit is contained in:
Fabien Potencier 2011-12-30 16:12:59 +01:00
parent a78437bba9
commit eef8a3c513
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
View File

@ -171,6 +171,8 @@ class Controller extends ContainerAware
* @return mixed
*
* @throws \LogicException If SecurityBundle is not available
*
* @see Symfony\Component\Security\Core\Authentication\Token\TokenInterface::getUser()
*/
public function getUser()
{
@ -178,9 +180,15 @@ class Controller extends ContainerAware
throw new \LogicException('The SecurityBundle is not registered in your application.');
}
$token = $this->container->get('security.context')->getToken();
if (null === $token = $this->container->get('security.context')->getToken()) {
return null;
}
return null === $token ? null : $token->getUser();
if (!is_object($user = $token->getUser())) {
return null;
}
return $user;
}
/**