Update access to authenticated user, 'use' Twig classes

KnpLabs · Feb 14, 2011 · 7cb7719 · 7cb7719
1 parent 570b8cf
commit 7cb7719
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Twig/UserExtension.php b/Twig/UserExtension.php
@@ -3,8 +3,10 @@
 namespace FOS\UserBundle\Twig;
 
 use Symfony\Component\Security\Core\SecurityContext;
+use Twig_Function_Method;
+use Twig_Extension;
 
-class UserExtension extends \Twig_Extension
+class UserExtension extends Twig_Extension
 {
     protected $securityContext;
 
@@ -21,10 +23,10 @@ public function __construct(SecurityContext $securityContext)
     public function getFunctions()
     {
         return array(
-            'fos_user_getUser'         => new \Twig_Function_Method($this, 'getUser'),
-            'fos_user_isUser'          => new \Twig_Function_Method($this, 'isUser'),
-            'fos_user_isAuthenticated' => new \Twig_Function_Method($this, 'isAuthenticated'),
-            'fos_user_isAnonymous'     => new \Twig_Function_Method($this, 'isAnonymous'),
+            'fos_user_getUser'         => new Twig_Function_Method($this, 'getUser'),
+            'fos_user_isUser'          => new Twig_Function_Method($this, 'isUser'),
+            'fos_user_isAuthenticated' => new Twig_Function_Method($this, 'isAuthenticated'),
+            'fos_user_isAnonymous'     => new Twig_Function_Method($this, 'isAnonymous'),
         );
     }
 
@@ -35,7 +37,7 @@ public function getFunctions()
      */
     public function getUser()
     {
-        return $this->securityContext->getUser();
+        return $this->securityContext->getToken()->getUser();
     }
 
     /**
@@ -79,4 +81,4 @@ public function getName()
     {
         return 'fos_user';
     }
-}
+}