return types

Author: devosc

src/Http/Config/Request.php

@@ -5,6 +5,7 @@
 
 namespace Valar\Http\Config;
 
+use Mvc5\Http;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 
@@ -18,7 +19,7 @@ trait Request
     /**
      *
      */
-    use \Mvc5\Http\Config\Request;
+    use Http\Config\Request;
 
     /**
      * @return StreamInterface|mixed
@@ -107,19 +108,19 @@ function hasHeader($name) : bool
 
     /**
      * @param StreamInterface $body
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withBody(StreamInterface $body)
+    function withBody(StreamInterface $body) : Http\Request
     {
         return $this->with(BODY, $body);
     }
 
     /**
      * @param $name
      * @param $value
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withAddedHeader($name, $value)
+    function withAddedHeader($name, $value) : Http\Request
     {
         $header = $this[HEADERS][$name] ?? null;
 
@@ -137,55 +138,55 @@ function withAddedHeader($name, $value)
     /**
      * @param $name
      * @param $value
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withHeader($name, $value)
+    function withHeader($name, $value) : Http\Request
     {
         return $this->with(HEADERS, $this->headers()->with($name, $value));
     }
 
     /**
      * @param $name
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withoutHeader($name)
+    function withoutHeader($name) : Http\Request
     {
         return $this->with(HEADERS, $this->headers()->without($name));
     }
 
     /**
      * @param $method
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withMethod($method)
+    function withMethod($method) : Http\Request
     {
         return $this->with(METHOD, $method);
     }
 
     /**
      * @param $version
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withProtocolVersion($version)
+    function withProtocolVersion($version) : Http\Request
     {
         return $this->with(VERSION, $version);
     }
 
     /**
      * @param $requestTarget
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withRequestTarget($requestTarget)
+    function withRequestTarget($requestTarget) : Http\Request
     {
         return $this->with(TARGET, $requestTarget);
     }
 
     /**
      * @param UriInterface $uri
      * @param bool $preserveHost
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withUri(UriInterface $uri, $preserveHost = false)
+    function withUri(UriInterface $uri, $preserveHost = false) : Http\Request
     {
         $host = $uri->getHost();
 

src/Http/Config/Response.php

@@ -5,6 +5,7 @@
 
 namespace Valar\Http\Config;
 
+use Mvc5\Http;
 use Psr\Http\Message\StreamInterface;
 
 use function implode;
@@ -17,10 +18,10 @@ trait Response
     /**
      *
      */
-    use \Mvc5\Http\Config\Response;
+    use Http\Config\Response;
 
     /**
-     * @return mixed|StreamInterface
+     * @return StreamInterface|mixed
      */
     function getBody()
     {
@@ -94,19 +95,19 @@ function hasHeader($name) : bool
 
     /**
      * @param StreamInterface $body
-     * @return mixed|self
+     * @return Http\Response|mixed
      */
-    function withBody(StreamInterface $body)
+    function withBody(StreamInterface $body) : Http\Response
     {
         return $this->with(BODY, $body);
     }
 
     /**
      * @param $name
      * @param $value
-     * @return mixed|self
+     * @return Http\Response|mixed
      */
-    function withAddedHeader($name, $value)
+    function withAddedHeader($name, $value) : Http\Response
     {
         $header = $this[HEADERS][$name] ?? null;
 
@@ -124,37 +125,37 @@ function withAddedHeader($name, $value)
     /**
      * @param $name
      * @param $value
-     * @return mixed|self
+     * @return Http\Response|mixed
      */
-    function withHeader($name, $value)
+    function withHeader($name, $value) : Http\Response
     {
         return $this->with(HEADERS, $this->headers()->with($name, $value));
     }
 
     /**
      * @param $name
-     * @return mixed|self
+     * @return Http\Response|mixed
      */
-    function withoutHeader($name)
+    function withoutHeader($name) : Http\Response
     {
         return $this->with(HEADERS, $this->headers()->without($name));
     }
 
     /**
      * @param $version
-     * @return mixed|self
+     * @return Http\Response|mixed
      */
-    function withProtocolVersion($version)
+    function withProtocolVersion($version) : Http\Response
     {
         return $this->with(VERSION, $version);
     }
 
     /**
      * @param $code
      * @param string $reasonPhrase
-     * @return mixed|self
+     * @return Http\Response|mixed
      */
-    function withStatus($code, $reasonPhrase = '')
+    function withStatus($code, $reasonPhrase = '') : Http\Response
     {
         return $this->with([STATUS => $code, REASON => $reasonPhrase]);
     }

src/Http/Config/ServerRequest.php

@@ -6,6 +6,7 @@
 namespace Valar\Http\Config;
 
 use Mvc5\Cookie\HttpCookies;
+use Mvc5\Http;
 
 use const Mvc5\{ ARGS, ATTRIBUTES, COOKIES, DATA, FILES, SERVER };
 
@@ -77,54 +78,54 @@ function getUploadedFiles() : array
     /**
      * @param $name
      * @param $value
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withAttribute($name, $value)
+    function withAttribute($name, $value) : Http\Request
     {
         return $this->with(ATTRIBUTES, with($this->getAttributes(), $name, $value));
     }
 
     /**
      * @param $name
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withoutAttribute($name)
+    function withoutAttribute($name) : Http\Request
     {
         return $this->with(ATTRIBUTES, without($this->getAttributes(), $name));
     }
 
     /**
      * @param array $cookies
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withCookieParams(array $cookies)
+    function withCookieParams(array $cookies) : Http\Request
     {
         return $this->with(COOKIES, new HttpCookies($cookies));
     }
 
     /**
      * @param $data
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withParsedBody($data)
+    function withParsedBody($data) : Http\Request
     {
         return $this->with(DATA, $data);
     }
 
     /**
      * @param array $query
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withQueryParams(array $query)
+    function withQueryParams(array $query) : Http\Request
     {
         return $this->with(ARGS, $query);
     }
 
     /**
      * @param array $uploadedFiles
-     * @return mixed|self
+     * @return Http\Request|mixed
      */
-    function withUploadedFiles(array $uploadedFiles)
+    function withUploadedFiles(array $uploadedFiles) : Http\Request
     {
         return $this->with(FILES, $uploadedFiles);
     }

src/Http/Config/Uri.php

@@ -5,14 +5,16 @@
 
 namespace Valar\Http\Config;
 
+use Mvc5\Http;
+
 use const Mvc5\{ FRAGMENT, HOST, QUERY, PATH, PASS, PORT, SCHEME, USER };
 
 trait Uri
 {
     /**
      *
      */
-    use \Mvc5\Http\Config\Uri;
+    use Http\Config\Uri;
 
     /**
      * @return string
@@ -86,64 +88,64 @@ function getUserInfo() : string
 
     /**
      * @param string $fragment
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withFragment($fragment)
+    function withFragment($fragment) : Http\Uri
     {
         return $this->with(FRAGMENT, $fragment);
     }
 
     /**
      * @param $host
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withHost($host)
+    function withHost($host) : Http\Uri
     {
         return $this->with(HOST, $host);
     }
 
     /**
      * @param $path
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withPath($path)
+    function withPath($path) : Http\Uri
     {
         return $this->with(PATH, $path);
     }
 
     /**
      * @param $port
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withPort($port)
+    function withPort($port) : Http\Uri
     {
         return $this->with(PORT, $port);
     }
 
     /**
      * @param $query
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withQuery($query)
+    function withQuery($query) : Http\Uri
     {
         return $this->with(QUERY, $query);
     }
 
     /**
      * @param $scheme
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withScheme($scheme)
+    function withScheme($scheme) : Http\Uri
     {
         return $this->with(SCHEME, $scheme);
     }
 
     /**
      * @param $user
      * @param null $password
-     * @return mixed|self
+     * @return Http\Uri|mixed
      */
-    function withUserInfo($user, $password = null)
+    function withUserInfo($user, $password = null) : Http\Uri
     {
         return $this->with([USER => $user, PASS => $password]);
     }