Merge branch 'pr2134' into 4.x

Forward port #2134
slimphp · Jan 30, 2017 · 9615ff8 · 9615ff8
2 parents e708acd + 723fcc0
commit 9615ff8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Slim/Http/Request.php b/Slim/Http/Request.php
@@ -131,7 +131,7 @@ class Request extends Message implements ServerRequestInterface
      *
      * @param  Environment $environment The Slim application Environment
      *
-     * @return self
+     * @return static
      */
     public static function createFromEnvironment(Environment $environment)
     {
@@ -286,7 +286,7 @@ public function getOriginalMethod()
      * changed request method.
      *
      * @param string $method Case-sensitive method.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
     public function withMethod($method)
@@ -496,7 +496,7 @@ public function getRequestTarget()
      * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
      *     request-target forms allowed in request messages)
      * @param mixed $requestTarget
-     * @return self
+     * @return static
      * @throws InvalidArgumentException if the request target is invalid
      */
     public function withRequestTarget($requestTarget)
@@ -554,7 +554,7 @@ public function getUri()
      * @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 self
+     * @return static
      */
     public function withUri(UriInterface $uri, $preserveHost = false)
     {
@@ -716,7 +716,7 @@ public function getCookieParam($key, $default = null)
      * updated cookie values.
      *
      * @param array $cookies Array of key/value pairs representing cookies.
-     * @return self
+     * @return static
      */
     public function withCookieParams(array $cookies)
     {
@@ -777,7 +777,7 @@ public function getQueryParams()
      *
      * @param array $query Array of query string arguments, typically from
      *     $_GET.
-     * @return self
+     * @return static
      */
     public function withQueryParams(array $query)
     {
@@ -816,7 +816,7 @@ public function getUploadedFiles()
      * updated body parameters.
      *
      * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException if an invalid structure is provided.
      */
     public function withUploadedFiles(array $uploadedFiles)
@@ -914,7 +914,7 @@ public function getAttribute($name, $default = null)
      * @see getAttributes()
      * @param string $name The attribute name.
      * @param mixed $value The value of the attribute.
-     * @return self
+     * @return static
      */
     public function withAttribute($name, $value)
     {
@@ -937,7 +937,7 @@ public function withAttribute($name, $value)
      * updated attributes.
      *
      * @param  array $attributes New attributes
-     * @return self
+     * @return static
      */
     public function withAttributes(array $attributes)
     {
@@ -959,7 +959,7 @@ public function withAttributes(array $attributes)
      *
      * @see getAttributes()
      * @param string $name The attribute name.
-     * @return self
+     * @return static
      */
     public function withoutAttribute($name)
     {
@@ -1047,7 +1047,7 @@ public function getParsedBody()
      *
      * @param null|array|object $data The deserialized body data. This will
      *     typically be in an array or object.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
@@ -1068,7 +1068,7 @@ public function withParsedBody($data)
      *
      * Note: This method is not part of the PSR-7 standard.
      *
-     * @return self
+     * @return $this
      */
     public function reparseBody()
     {

diff --git a/Slim/Http/Response.php b/Slim/Http/Response.php
@@ -176,7 +176,7 @@ public function getStatusCode()
      * @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 self
+     * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
     public function withStatus($code, $reasonPhrase = '')
@@ -254,7 +254,7 @@ public function getReasonPhrase()
      * Proxies to the underlying stream and writes the provided data to it.
      *
      * @param string $data
-     * @return self
+     * @return $this
      */
     public function write($data)
     {
@@ -277,7 +277,7 @@ public function write($data)
      *
      * @param  string|UriInterface $url    The redirect destination.
      * @param  int|null            $status The redirect HTTP status code.
-     * @return self
+     * @return static
      */
     public function withRedirect($url, $status = null)
     {
@@ -306,7 +306,7 @@ public function withRedirect($url, $status = null)
      * @param  int    $status The HTTP status code.
      * @param  int    $encodingOptions Json encoding options
      * @throws \RuntimeException
-     * @return self
+     * @return static
      */
     public function withJson($data, $status = null, $encodingOptions = 0)
     {