Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 97a92780aeb5cdc42c46c0aa406de9ea5b96136b 2 parents fea706c + 9614e70
@fabpot fabpot authored
Showing with 18 additions and 0 deletions.
  1. +18 −0 Http/SecurityEvents.php
View
18 Http/SecurityEvents.php
@@ -13,7 +13,25 @@
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';
}
Please sign in to comment.
Something went wrong with that request. Please try again.