Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 0c9412a3744d · 2016-09-06T12:55:00.000+02:00
* 2.7:
  [FrameworkBundle] Check for class existence before is_subclass_of
  Update GroupSequence.php
  Code enhancement and cleanup
  [DI] Add anti-regression test
  Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
  [BrowserKit] Fix cookie expiration on 32 bit systems
  bumped Symfony version to 2.7.18
  updated VERSION for 2.7.17
  update CONTRIBUTORS for 2.7.17
  updated CHANGELOG for 2.7.17
  Update misleading comment about RFC4627
diff --git a/EventListener/WebDebugToolbarListener.php b/EventListener/WebDebugToolbarListener.php
@@ -108,8 +108,6 @@ public function onKernelResponse(FilterResponseEvent $event)
 
     /**
      * Injects the web debug toolbar into the given Response.
-     *
-     * @param Response $response A Response instance
      */
     protected function injectToolbar(Response $response, Request $request)
     {

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,6 @@ public function onKernelResponse(FilterResponseEvent $event)`
`108`	`108`
`109`	`109`	`/**`
`110`	`110`	`* Injects the web debug toolbar into the given Response.`
`111`		`- *`
`112`		`- * @param Response $response A Response instance`
`113`	`111`	`*/`
`114`	`112`	`protected function injectToolbar(Response $response, Request $request)`
`115`	`113`	`{`