Merge branch '2.7' into 2.8

fabpot · fabpot · commit 64ec292613b9 · 2016-05-03T14:21:46.000+02:00
* 2.7: add @event annotation for AuthenticationEvents add @event annotation for KernelEvents bumped Symfony version to 2.7.13 updated VERSION for 2.7.12 update CONTRIBUTORS for 2.7.12 updated CHANGELOG for 2.7.12 bumped Symfony version to 2.3.41 updated VERSION for 2.3.40 update CONTRIBUTORS for 2.3.40 updated CHANGELOG for 2.3.40 Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)" Revert "fixed CS" [FrameworkBundle] Remove misleading comment bug #17460 [DI] fix ambiguous services schema
diff --git a/KernelEvents.php b/KernelEvents.php
@@ -108,6 +108,10 @@ final class KernelEvents
      *
      * This event allows you to reset the global and environmental state of
      * the application, when it was changed during the request.
+     * The event listener method receives a
+     * Symfony\Component\HttpKernel\Event\FinishRequestEvent instance.
+     *
+     * @Event
      *
      * @var string
      */

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,10 @@ final class KernelEvents`
`108`	`108`	`*`
`109`	`109`	`* This event allows you to reset the global and environmental state of`
`110`	`110`	`* the application, when it was changed during the request.`
	`111`	`+ * The event listener method receives a`
	`112`	`+ * Symfony\Component\HttpKernel\Event\FinishRequestEvent instance.`
	`113`	`+ *`
	`114`	`+ * @Event`
`111`	`115`	`*`
`112`	`116`	`* @var string`
`113`	`117`	`*/`