diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-25 17:27:59 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-25 17:27:59 +0100 |
| commit | 926de51d2a3caf70ef4d20ac216383796b9b113e (patch) | |
| tree | f88b92c3dae012d51c3d9e187f6b05290d0eab2f /Core | |
| parent | b9254dec9796ea42fff0e24e285f92d3467bbb43 (diff) | |
| parent | a9c0831d7e4f6bd2a72edc235bb31e59ec05f995 (diff) | |
| download | symfony-security-926de51d2a3caf70ef4d20ac216383796b9b113e.zip symfony-security-926de51d2a3caf70ef4d20ac216383796b9b113e.tar.gz symfony-security-926de51d2a3caf70ef4d20ac216383796b9b113e.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
fixed undefined variable
Fixed the phpDoc of UserInterface
fixed APCu dep version
Added support for the `0.0.0.0/0` trusted proxy
[DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument
[HttpKernel] Lookup the response even if the lock was released after 2 seconds
Diffstat (limited to 'Core')
| -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(); |