diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-25 17:29:20 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-25 17:29:20 +0100 |
| commit | 3a87c401e5f4403231e808d334e4c0ca3b033a70 (patch) | |
| tree | 9d979b5859c5005bbcae6c2515012977a4403130 | |
| parent | 46fcc0368cf3905f4b00feeaa4eeb4fe44e84558 (diff) | |
| parent | 926de51d2a3caf70ef4d20ac216383796b9b113e (diff) | |
| download | symfony-security-3a87c401e5f4403231e808d334e4c0ca3b033a70.zip symfony-security-3a87c401e5f4403231e808d334e4c0ca3b033a70.tar.gz symfony-security-3a87c401e5f4403231e808d334e4c0ca3b033a70.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
fixed undefined variable
Fixed the phpDoc of UserInterface
fixed APCu dep version
make apc class loader testable against apcu without apc bc layer
Added support for the `0.0.0.0/0` trusted proxy
[DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument
added missing constant
Added 451 status code
Remove unnecessary code
Allow absolute URLs to be displayed in the debug toolbar
[ClassLoader] Use symfony/polyfill-apcu
[HttpKernel] Lookup the response even if the lock was released after 2 seconds
| -rw-r--r-- | Core/User/UserInterface.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php index 1b52dab..7478842 100644 --- a/Core/User/UserInterface.php +++ b/Core/User/UserInterface.php @@ -47,7 +47,7 @@ interface UserInterface * and populated in any number of different ways when the user object * is created. * - * @return Role[] The user roles + * @return (Role|string)[] The user roles */ public function getRoles(); |