summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-01-23 21:21:00 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2013-01-23 21:21:00 +0100
commit97a92780aeb5cdc42c46c0aa406de9ea5b96136b (patch)
tree818fa7366674106956fa978af24f6ed891656973
parentfea706c9ea6d803bcc167973bea1c1ab6cf1cb63 (diff)
parent9614e70a3b18909350c877d83aada298b7380f92 (diff)
downloadsymfony-security-97a92780aeb5cdc42c46c0aa406de9ea5b96136b.zip
symfony-security-97a92780aeb5cdc42c46c0aa406de9ea5b96136b.tar.gz
symfony-security-97a92780aeb5cdc42c46c0aa406de9ea5b96136b.tar.bz2
Merge branch '2.1'
* 2.1: [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder [Security] PHPDoc in SecurityEvents Fix typos in README Added an error message in the DebugClassLoader when using / instead of \. KNOWN_ISSUES with php 5.3.16 [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737) [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786) [Yaml] fixed #6773 [Yaml] fixed #6770 bumped Symfony version to 2.1.8-DEV bumped Symfony version to 2.0.23-DEV Conflicts: src/Symfony/Bundle/FrameworkBundle/Client.php src/Symfony/Component/HttpKernel/Kernel.php
-rw-r--r--Http/SecurityEvents.php18
1 files changed, 18 insertions, 0 deletions
diff --git a/Http/SecurityEvents.php b/Http/SecurityEvents.php
index a6c4e42..45fae29 100644
--- a/Http/SecurityEvents.php
+++ b/Http/SecurityEvents.php
@@ -13,7 +13,25 @@ namespace Symfony\Component\Security\Http;
final class SecurityEvents
{
+ /**
+ * The INTERACTIVE_LOGIN event occurs after a user is logged in
+ * interactively for authentication based on http, cookies or X509.
+ *
+ * The event listener method receives a
+ * Symfony\Component\Security\Http\Event\InteractiveLoginEvent instance.
+ *
+ * @var string
+ */
const INTERACTIVE_LOGIN = 'security.interactive_login';
+ /**
+ * The SWITCH_USER event occurs before switch to another user and
+ * before exit from an already switched user.
+ *
+ * The event listener method receives a
+ * Symfony\Component\Security\Http\Event\SwitchUserEvent instance.
+ *
+ * @var string
+ */
const SWITCH_USER = 'security.switch_user';
}