diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-24 17:41:27 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-24 17:41:27 +0200 |
| commit | e3d359180c41a80803e06a5d277b3b319952c8ee (patch) | |
| tree | 07c8f9edcd909eb7a049cc8f4faa4feb25f29d13 /Http | |
| parent | c8eee73f855b1c1b0af8f6292c7f291866d06b21 (diff) | |
| parent | 3d287a5e46b6c915449616b1800e1984dbd83966 (diff) | |
| download | symfony-security-e3d359180c41a80803e06a5d277b3b319952c8ee.zip symfony-security-e3d359180c41a80803e06a5d277b3b319952c8ee.tar.gz symfony-security-e3d359180c41a80803e06a5d277b3b319952c8ee.tar.bz2 | |
Merge branch '2.1'
* 2.1:
added missing use statment (closes #5825)
Code cleanup
[WebProfilerBundle] Fixed the use of nested macros
Removed unused use statements.
Nsdocblocks
[ConfigDumpReference] avoid notice for variable nodes
fixed fallback locale
UniqueValidatorTest, Change message on assertions
Documented removed _form_is_choice_group function
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Firewall.php | 2 | ||||
| -rw-r--r-- | Http/Firewall/AbstractAuthenticationListener.php | 1 | ||||
| -rw-r--r-- | Http/RememberMe/ResponseListener.php | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/Http/Firewall.php b/Http/Firewall.php index 91eb6a9..a590fd9 100644 --- a/Http/Firewall.php +++ b/Http/Firewall.php @@ -33,7 +33,7 @@ class Firewall /** * Constructor. * - * @param FirewallMap $map A FirewallMap instance + * @param FirewallMapInterface $map A FirewallMapInterface instance * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance */ public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher) diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php index 1af1646..410fb73 100644 --- a/Http/Firewall/AbstractAuthenticationListener.php +++ b/Http/Firewall/AbstractAuthenticationListener.php @@ -20,7 +20,6 @@ use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterfac use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Exception\SessionUnavailableException; use Symfony\Component\HttpKernel\Log\LoggerInterface; -use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/Http/RememberMe/ResponseListener.php b/Http/RememberMe/ResponseListener.php index 11ea790..6cbdcb3 100644 --- a/Http/RememberMe/ResponseListener.php +++ b/Http/RememberMe/ResponseListener.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Http\RememberMe; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; /** |