Merge branch '2.3' into 2.5

* 2.3:
  [ClassLoader] removes deprecated classes from documentation.
  [Yaml] Update README.md
  [Security] fixed wrong phpdoc

1 files changed, 4 insertions, 2 deletions

diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php
index fb9fd14..be90802 100644
--- a/Core/Authentication/Token/TokenInterface.php
+++ b/Core/Authentication/Token/TokenInterface.php
@@ -47,8 +47,10 @@ interface TokenInterface extends \Serializable
     /**
      * Returns a user representation.
      *
-     * @return mixed either returns an object which implements __toString(), or
-     *               a primitive string is returned.
+     * @return mixed Can be a UserInterface instance, an object implementing a __toString method,
+     *               or the username as a regular string
+     *
+     * @see AbstractToken::setUser()
      */
     public function getUser();