Fixed a bug and added unit-tests for GlobalVariables

Iltar van der Berg · Iltar van der Berg · commit 3f055f706cb6 · 2014-09-24T16:46:33.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php b/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
@@ -56,10 +56,12 @@ public function getSecurity()
      */
     public function getUser()
     {
-        if (!$tokenStorage = $this->container->get('security.token_storage')) {
+        if (!$this->container->has('security.token_storage')) {
             return;
         }
 
+        $tokenStorage = $this->container->get('security.token_storage');
+
         if (!$token = $tokenStorage->getToken()) {
             return;
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
@@ -35,25 +35,55 @@ public function testGetSecurity()
         $this->assertSame($securityContext, $this->globals->getSecurity());
     }
 
-    public function testGetUser()
+    public function testGetUserNoTokenStorage()
     {
-        // missing test cases to return null, only happy flow tested
-        $securityContext = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+        $this->assertNull($this->globals->getUser());
+    }
+
+    public function testGetUserNoToken()
+    {
+        $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+        $this->container->set('security.token_storage', $tokenStorage);
+        $this->assertNull($this->globals->getUser());
+    }
+
+    /**
+     * @dataProvider getUserProvider
+     */
+    public function testGetUser($user, $expectedUser)
+    {
+        $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
         $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
-        $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
 
-        $this->container->set('security.token_storage', $securityContext);
+        $this->container->set('security.token_storage', $tokenStorage);
 
         $token
             ->expects($this->once())
             ->method('getUser')
             ->will($this->returnValue($user));
 
-        $securityContext
+        $tokenStorage
             ->expects($this->once())
             ->method('getToken')
             ->will($this->returnValue($token));
 
-        $this->assertSame($user, $this->globals->getUser());
+        $this->assertSame($expectedUser, $this->globals->getUser());
+    }
+
+    public function getUserProvider()
+    {
+        $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+        $std = new \stdClass();
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+
+        return array(
+            array($user, $user),
+            array($std, $std),
+            array($token, $token),
+            array('Anon.', null),
+            array(null, null),
+            array(10, null),
+            array(true, null),
+        );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,12 @@ public function getSecurity()`
`56`	`56`	`*/`
`57`	`57`	`public function getUser()`
`58`	`58`	`{`
`59`		`- if (!$tokenStorage = $this->container->get('security.token_storage')) {`
	`59`	`+ if (!$this->container->has('security.token_storage')) {`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ $tokenStorage = $this->container->get('security.token_storage');`
	`64`	`+`
`63`	`65`	`if (!$token = $tokenStorage->getToken()) {`
`64`	`66`	`return;`
`65`	`67`	`}`