Merge branch '3.0'

fabpot · fabpot · commit c96461696143 · 2016-05-03T14:24:23.000+02:00
* 3.0: (24 commits) add @event annotation for AuthenticationEvents bumped Symfony version to 3.0.6 updated VERSION for 3.0.5 updated CHANGELOG for 3.0.5 bumped Symfony version to 2.8.6 [PropertyInfo] PHPDoc correction add @event annotation for KernelEvents Fixed typo updated VERSION for 2.8.5 updated CHANGELOG for 2.8.5 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" ...
diff --git a/KernelEvents.php b/KernelEvents.php
@@ -121,6 +121,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
`@@ -121,6 +121,10 @@ final class KernelEvents`
`121`	`121`	`*`
`122`	`122`	`* This event allows you to reset the global and environmental state of`
`123`	`123`	`* the application, when it was changed during the request.`
	`124`	`+ * The event listener method receives a`
	`125`	`+ * Symfony\Component\HttpKernel\Event\FinishRequestEvent instance.`
	`126`	`+ *`
	`127`	`+ * @Event`
`124`	`128`	`*`
`125`	`129`	`* @var string`
`126`	`130`	`*/`