Merge branch '2.0' into 2.1

* 2.0:
  [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
  [Security] PHPDoc in SecurityEvents
  [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.0.23-DEV

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php

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';
 }