Merge pull request #78 from blubolt/late-static-binding

l0gicgate · web-flow · commit 83ff8a0bd8f2 · 2018-12-14T09:23:04.000-07:00
Make use of late static binding to allow decorator extension
diff --git a/src/Response.php b/src/Response.php
@@ -209,13 +209,13 @@ public function hasHeader($name)
      *
      * @param string $name Case-insensitive header field name to add.
      * @param string|string[] $value Header value(s).
-     * @return Response
+     * @return static
      * @throws InvalidArgumentException for invalid header names or values.
      */
     public function withAddedHeader($name, $value)
     {
         $response = $this->response->withAddedHeader($name, $value);
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -228,13 +228,13 @@ public function withAddedHeader($name, $value)
      * new body stream.
      *
      * @param StreamInterface $body Body.
-     * @return Response
+     * @return static
      * @throws InvalidArgumentException When the body is not valid.
      */
     public function withBody(StreamInterface $body)
     {
         $response = $this->response->withBody($body);
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -249,13 +249,13 @@ public function withBody(StreamInterface $body)
      *
      * @param string $name Case-insensitive header field name.
      * @param string|string[] $value Header value(s).
-     * @return Response
+     * @return static
      * @throws InvalidArgumentException for invalid header names or values.
      */
     public function withHeader($name, $value)
     {
         $response = $this->response->withHeader($name, $value);
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -268,12 +268,12 @@ public function withHeader($name, $value)
      * the named header.
      *
      * @param string $name Case-insensitive header field name to remove.
-     * @return Response
+     * @return static
      */
     public function withoutHeader($name)
     {
         $response = $this->response->withoutHeader($name);
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -287,12 +287,12 @@ public function withoutHeader($name)
      * new protocol version.
      *
      * @param string $version HTTP protocol version
-     * @return Response
+     * @return static
      */
     public function withProtocolVersion($version)
     {
         $response = $this->response->withProtocolVersion($version);
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -312,13 +312,13 @@ public function withProtocolVersion($version)
      * @param string $reasonPhrase The reason phrase to use with the
      *     provided status code; if none is provided, implementations MAY
      *     use the defaults as suggested in the HTTP specification.
-     * @return Response
+     * @return static
      * @throws InvalidArgumentException For invalid status code arguments.
      */
     public function withStatus($code, $reasonPhrase = '')
     {
         $response = $this->response->withStatus($code, $reasonPhrase);
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -333,7 +333,7 @@ public function withStatus($code, $reasonPhrase = '')
      * @param  int    $status The HTTP status code.
      * @param  int    $options Json encoding options
      * @param  int    $depth Json encoding max depth
-     * @return Response
+     * @return static
      */
     public function withJson($data, int $status = null, int $options = 0, int $depth = 512): ResponseInterface
     {
@@ -351,7 +351,7 @@ public function withJson($data, int $status = null, int $options = 0, int $depth
             $response = $response->withStatus($status);
         }
 
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -364,7 +364,7 @@ public function withJson($data, int $status = null, int $options = 0, int $depth
      *
      * @param string $url The redirect destination.
      * @param int|null $status The redirect HTTP status code.
-     * @return Response
+     * @return static
      */
     public function withRedirect(string $url, $status = null): ResponseInterface
     {
@@ -375,7 +375,7 @@ public function withRedirect(string $url, $status = null): ResponseInterface
         }
         $response = $response->withStatus($status);
 
-        return new Response($response, $this->streamFactory);
+        return new static($response, $this->streamFactory);
     }
 
     /**
@@ -386,9 +386,9 @@ public function withRedirect(string $url, $status = null): ResponseInterface
      * Proxies to the underlying stream and writes the provided data to it.
      *
      * @param string $data
-     * @return self
+     * @return static
      */
-    public function write($data)
+    public function write($data): ResponseInterface
     {
         $this->response->getBody()->write($data);
         return $this;
diff --git a/src/ServerRequest.php b/src/ServerRequest.php
@@ -423,13 +423,13 @@ public function hasHeader($name)
      *
      * @param string $name Case-insensitive header field name to add.
      * @param string|string[] $value Header value(s).
-     * @return ServerRequest
+     * @return static
      * @throws InvalidArgumentException for invalid header names or values.
      */
     public function withAddedHeader($name, $value)
     {
         $serverRequest = $this->serverRequest->withAddedHeader($name, $value);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -445,12 +445,12 @@ public function withAddedHeader($name, $value)
      * @see getAttributes()
      * @param string $name The attribute name.
      * @param mixed $value The value of the attribute.
-     * @return ServerRequest
+     * @return static
      */
     public function withAttribute($name, $value)
     {
         $serverRequest = $this->serverRequest->withAttribute($name, $value);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -466,7 +466,7 @@ public function withAttribute($name, $value)
      * updated attributes.
      *
      * @param  array $attributes New attributes
-     * @return ServerRequest
+     * @return static
      */
     public function withAttributes(array $attributes)
     {
@@ -476,7 +476,7 @@ public function withAttributes(array $attributes)
             $serverRequest = $serverRequest->withAttribute($attribute, $value);
         }
 
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -491,12 +491,12 @@ public function withAttributes(array $attributes)
      *
      * @see getAttributes()
      * @param string $name The attribute name.
-     * @return ServerRequest
+     * @return static
      */
     public function withoutAttribute($name)
     {
         $serverRequest = $this->serverRequest->withoutAttribute($name);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -509,13 +509,13 @@ public function withoutAttribute($name)
      * new body stream.
      *
      * @param StreamInterface $body Body.
-     * @return ServerRequest
+     * @return static
      * @throws InvalidArgumentException When the body is not valid.
      */
     public function withBody(StreamInterface $body)
     {
         $serverRequest = $this->serverRequest->withBody($body);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -533,12 +533,12 @@ public function withBody(StreamInterface $body)
      * updated cookie values.
      *
      * @param array $cookies Array of key/value pairs representing cookies.
-     * @return ServerRequest
+     * @return static
      */
     public function withCookieParams(array $cookies)
     {
         $serverRequest = $this->serverRequest->withCookieParams($cookies);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -553,13 +553,13 @@ public function withCookieParams(array $cookies)
      *
      * @param string $name Case-insensitive header field name.
      * @param string|string[] $value Header value(s).
-     * @return ServerRequest
+     * @return static
      * @throws InvalidArgumentException for invalid header names or values.
      */
     public function withHeader($name, $value)
     {
         $serverRequest = $this->serverRequest->withHeader($name, $value);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -572,12 +572,12 @@ public function withHeader($name, $value)
      * the named header.
      *
      * @param string $name Case-insensitive header field name to remove.
-     * @return ServerRequest
+     * @return static
      */
     public function withoutHeader($name)
     {
         $serverRequest = $this->serverRequest->withoutHeader($name);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -592,13 +592,13 @@ public function withoutHeader($name)
      * changed request method.
      *
      * @param string $method Case-sensitive method.
-     * @return ServerRequest
+     * @return static
      * @throws InvalidArgumentException for invalid HTTP methods.
      */
     public function withMethod($method)
     {
         $serverRequest = $this->serverRequest->withMethod($method);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -625,14 +625,14 @@ public function withMethod($method)
      *
      * @param null|array|object $data The deserialized body data. This will
      *     typically be in an array or object.
-     * @return ServerRequest
+     * @return static
      * @throws InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
     public function withParsedBody($data)
     {
         $serverRequest = $this->serverRequest->withParsedBody($data);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -646,12 +646,12 @@ public function withParsedBody($data)
      * new protocol version.
      *
      * @param string $version HTTP protocol version
-     * @return ServerRequest
+     * @return static
      */
     public function withProtocolVersion($version)
     {
         $serverRequest = $this->serverRequest->withProtocolVersion($version);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -674,12 +674,12 @@ public function withProtocolVersion($version)
      *
      * @param array $query Array of query string arguments, typically from
      *     $_GET.
-     * @return ServerRequest
+     * @return static
      */
     public function withQueryParams(array $query)
     {
         $serverRequest = $this->serverRequest->withQueryParams($query);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -697,12 +697,12 @@ public function withQueryParams(array $query)
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
      * @param mixed $requestTarget
-     * @return ServerRequest
+     * @return static
      */
     public function withRequestTarget($requestTarget)
     {
         $serverRequest = $this->serverRequest->withRequestTarget($requestTarget);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -713,13 +713,13 @@ public function withRequestTarget($requestTarget)
      * updated body parameters.
      *
      * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
-     * @return ServerRequest
+     * @return static
      * @throws InvalidArgumentException if an invalid structure is provided.
      */
     public function withUploadedFiles(array $uploadedFiles)
     {
         $serverRequest = $this->serverRequest->withUploadedFiles($uploadedFiles);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -750,12 +750,12 @@ public function withUploadedFiles(array $uploadedFiles)
      * @link http://tools.ietf.org/html/rfc3986#section-4.3
      * @param UriInterface $uri New request URI to use.
      * @param bool $preserveHost Preserve the original state of the Host header.
-     * @return ServerRequest
+     * @return static
      */
     public function withUri(UriInterface $uri, $preserveHost = false)
     {
         $serverRequest = $this->serverRequest->withUri($uri, $preserveHost);
-        return new ServerRequest($serverRequest);
+        return new static($serverRequest);
     }
 
     /**
@@ -986,9 +986,9 @@ public function getServerParam($key, $default = null)
      *
      * @param string   $mediaType A HTTP media type (excluding content-type params).
      * @param callable $callable  A callable that returns parsed contents for media type.
-     * @return self
+     * @return static
      */
-    public function registerMediaTypeParser($mediaType, callable $callable)
+    public function registerMediaTypeParser($mediaType, callable $callable): ServerRequestInterface
     {
         if ($callable instanceof Closure) {
             $callable = $callable->bindTo($this);
diff --git a/src/Uri.php b/src/Uri.php

Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,13 @@ public function hasHeader($name)`
`209`	`209`	`*`
`210`	`210`	`* @param string $name Case-insensitive header field name to add.`
`211`	`211`	`* @param string\|string[] $value Header value(s).`
`212`		`- * @return Response`
	`212`	`+ * @return static`
`213`	`213`	`* @throws InvalidArgumentException for invalid header names or values.`
`214`	`214`	`*/`
`215`	`215`	`public function withAddedHeader($name, $value)`
`216`	`216`	`{`
`217`	`217`	`$response = $this->response->withAddedHeader($name, $value);`
`218`		`- return new Response($response, $this->streamFactory);`
	`218`	`+ return new static($response, $this->streamFactory);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`/**`
`@@ -228,13 +228,13 @@ public function withAddedHeader($name, $value)`
`228`	`228`	`* new body stream.`
`229`	`229`	`*`
`230`	`230`	`* @param StreamInterface $body Body.`
`231`		`- * @return Response`
	`231`	`+ * @return static`
`232`	`232`	`* @throws InvalidArgumentException When the body is not valid.`
`233`	`233`	`*/`
`234`	`234`	`public function withBody(StreamInterface $body)`
`235`	`235`	`{`
`236`	`236`	`$response = $this->response->withBody($body);`
`237`		`- return new Response($response, $this->streamFactory);`
	`237`	`+ return new static($response, $this->streamFactory);`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`/**`
`@@ -249,13 +249,13 @@ public function withBody(StreamInterface $body)`
`249`	`249`	`*`
`250`	`250`	`* @param string $name Case-insensitive header field name.`
`251`	`251`	`* @param string\|string[] $value Header value(s).`
`252`		`- * @return Response`
	`252`	`+ * @return static`
`253`	`253`	`* @throws InvalidArgumentException for invalid header names or values.`
`254`	`254`	`*/`
`255`	`255`	`public function withHeader($name, $value)`
`256`	`256`	`{`
`257`	`257`	`$response = $this->response->withHeader($name, $value);`
`258`		`- return new Response($response, $this->streamFactory);`
	`258`	`+ return new static($response, $this->streamFactory);`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`/**`
`@@ -268,12 +268,12 @@ public function withHeader($name, $value)`
`268`	`268`	`* the named header.`
`269`	`269`	`*`
`270`	`270`	`* @param string $name Case-insensitive header field name to remove.`
`271`		`- * @return Response`
	`271`	`+ * @return static`
`272`	`272`	`*/`
`273`	`273`	`public function withoutHeader($name)`
`274`	`274`	`{`
`275`	`275`	`$response = $this->response->withoutHeader($name);`
`276`		`- return new Response($response, $this->streamFactory);`
	`276`	`+ return new static($response, $this->streamFactory);`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`/**`
`@@ -287,12 +287,12 @@ public function withoutHeader($name)`
`287`	`287`	`* new protocol version.`
`288`	`288`	`*`
`289`	`289`	`* @param string $version HTTP protocol version`
`290`		`- * @return Response`
	`290`	`+ * @return static`
`291`	`291`	`*/`
`292`	`292`	`public function withProtocolVersion($version)`
`293`	`293`	`{`
`294`	`294`	`$response = $this->response->withProtocolVersion($version);`
`295`		`- return new Response($response, $this->streamFactory);`
	`295`	`+ return new static($response, $this->streamFactory);`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`/**`
`@@ -312,13 +312,13 @@ public function withProtocolVersion($version)`
`312`	`312`	`* @param string $reasonPhrase The reason phrase to use with the`
`313`	`313`	`* provided status code; if none is provided, implementations MAY`
`314`	`314`	`* use the defaults as suggested in the HTTP specification.`
`315`		`- * @return Response`
	`315`	`+ * @return static`
`316`	`316`	`* @throws InvalidArgumentException For invalid status code arguments.`
`317`	`317`	`*/`
`318`	`318`	`public function withStatus($code, $reasonPhrase = '')`
`319`	`319`	`{`
`320`	`320`	`$response = $this->response->withStatus($code, $reasonPhrase);`
`321`		`- return new Response($response, $this->streamFactory);`
	`321`	`+ return new static($response, $this->streamFactory);`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`/**`
`@@ -333,7 +333,7 @@ public function withStatus($code, $reasonPhrase = '')`
`333`	`333`	`* @param int $status The HTTP status code.`
`334`	`334`	`* @param int $options Json encoding options`
`335`	`335`	`* @param int $depth Json encoding max depth`
`336`		`- * @return Response`
	`336`	`+ * @return static`
`337`	`337`	`*/`
`338`	`338`	`public function withJson($data, int $status = null, int $options = 0, int $depth = 512): ResponseInterface`
`339`	`339`	`{`
`@@ -351,7 +351,7 @@ public function withJson($data, int $status = null, int $options = 0, int $depth`
`351`	`351`	`$response = $response->withStatus($status);`
`352`	`352`	`}`
`353`	`353`
`354`		`- return new Response($response, $this->streamFactory);`
	`354`	`+ return new static($response, $this->streamFactory);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`/**`
`@@ -364,7 +364,7 @@ public function withJson($data, int $status = null, int $options = 0, int $depth`
`364`	`364`	`*`
`365`	`365`	`* @param string $url The redirect destination.`
`366`	`366`	`* @param int\|null $status The redirect HTTP status code.`
`367`		`- * @return Response`
	`367`	`+ * @return static`
`368`	`368`	`*/`
`369`	`369`	`public function withRedirect(string $url, $status = null): ResponseInterface`
`370`	`370`	`{`
`@@ -375,7 +375,7 @@ public function withRedirect(string $url, $status = null): ResponseInterface`
`375`	`375`	`}`
`376`	`376`	`$response = $response->withStatus($status);`
`377`	`377`
`378`		`- return new Response($response, $this->streamFactory);`
	`378`	`+ return new static($response, $this->streamFactory);`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`/**`
`@@ -386,9 +386,9 @@ public function withRedirect(string $url, $status = null): ResponseInterface`
`386`	`386`	`* Proxies to the underlying stream and writes the provided data to it.`
`387`	`387`	`*`
`388`	`388`	`* @param string $data`
`389`		`- * @return self`
	`389`	`+ * @return static`
`390`	`390`	`*/`
`391`		`- public function write($data)`
	`391`	`+ public function write($data): ResponseInterface`
`392`	`392`	`{`
`393`	`393`	`$this->response->getBody()->write($data);`
`394`	`394`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -423,13 +423,13 @@ public function hasHeader($name)`
`423`	`423`	`*`
`424`	`424`	`* @param string $name Case-insensitive header field name to add.`
`425`	`425`	`* @param string\|string[] $value Header value(s).`
`426`		`- * @return ServerRequest`
	`426`	`+ * @return static`
`427`	`427`	`* @throws InvalidArgumentException for invalid header names or values.`
`428`	`428`	`*/`
`429`	`429`	`public function withAddedHeader($name, $value)`
`430`	`430`	`{`
`431`	`431`	`$serverRequest = $this->serverRequest->withAddedHeader($name, $value);`
`432`		`- return new ServerRequest($serverRequest);`
	`432`	`+ return new static($serverRequest);`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`/**`
`@@ -445,12 +445,12 @@ public function withAddedHeader($name, $value)`
`445`	`445`	`* @see getAttributes()`
`446`	`446`	`* @param string $name The attribute name.`
`447`	`447`	`* @param mixed $value The value of the attribute.`
`448`		`- * @return ServerRequest`
	`448`	`+ * @return static`
`449`	`449`	`*/`
`450`	`450`	`public function withAttribute($name, $value)`
`451`	`451`	`{`
`452`	`452`	`$serverRequest = $this->serverRequest->withAttribute($name, $value);`
`453`		`- return new ServerRequest($serverRequest);`
	`453`	`+ return new static($serverRequest);`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`/**`
`@@ -466,7 +466,7 @@ public function withAttribute($name, $value)`
`466`	`466`	`* updated attributes.`
`467`	`467`	`*`
`468`	`468`	`* @param array $attributes New attributes`
`469`		`- * @return ServerRequest`
	`469`	`+ * @return static`
`470`	`470`	`*/`
`471`	`471`	`public function withAttributes(array $attributes)`
`472`	`472`	`{`
`@@ -476,7 +476,7 @@ public function withAttributes(array $attributes)`
`476`	`476`	`$serverRequest = $serverRequest->withAttribute($attribute, $value);`
`477`	`477`	`}`
`478`	`478`
`479`		`- return new ServerRequest($serverRequest);`
	`479`	`+ return new static($serverRequest);`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`/**`
`@@ -491,12 +491,12 @@ public function withAttributes(array $attributes)`
`491`	`491`	`*`
`492`	`492`	`* @see getAttributes()`
`493`	`493`	`* @param string $name The attribute name.`
`494`		`- * @return ServerRequest`
	`494`	`+ * @return static`
`495`	`495`	`*/`
`496`	`496`	`public function withoutAttribute($name)`
`497`	`497`	`{`
`498`	`498`	`$serverRequest = $this->serverRequest->withoutAttribute($name);`
`499`		`- return new ServerRequest($serverRequest);`
	`499`	`+ return new static($serverRequest);`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`/**`
`@@ -509,13 +509,13 @@ public function withoutAttribute($name)`
`509`	`509`	`* new body stream.`
`510`	`510`	`*`
`511`	`511`	`* @param StreamInterface $body Body.`
`512`		`- * @return ServerRequest`
	`512`	`+ * @return static`
`513`	`513`	`* @throws InvalidArgumentException When the body is not valid.`
`514`	`514`	`*/`
`515`	`515`	`public function withBody(StreamInterface $body)`
`516`	`516`	`{`
`517`	`517`	`$serverRequest = $this->serverRequest->withBody($body);`
`518`		`- return new ServerRequest($serverRequest);`
	`518`	`+ return new static($serverRequest);`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`/**`
`@@ -533,12 +533,12 @@ public function withBody(StreamInterface $body)`
`533`	`533`	`* updated cookie values.`
`534`	`534`	`*`
`535`	`535`	`* @param array $cookies Array of key/value pairs representing cookies.`
`536`		`- * @return ServerRequest`
	`536`	`+ * @return static`
`537`	`537`	`*/`
`538`	`538`	`public function withCookieParams(array $cookies)`
`539`	`539`	`{`
`540`	`540`	`$serverRequest = $this->serverRequest->withCookieParams($cookies);`
`541`		`- return new ServerRequest($serverRequest);`
	`541`	`+ return new static($serverRequest);`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`/**`
`@@ -553,13 +553,13 @@ public function withCookieParams(array $cookies)`
`553`	`553`	`*`
`554`	`554`	`* @param string $name Case-insensitive header field name.`
`555`	`555`	`* @param string\|string[] $value Header value(s).`
`556`		`- * @return ServerRequest`
	`556`	`+ * @return static`
`557`	`557`	`* @throws InvalidArgumentException for invalid header names or values.`
`558`	`558`	`*/`
`559`	`559`	`public function withHeader($name, $value)`
`560`	`560`	`{`
`561`	`561`	`$serverRequest = $this->serverRequest->withHeader($name, $value);`
`562`		`- return new ServerRequest($serverRequest);`
	`562`	`+ return new static($serverRequest);`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`/**`
`@@ -572,12 +572,12 @@ public function withHeader($name, $value)`
`572`	`572`	`* the named header.`
`573`	`573`	`*`
`574`	`574`	`* @param string $name Case-insensitive header field name to remove.`
`575`		`- * @return ServerRequest`
	`575`	`+ * @return static`
`576`	`576`	`*/`
`577`	`577`	`public function withoutHeader($name)`
`578`	`578`	`{`
`579`	`579`	`$serverRequest = $this->serverRequest->withoutHeader($name);`
`580`		`- return new ServerRequest($serverRequest);`
	`580`	`+ return new static($serverRequest);`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`/**`
`@@ -592,13 +592,13 @@ public function withoutHeader($name)`
`592`	`592`	`* changed request method.`
`593`	`593`	`*`
`594`	`594`	`* @param string $method Case-sensitive method.`
`595`		`- * @return ServerRequest`
	`595`	`+ * @return static`
`596`	`596`	`* @throws InvalidArgumentException for invalid HTTP methods.`
`597`	`597`	`*/`
`598`	`598`	`public function withMethod($method)`
`599`	`599`	`{`
`600`	`600`	`$serverRequest = $this->serverRequest->withMethod($method);`
`601`		`- return new ServerRequest($serverRequest);`
	`601`	`+ return new static($serverRequest);`
`602`	`602`	`}`
`603`	`603`
`604`	`604`	`/**`
`@@ -625,14 +625,14 @@ public function withMethod($method)`
`625`	`625`	`*`
`626`	`626`	`* @param null\|array\|object $data The deserialized body data. This will`
`627`	`627`	`* typically be in an array or object.`
`628`		`- * @return ServerRequest`
	`628`	`+ * @return static`
`629`	`629`	`* @throws InvalidArgumentException if an unsupported argument type is`
`630`	`630`	`* provided.`
`631`	`631`	`*/`
`632`	`632`	`public function withParsedBody($data)`
`633`	`633`	`{`
`634`	`634`	`$serverRequest = $this->serverRequest->withParsedBody($data);`
`635`		`- return new ServerRequest($serverRequest);`
	`635`	`+ return new static($serverRequest);`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`/**`
`@@ -646,12 +646,12 @@ public function withParsedBody($data)`
`646`	`646`	`* new protocol version.`
`647`	`647`	`*`
`648`	`648`	`* @param string $version HTTP protocol version`
`649`		`- * @return ServerRequest`
	`649`	`+ * @return static`
`650`	`650`	`*/`
`651`	`651`	`public function withProtocolVersion($version)`
`652`	`652`	`{`
`653`	`653`	`$serverRequest = $this->serverRequest->withProtocolVersion($version);`
`654`		`- return new ServerRequest($serverRequest);`
	`654`	`+ return new static($serverRequest);`
`655`	`655`	`}`
`656`	`656`
`657`	`657`	`/**`
`@@ -674,12 +674,12 @@ public function withProtocolVersion($version)`
`674`	`674`	`*`
`675`	`675`	`* @param array $query Array of query string arguments, typically from`
`676`	`676`	`* $_GET.`
`677`		`- * @return ServerRequest`
	`677`	`+ * @return static`
`678`	`678`	`*/`
`679`	`679`	`public function withQueryParams(array $query)`
`680`	`680`	`{`
`681`	`681`	`$serverRequest = $this->serverRequest->withQueryParams($query);`
`682`		`- return new ServerRequest($serverRequest);`
	`682`	`+ return new static($serverRequest);`
`683`	`683`	`}`
`684`	`684`
`685`	`685`	`/**`
`@@ -697,12 +697,12 @@ public function withQueryParams(array $query)`
`697`	`697`	`* @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various`
`698`	`698`	`* request-target forms allowed in request messages)`
`699`	`699`	`* @param mixed $requestTarget`
`700`		`- * @return ServerRequest`
	`700`	`+ * @return static`
`701`	`701`	`*/`
`702`	`702`	`public function withRequestTarget($requestTarget)`
`703`	`703`	`{`
`704`	`704`	`$serverRequest = $this->serverRequest->withRequestTarget($requestTarget);`
`705`		`- return new ServerRequest($serverRequest);`
	`705`	`+ return new static($serverRequest);`
`706`	`706`	`}`
`707`	`707`
`708`	`708`	`/**`
`@@ -713,13 +713,13 @@ public function withRequestTarget($requestTarget)`
`713`	`713`	`* updated body parameters.`
`714`	`714`	`*`
`715`	`715`	`* @param array $uploadedFiles An array tree of UploadedFileInterface instances.`
`716`		`- * @return ServerRequest`
	`716`	`+ * @return static`
`717`	`717`	`* @throws InvalidArgumentException if an invalid structure is provided.`
`718`	`718`	`*/`
`719`	`719`	`public function withUploadedFiles(array $uploadedFiles)`
`720`	`720`	`{`
`721`	`721`	`$serverRequest = $this->serverRequest->withUploadedFiles($uploadedFiles);`
`722`		`- return new ServerRequest($serverRequest);`
	`722`	`+ return new static($serverRequest);`
`723`	`723`	`}`
`724`	`724`
`725`	`725`	`/**`
`@@ -750,12 +750,12 @@ public function withUploadedFiles(array $uploadedFiles)`
`750`	`750`	`* @link http://tools.ietf.org/html/rfc3986#section-4.3`
`751`	`751`	`* @param UriInterface $uri New request URI to use.`
`752`	`752`	`* @param bool $preserveHost Preserve the original state of the Host header.`
`753`		`- * @return ServerRequest`
	`753`	`+ * @return static`
`754`	`754`	`*/`
`755`	`755`	`public function withUri(UriInterface $uri, $preserveHost = false)`
`756`	`756`	`{`
`757`	`757`	`$serverRequest = $this->serverRequest->withUri($uri, $preserveHost);`
`758`		`- return new ServerRequest($serverRequest);`
	`758`	`+ return new static($serverRequest);`
`759`	`759`	`}`
`760`	`760`
`761`	`761`	`/**`
`@@ -986,9 +986,9 @@ public function getServerParam($key, $default = null)`
`986`	`986`	`*`
`987`	`987`	`* @param string $mediaType A HTTP media type (excluding content-type params).`
`988`	`988`	`* @param callable $callable A callable that returns parsed contents for media type.`
`989`		`- * @return self`
	`989`	`+ * @return static`
`990`	`990`	`*/`
`991`		`- public function registerMediaTypeParser($mediaType, callable $callable)`
	`991`	`+ public function registerMediaTypeParser($mediaType, callable $callable): ServerRequestInterface`
`992`	`992`	`{`
`993`	`993`	`if ($callable instanceof Closure) {`
`994`	`994`	`$callable = $callable->bindTo($this);`