Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch '2.0' into 2.1

* 2.0:
  fixed CS
  added doc comments
  [HttpKernel][Translator] Fixed type-hints
  [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1)
  [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.

Conflicts:
	src/Symfony/Component/Process/Process.php
	tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php
  • Loading branch information...
commit 676a7bb2c6c4d5669ca073cceae3ac393748752a 2 parents 970a66b + 551fcde
Fabien Potencier fabpot authored

Showing 2 changed files with 7 additions and 7 deletions. Show diff stats Hide diff stats

  1. +3 3 Event/GetResponseEvent.php
  2. +4 4 Event/KernelEvent.php
6 Event/GetResponseEvent.php
@@ -28,14 +28,14 @@ class GetResponseEvent extends KernelEvent
28 28 {
29 29 /**
30 30 * The response object
31   - * @var Symfony\Component\HttpFoundation\Response
  31 + * @var Response
32 32 */
33 33 private $response;
34 34
35 35 /**
36 36 * Returns the response object
37 37 *
38   - * @return Symfony\Component\HttpFoundation\Response
  38 + * @return Response
39 39 *
40 40 * @api
41 41 */
@@ -47,7 +47,7 @@ public function getResponse()
47 47 /**
48 48 * Sets a response and stops event propagation
49 49 *
50   - * @param Symfony\Component\HttpFoundation\Response $response
  50 + * @param Response $response
51 51 *
52 52 * @api
53 53 */
8 Event/KernelEvent.php
@@ -26,13 +26,13 @@ class KernelEvent extends Event
26 26 {
27 27 /**
28 28 * The kernel in which this event was thrown
29   - * @var Symfony\Component\HttpKernel\HttpKernelInterface
  29 + * @var HttpKernelInterface
30 30 */
31 31 private $kernel;
32 32
33 33 /**
34 34 * The request the kernel is currently processing
35   - * @var Symfony\Component\HttpFoundation\Request
  35 + * @var Request
36 36 */
37 37 private $request;
38 38
@@ -53,7 +53,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
53 53 /**
54 54 * Returns the kernel in which this event was thrown
55 55 *
56   - * @return Symfony\Component\HttpKernel\HttpKernelInterface
  56 + * @return HttpKernelInterface
57 57 *
58 58 * @api
59 59 */
@@ -65,7 +65,7 @@ public function getKernel()
65 65 /**
66 66 * Returns the request the kernel is currently processing
67 67 *
68   - * @return Symfony\Component\HttpFoundation\Request
  68 + * @return Request
69 69 *
70 70 * @api
71 71 */

0 comments on commit 676a7bb

Please sign in to comment.
Something went wrong with that request. Please try again.