Revert "merged branch kriswallsmith/security/demeter-fix (PR #2816)"

fabpot · fabpot · commit a78437bba9af · 2011-12-30T16:05:26.000+01:00
This reverts commit 76ba2bc, reversing changes made to 4730f43.
diff --git a/src/Symfony/Component/Security/Core/SecurityContext.php b/src/Symfony/Component/Security/Core/SecurityContext.php
@@ -91,18 +91,4 @@ public function setToken(TokenInterface $token = null)
     {
         $this->token = $token;
     }
-
-    /**
-     * Returns the current user, if one exists.
-     *
-     * @return mixed Returns either an object which implements __toString(),
-     *               or a primitive string if there is a token, otherwise
-     *               returns null.
-     */
-    public function getUser()
-    {
-        if ($this->token) {
-            return $this->token->getUser();
-        }
-    }
 }
diff --git a/src/Symfony/Component/Security/Core/SecurityContextInterface.php b/src/Symfony/Component/Security/Core/SecurityContextInterface.php
@@ -38,15 +38,6 @@ function getToken();
      */
     function setToken(TokenInterface $token = null);
 
-    /**
-     * Returns the current user, if one exists.
-     *
-     * @return mixed Returns either an object which implements __toString(),
-     *               or a primitive string if there is a token, otherwise
-     *               returns null.
-     */
-    function getUser();
-
     /**
      * Checks if the attributes are granted against the current authentication token and optionally supplied object.
      *
diff --git a/tests/Symfony/Tests/Component/Security/Core/SecurityContextTest.php b/tests/Symfony/Tests/Component/Security/Core/SecurityContextTest.php
@@ -89,22 +89,4 @@ public function testGetSetToken()
         $context->setToken($token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
         $this->assertSame($token, $context->getToken());
     }
-
-    public function testGetUser()
-    {
-        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
-        $token->expects($this->once())
-            ->method('getUser')
-            ->will($this->returnValue('foo'));
-
-        $context = new SecurityContext(
-            $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface'),
-            $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')
-        );
-
-        $this->assertNull($context->getUser(), '->getUser() returns null when there is no token');
-
-        $context->setToken($token);
-        $this->assertEquals('foo', $context->getUser(), '->getUser() return the token user');
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -91,18 +91,4 @@ public function setToken(TokenInterface $token = null)`
`91`	`91`	`{`
`92`	`92`	`$this->token = $token;`
`93`	`93`	`}`
`94`		`-`
`95`		`- /**`
`96`		`- * Returns the current user, if one exists.`
`97`		`- *`
`98`		`- * @return mixed Returns either an object which implements __toString(),`
`99`		`- * or a primitive string if there is a token, otherwise`
`100`		`- * returns null.`
`101`		`- */`
`102`		`- public function getUser()`
`103`		`- {`
`104`		`- if ($this->token) {`
`105`		`- return $this->token->getUser();`
`106`		`- }`
`107`		`- }`
`108`	`94`	`}`