summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2011-12-30 16:05:26 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2011-12-30 16:05:26 +0100
commit7efea264b1c0166d3ab3d04e09647fb6b05eb901 (patch)
tree630c7d66e853d9ed1f75787d970ec557a5057eaa /Core
parent7b2d5674c1086a478a1784b8c4e30ade0527c26f (diff)
downloadsymfony-security-7efea264b1c0166d3ab3d04e09647fb6b05eb901.zip
symfony-security-7efea264b1c0166d3ab3d04e09647fb6b05eb901.tar.gz
symfony-security-7efea264b1c0166d3ab3d04e09647fb6b05eb901.tar.bz2
Revert "merged branch kriswallsmith/security/demeter-fix (PR #2816)"
This reverts commit 76ba2bc7accbea356c9a5bf5231bf786f50ffd90, reversing changes made to 4730f4303b1a266185226ee05fa9f93f0468a2e1.
Diffstat (limited to 'Core')
-rw-r--r--Core/SecurityContext.php14
-rw-r--r--Core/SecurityContextInterface.php9
2 files changed, 0 insertions, 23 deletions
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 12eedd1..0623140 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -91,18 +91,4 @@ class SecurityContext implements SecurityContextInterface
{
$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/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php
index 2fc27b0..960a4cd 100644
--- a/Core/SecurityContextInterface.php
+++ b/Core/SecurityContextInterface.php
@@ -39,15 +39,6 @@ interface SecurityContextInterface
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.
*
* @param array $attributes