diff --git a/src/Request.php b/src/Request.php
index 15a1cab..0b9334a 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -124,6 +124,7 @@ public function getMethod(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withMethod($method)
     {
@@ -189,6 +190,7 @@ public function getRequestTarget(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withRequestTarget($requestTarget)
     {
@@ -214,6 +216,7 @@ public function getUri(): UriInterface
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withUri(UriInterface $uri, $preserveHost = false)
     {
@@ -243,6 +246,7 @@ public function getCookieParams(): array
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withCookieParams(array $cookies)
     {
@@ -273,6 +277,7 @@ public function getQueryParams(): array
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withQueryParams(array $query)
     {
@@ -292,6 +297,7 @@ public function getUploadedFiles(): array
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withUploadedFiles(array $uploadedFiles)
     {
@@ -319,6 +325,7 @@ public function getAttributes(): array
 
     /**
      * {@inheritdoc}
+     * @return mixed
      */
     public function getAttribute($name, $default = null)
     {
@@ -327,6 +334,7 @@ public function getAttribute($name, $default = null)
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withAttribute($name, $value)
     {
@@ -338,6 +346,7 @@ public function withAttribute($name, $value)
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withoutAttribute($name)
     {
@@ -358,6 +367,7 @@ public function getParsedBody()
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withParsedBody($data)
     {
diff --git a/src/Response.php b/src/Response.php
index a650a56..c6d4c6e 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -138,6 +138,7 @@ public function getStatusCode(): int
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withStatus($code, $reasonPhrase = '')
     {
diff --git a/src/Stream.php b/src/Stream.php
index 113af10..9de6685 100644
--- a/src/Stream.php
+++ b/src/Stream.php
@@ -82,6 +82,7 @@ public function __construct($stream, ?StreamInterface $cache = null)
 
     /**
      * {@inheritdoc}
+     * @return array|mixed
      */
     public function getMetadata($key = null)
     {
@@ -322,6 +323,7 @@ public function read($length): string
 
     /**
      * {@inheritdoc}
+     * @return int
      */
     public function write($string)
     {
diff --git a/src/UploadedFile.php b/src/UploadedFile.php
index 3326d79..b0c4df5 100644
--- a/src/UploadedFile.php
+++ b/src/UploadedFile.php
@@ -109,6 +109,7 @@ final public function __construct(
 
     /**
      * {@inheritdoc}
+     * @return StreamInterface
      */
     public function getStream()
     {
diff --git a/src/Uri.php b/src/Uri.php
index ae61a99..b43aa54 100644
--- a/src/Uri.php
+++ b/src/Uri.php
@@ -101,6 +101,7 @@ public function getScheme(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withScheme($scheme)
     {
@@ -165,6 +166,7 @@ public function getUserInfo(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withUserInfo($user, $password = null)
     {
@@ -216,6 +218,7 @@ public function getHost(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withHost($host)
     {
@@ -264,6 +267,7 @@ public function getPort(): ?int
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withPort($port)
     {
@@ -312,6 +316,7 @@ public function getPath(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withPath($path)
     {
@@ -360,6 +365,7 @@ public function getQuery(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withQuery($query)
     {
@@ -410,6 +416,7 @@ public function getFragment(): string
 
     /**
      * {@inheritdoc}
+     * @return static
      */
     public function withFragment($fragment)
     {