diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-23 17:08:51 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-23 17:08:51 +0200 |
| commit | fe0053f6ff87a470547a1898b9bf36a32e73ae7e (patch) | |
| tree | 4bdf94cb89c9c1959569d521a0a214a4243ac9df | |
| parent | dfef828a55f3fd50ba06a45188ce7ae5a91b84f4 (diff) | |
| parent | d355322988b1c1d1798e19c41cc86b4169c31f2a (diff) | |
| download | symfony-security-fe0053f6ff87a470547a1898b9bf36a32e73ae7e.zip symfony-security-fe0053f6ff87a470547a1898b9bf36a32e73ae7e.tar.gz symfony-security-fe0053f6ff87a470547a1898b9bf36a32e73ae7e.tar.bz2 | |
Merge branch '2.8'
* 2.8:
Fix the FrameworkBundle dependencies
[DoctrineBridge] Fix required guess of boolean fields
[DI] don't use array_map to resolve services
Remove dead code in the PropertyPath constructor
[EventDispatcher] fix docblock
[Process] Inherit env vars by default in PhpProcess
Changed one console output style to avoid visual issues
[VarDumper] Fix return type and anonymous classes dumping
[FrameworkBundle] PropertyInfo support
[HttpFoundation] Fixes /0 subnet handling in IpUtils
[Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception.
[Minor] [Serializer] Removed second license header
[TwigBundle] added a Twig templates warmer when templating is disabled
[HttpKernel] Remove a duplicate test for the EsiFragmentRenderer
[Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates
[Templating] introduce path and url methods in php templates to be in line with twig templates
[Routing] deprecate the old url generator reference type values
[Routing] use constant in a test that is new in 2.7
[FrameworkBundle] Add a new ClassCache cache warmer
[Validator] Add expressionLanguage to ExpressionValidator constructor
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
src/Symfony/Component/EventDispatcher/EventDispatcher.php
| -rw-r--r-- | Http/Logout/LogoutUrlGenerator.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Logout/LogoutUrlGenerator.php b/Http/Logout/LogoutUrlGenerator.php index 298c224..ff7ea5b 100644 --- a/Http/Logout/LogoutUrlGenerator.php +++ b/Http/Logout/LogoutUrlGenerator.php @@ -86,7 +86,7 @@ class LogoutUrlGenerator * Generates the logout URL for the firewall. * * @param string|null $key The firewall key or null to use the current firewall key - * @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface) + * @param int $referenceType The type of reference (one of the constants in UrlGeneratorInterface) * * @return string The logout URL * |