diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-25 17:31:17 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-01-25 17:31:17 +0100 |
| commit | 74dcdf64e3e497a8e3174d0f2d983893aa37c363 (patch) | |
| tree | 7c5ae6a763051c3d67c067cd9089eb22f9778d37 /Core | |
| parent | 55b04625341948f26d2733286aeb3021c41a3899 (diff) | |
| parent | 3a87c401e5f4403231e808d334e4c0ca3b033a70 (diff) | |
| download | symfony-security-74dcdf64e3e497a8e3174d0f2d983893aa37c363.zip symfony-security-74dcdf64e3e497a8e3174d0f2d983893aa37c363.tar.gz symfony-security-74dcdf64e3e497a8e3174d0f2d983893aa37c363.tar.bz2 | |
Merge branch '2.8' into 3.0
* 2.8:
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
fixed CS
[DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument
Limit the max height/width of icons in the profiler menu
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
update upgrade files with CSRF related option info
[TranslationUpdateCommand] fixed undefined resultMessage var.
[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(); |