From b3d6ef4555c8ec35199be943cc7ff35c8492e6fc Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 24 Oct 2016 16:40:33 +0200 Subject: [PATCH 1/3] Fixed the @return value of Response::setStatusCode() --- src/Symfony/Component/HttpFoundation/Response.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 7a05a03cdc795..a520cba82bed5 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -447,7 +447,7 @@ public function getProtocolVersion() * If the status text is null it will be automatically populated for the known * status codes and left empty otherwise. * - * @return Response + * @return $this * * @throws \InvalidArgumentException When the HTTP status code is not valid */ From db76a94ceab92f2e1894a65426ecb409342d5bdd Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 25 Oct 2016 09:04:56 +0200 Subject: [PATCH 2/3] Updated more return values to @return $this --- .../Component/HttpFoundation/Response.php | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index a520cba82bed5..d50061c2412ee 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -219,7 +219,7 @@ public function __construct($content = '', $status = 200, $headers = array()) * @param int $status The response status code * @param array $headers An array of response headers * - * @return Response + * @return $this */ public static function create($content = '', $status = 200, $headers = array()) { @@ -262,7 +262,7 @@ public function __clone() * * @param Request $request A Request instance * - * @return Response The current response + * @return $this The current response */ public function prepare(Request $request) { @@ -324,7 +324,7 @@ public function prepare(Request $request) /** * Sends HTTP headers. * - * @return Response + * @return $this */ public function sendHeaders() { @@ -354,7 +354,7 @@ public function sendHeaders() /** * Sends content for the current web response. * - * @return Response + * @return $this */ public function sendContent() { @@ -366,7 +366,7 @@ public function sendContent() /** * Sends HTTP headers and content. * - * @return Response + * @return $this */ public function send() { @@ -389,7 +389,7 @@ public function send() * * @param mixed $content Content that can be cast to string * - * @return Response + * @return $this * * @throws \UnexpectedValueException */ @@ -419,7 +419,7 @@ public function getContent() * * @param string $version The HTTP protocol version * - * @return Response + * @return $this */ public function setProtocolVersion($version) { @@ -490,7 +490,7 @@ public function getStatusCode() * * @param string $charset Character set * - * @return Response + * @return $this */ public function setCharset($charset) { @@ -563,7 +563,7 @@ public function isValidateable() * * It makes the response ineligible for serving other clients. * - * @return Response + * @return $this */ public function setPrivate() { @@ -578,7 +578,7 @@ public function setPrivate() * * It makes the response eligible for serving other clients. * - * @return Response + * @return $this */ public function setPublic() { @@ -620,7 +620,7 @@ public function getDate() * * @param \DateTime $date A \DateTime instance * - * @return Response + * @return $this */ public function setDate(\DateTime $date) { @@ -647,7 +647,7 @@ public function getAge() /** * Marks the response stale by setting the Age header to be equal to the maximum age of the response. * - * @return Response + * @return $this */ public function expire() { @@ -680,7 +680,7 @@ public function getExpires() * * @param \DateTime|null $date A \DateTime instance or null to remove the header * - * @return Response + * @return $this */ public function setExpires(\DateTime $date = null) { @@ -726,7 +726,7 @@ public function getMaxAge() * * @param int $value Number of seconds * - * @return Response + * @return $this */ public function setMaxAge($value) { @@ -742,7 +742,7 @@ public function setMaxAge($value) * * @param int $value Number of seconds * - * @return Response + * @return $this */ public function setSharedMaxAge($value) { @@ -776,7 +776,7 @@ public function getTtl() * * @param int $seconds Number of seconds * - * @return Response + * @return $this */ public function setTtl($seconds) { @@ -792,7 +792,7 @@ public function setTtl($seconds) * * @param int $seconds Number of seconds * - * @return Response + * @return $this */ public function setClientTtl($seconds) { @@ -820,7 +820,7 @@ public function getLastModified() * * @param \DateTime|null $date A \DateTime instance or null to remove the header * - * @return Response + * @return $this */ public function setLastModified(\DateTime $date = null) { @@ -851,7 +851,7 @@ public function getEtag() * @param string|null $etag The ETag unique identifier or null to remove the header * @param bool $weak Whether you want a weak ETag or not * - * @return Response + * @return $this */ public function setEtag($etag = null, $weak = false) { @@ -875,7 +875,7 @@ public function setEtag($etag = null, $weak = false) * * @param array $options An array of cache options * - * @return Response + * @return $this * * @throws \InvalidArgumentException */ @@ -926,7 +926,7 @@ public function setCache(array $options) * This sets the status, removes the body, and discards any headers * that MUST NOT be included in 304 responses. * - * @return Response + * @return $this * * @see http://tools.ietf.org/html/rfc2616#section-10.3.5 */ @@ -978,7 +978,7 @@ public function getVary() * @param string|array $headers * @param bool $replace Whether to replace the actual value or not (true by default) * - * @return Response + * @return $this */ public function setVary($headers, $replace = true) { From e4161093eb6d4b1a01525341a8202e1e57516216 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 25 Oct 2016 09:28:19 +0200 Subject: [PATCH 3/3] Use @return static for static methods --- src/Symfony/Component/HttpFoundation/Response.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index d50061c2412ee..523a002942d27 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -219,7 +219,7 @@ public function __construct($content = '', $status = 200, $headers = array()) * @param int $status The response status code * @param array $headers An array of response headers * - * @return $this + * @return static */ public static function create($content = '', $status = 200, $headers = array()) {