diff --git a/spec/Encoding/DechunkStreamSpec.php b/spec/Encoding/DechunkStreamSpec.php
index 0077f2b..5a57fe0 100644
--- a/spec/Encoding/DechunkStreamSpec.php
+++ b/spec/Encoding/DechunkStreamSpec.php
@@ -36,11 +36,11 @@ public function it_gets_content()
         $this->getContents()->shouldReturn('test');
     }
 
-        public function it_does_not_know_the_content_size()
-        {
-            $stream = new MemoryStream("4\r\ntest\r\n4\r\ntest\r\n0\r\n\r\n\0");
-            $this->beConstructedWith($stream);
+    public function it_does_not_know_the_content_size()
+    {
+        $stream = new MemoryStream("4\r\ntest\r\n4\r\ntest\r\n0\r\n\r\n\0");
+        $this->beConstructedWith($stream);
 
-            $this->getSize()->shouldReturn(null);
-        }
+        $this->getSize()->shouldReturn(null);
+    }
 }
diff --git a/src/Authentication/AutoBasicAuth.php b/src/Authentication/AutoBasicAuth.php
index 7b6a429..6120016 100644
--- a/src/Authentication/AutoBasicAuth.php
+++ b/src/Authentication/AutoBasicAuth.php
@@ -27,9 +27,6 @@ public function __construct($shouldRremoveUserInfo = true)
         $this->shouldRemoveUserInfo = (bool) $shouldRremoveUserInfo;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         $uri = $request->getUri();
diff --git a/src/Authentication/BasicAuth.php b/src/Authentication/BasicAuth.php
index 23618a5..85b13a2 100644
--- a/src/Authentication/BasicAuth.php
+++ b/src/Authentication/BasicAuth.php
@@ -32,9 +32,6 @@ public function __construct($username, $password)
         $this->password = $password;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         $header = sprintf('Basic %s', base64_encode(sprintf('%s:%s', $this->username, $this->password)));
diff --git a/src/Authentication/Bearer.php b/src/Authentication/Bearer.php
index a8fb21a..287de2d 100644
--- a/src/Authentication/Bearer.php
+++ b/src/Authentication/Bearer.php
@@ -25,9 +25,6 @@ public function __construct($token)
         $this->token = $token;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         $header = sprintf('Bearer %s', $this->token);
diff --git a/src/Authentication/Chain.php b/src/Authentication/Chain.php
index 71002bb..d1d36d5 100644
--- a/src/Authentication/Chain.php
+++ b/src/Authentication/Chain.php
@@ -33,9 +33,6 @@ public function __construct(array $authenticationChain = [])
         $this->authenticationChain = $authenticationChain;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         foreach ($this->authenticationChain as $authentication) {
diff --git a/src/Authentication/Header.php b/src/Authentication/Header.php
index 77f6382..5b1b2e0 100644
--- a/src/Authentication/Header.php
+++ b/src/Authentication/Header.php
@@ -26,9 +26,6 @@ public function __construct(string $name, $value)
         $this->value = $value;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         return $request->withHeader($this->name, $this->value);
diff --git a/src/Authentication/Matching.php b/src/Authentication/Matching.php
index 7a5c247..5c2f0f2 100644
--- a/src/Authentication/Matching.php
+++ b/src/Authentication/Matching.php
@@ -39,9 +39,6 @@ public function __construct(Authentication $authentication, callable $matcher =
         $this->matcher = new CallbackRequestMatcher($matcher);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         if ($this->matcher->matches($request)) {
diff --git a/src/Authentication/QueryParam.php b/src/Authentication/QueryParam.php
index 243efef..bc7b020 100644
--- a/src/Authentication/QueryParam.php
+++ b/src/Authentication/QueryParam.php
@@ -25,9 +25,6 @@ public function __construct(array $params)
         $this->params = $params;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         $uri = $request->getUri();
diff --git a/src/Authentication/RequestConditional.php b/src/Authentication/RequestConditional.php
index 01062cf..fefe44e 100644
--- a/src/Authentication/RequestConditional.php
+++ b/src/Authentication/RequestConditional.php
@@ -29,9 +29,6 @@ public function __construct(RequestMatcher $requestMatcher, Authentication $auth
         $this->authentication = $authentication;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         if ($this->requestMatcher->matches($request)) {
diff --git a/src/Authentication/Wsse.php b/src/Authentication/Wsse.php
index 88c266b..9191efe 100644
--- a/src/Authentication/Wsse.php
+++ b/src/Authentication/Wsse.php
@@ -42,9 +42,6 @@ public function __construct($username, $password, $hashAlgorithm = 'sha1')
         $this->hashAlgorithm = $hashAlgorithm;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function authenticate(RequestInterface $request)
     {
         $nonce = substr(md5(uniqid(uniqid().'_', true)), 0, 16);
diff --git a/src/CookieJar.php b/src/CookieJar.php
index 165084d..159a99f 100644
--- a/src/CookieJar.php
+++ b/src/CookieJar.php
@@ -192,18 +192,12 @@ public function clear()
         $this->cookies = new \SplObjectStorage();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->cookies->count();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     #[\ReturnTypeWillChange]
     public function getIterator()
     {
diff --git a/src/Encoding/DeflateStream.php b/src/Encoding/DeflateStream.php
index d18dd0a..d8d8a8a 100644
--- a/src/Encoding/DeflateStream.php
+++ b/src/Encoding/DeflateStream.php
@@ -23,17 +23,11 @@ public function __construct(StreamInterface $stream, $level = -1)
         $this->writeFilterCallback = Filter\fun($this->writeFilter(), ['window' => -15]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function readFilter(): string
     {
         return 'zlib.deflate';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function writeFilter(): string
     {
         return 'zlib.inflate';
diff --git a/src/Encoding/FilteredStream.php b/src/Encoding/FilteredStream.php
index d2e0e45..4bc44a6 100644
--- a/src/Encoding/FilteredStream.php
+++ b/src/Encoding/FilteredStream.php
@@ -120,9 +120,6 @@ protected function fill(): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getContents(): string
     {
         $buffer = '';
diff --git a/src/Encoding/GzipDecodeStream.php b/src/Encoding/GzipDecodeStream.php
index 9872499..78ecc84 100644
--- a/src/Encoding/GzipDecodeStream.php
+++ b/src/Encoding/GzipDecodeStream.php
@@ -27,17 +27,11 @@ public function __construct(StreamInterface $stream, $level = -1)
         $this->writeFilterCallback = Filter\fun($this->writeFilter(), ['window' => 31, 'level' => $level]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function readFilter(): string
     {
         return 'zlib.inflate';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function writeFilter(): string
     {
         return 'zlib.deflate';
diff --git a/src/Encoding/GzipEncodeStream.php b/src/Encoding/GzipEncodeStream.php
index 36018c2..7ffa499 100644
--- a/src/Encoding/GzipEncodeStream.php
+++ b/src/Encoding/GzipEncodeStream.php
@@ -27,17 +27,11 @@ public function __construct(StreamInterface $stream, $level = -1)
         $this->writeFilterCallback = Filter\fun($this->writeFilter(), ['window' => 31]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function readFilter(): string
     {
         return 'zlib.deflate';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function writeFilter(): string
     {
         return 'zlib.inflate';
diff --git a/src/Formatter/CurlCommandFormatter.php b/src/Formatter/CurlCommandFormatter.php
index 80d2971..1878cad 100644
--- a/src/Formatter/CurlCommandFormatter.php
+++ b/src/Formatter/CurlCommandFormatter.php
@@ -13,9 +13,6 @@
  */
 class CurlCommandFormatter implements Formatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function formatRequest(RequestInterface $request)
     {
         $command = sprintf('curl %s', escapeshellarg((string) $request->getUri()->withFragment('')));
@@ -60,9 +57,6 @@ public function formatRequest(RequestInterface $request)
         return $command;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function formatResponse(ResponseInterface $response)
     {
         return '';
diff --git a/src/Formatter/FullHttpMessageFormatter.php b/src/Formatter/FullHttpMessageFormatter.php
index 8b9b126..116b2dd 100644
--- a/src/Formatter/FullHttpMessageFormatter.php
+++ b/src/Formatter/FullHttpMessageFormatter.php
@@ -36,9 +36,6 @@ public function __construct($maxBodyLength = 1000, string $binaryDetectionRegex
         $this->binaryDetectionRegex = $binaryDetectionRegex;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function formatRequest(RequestInterface $request)
     {
         $message = sprintf(
@@ -55,9 +52,6 @@ public function formatRequest(RequestInterface $request)
         return $this->addBody($request, $message);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function formatResponse(ResponseInterface $response)
     {
         $message = sprintf(
diff --git a/src/Formatter/SimpleFormatter.php b/src/Formatter/SimpleFormatter.php
index ee99ae3..c8b0450 100644
--- a/src/Formatter/SimpleFormatter.php
+++ b/src/Formatter/SimpleFormatter.php
@@ -14,9 +14,6 @@
  */
 class SimpleFormatter implements Formatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function formatRequest(RequestInterface $request)
     {
         return sprintf(
@@ -27,9 +24,6 @@ public function formatRequest(RequestInterface $request)
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function formatResponse(ResponseInterface $response)
     {
         return sprintf(
diff --git a/src/MessageFactory/DiactorosMessageFactory.php b/src/MessageFactory/DiactorosMessageFactory.php
index 51d15a2..c13f573 100644
--- a/src/MessageFactory/DiactorosMessageFactory.php
+++ b/src/MessageFactory/DiactorosMessageFactory.php
@@ -32,9 +32,6 @@ public function __construct()
         $this->streamFactory = new DiactorosStreamFactory();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createRequest(
         $method,
         $uri,
@@ -59,9 +56,6 @@ public function createRequest(
         ))->withProtocolVersion($protocolVersion);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createResponse(
         $statusCode = 200,
         $reasonPhrase = null,
diff --git a/src/MessageFactory/GuzzleMessageFactory.php b/src/MessageFactory/GuzzleMessageFactory.php
index 65353ff..8844f74 100644
--- a/src/MessageFactory/GuzzleMessageFactory.php
+++ b/src/MessageFactory/GuzzleMessageFactory.php
@@ -19,9 +19,6 @@
  */
 final class GuzzleMessageFactory implements MessageFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createRequest(
         $method,
         $uri,
@@ -38,9 +35,6 @@ public function createRequest(
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createResponse(
         $statusCode = 200,
         $reasonPhrase = null,
diff --git a/src/MessageFactory/SlimMessageFactory.php b/src/MessageFactory/SlimMessageFactory.php
index bc59ef5..118799c 100644
--- a/src/MessageFactory/SlimMessageFactory.php
+++ b/src/MessageFactory/SlimMessageFactory.php
@@ -38,9 +38,6 @@ public function __construct()
         $this->uriFactory = new SlimUriFactory();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createRequest(
         $method,
         $uri,
@@ -59,9 +56,6 @@ public function createRequest(
         ))->withProtocolVersion($protocolVersion);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function createResponse(
         $statusCode = 200,
         $reasonPhrase = null,
diff --git a/src/RequestMatcher/CallbackRequestMatcher.php b/src/RequestMatcher/CallbackRequestMatcher.php
index 1197dd9..659e6e3 100644
--- a/src/RequestMatcher/CallbackRequestMatcher.php
+++ b/src/RequestMatcher/CallbackRequestMatcher.php
@@ -22,9 +22,6 @@ public function __construct(callable $callback)
         $this->callback = $callback;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function matches(RequestInterface $request)
     {
         return (bool) call_user_func($this->callback, $request);
diff --git a/src/RequestMatcher/RegexRequestMatcher.php b/src/RequestMatcher/RegexRequestMatcher.php
index 91f3729..253d9bc 100644
--- a/src/RequestMatcher/RegexRequestMatcher.php
+++ b/src/RequestMatcher/RegexRequestMatcher.php
@@ -31,9 +31,6 @@ public function __construct($regex)
         $this->regex = $regex;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function matches(RequestInterface $request)
     {
         return (bool) preg_match($this->regex, (string) $request->getUri());
diff --git a/src/RequestMatcher/RequestMatcher.php b/src/RequestMatcher/RequestMatcher.php
index e2aa021..4b28ccc 100644
--- a/src/RequestMatcher/RequestMatcher.php
+++ b/src/RequestMatcher/RequestMatcher.php
@@ -51,8 +51,6 @@ public function __construct($path = null, $host = null, $methods = [], $schemes
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @api
      */
     public function matches(RequestInterface $request)
diff --git a/src/Stream/BufferedStream.php b/src/Stream/BufferedStream.php
index cf23fc7..13fc06b 100644
--- a/src/Stream/BufferedStream.php
+++ b/src/Stream/BufferedStream.php
@@ -209,7 +209,7 @@ public function getContents(): string
         return $read;
     }
 
-    public function getMetadata(?string $key = null)
+    public function getMetadata(string $key = null)
     {
         if (null === $this->resource) {
             if (null === $key) {
diff --git a/src/StreamFactory/DiactorosStreamFactory.php b/src/StreamFactory/DiactorosStreamFactory.php
index 59255d4..1b8c6f4 100644
--- a/src/StreamFactory/DiactorosStreamFactory.php
+++ b/src/StreamFactory/DiactorosStreamFactory.php
@@ -20,9 +20,6 @@
  */
 final class DiactorosStreamFactory implements StreamFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createStream($body = null)
     {
         if ($body instanceof StreamInterface) {
diff --git a/src/StreamFactory/GuzzleStreamFactory.php b/src/StreamFactory/GuzzleStreamFactory.php
index fb23ddf..f74bc5b 100644
--- a/src/StreamFactory/GuzzleStreamFactory.php
+++ b/src/StreamFactory/GuzzleStreamFactory.php
@@ -18,9 +18,6 @@
  */
 final class GuzzleStreamFactory implements StreamFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createStream($body = null)
     {
         if (class_exists(Utils::class)) {
diff --git a/src/StreamFactory/SlimStreamFactory.php b/src/StreamFactory/SlimStreamFactory.php
index aee112e..4cfa9ae 100644
--- a/src/StreamFactory/SlimStreamFactory.php
+++ b/src/StreamFactory/SlimStreamFactory.php
@@ -19,9 +19,6 @@
  */
 final class SlimStreamFactory implements StreamFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createStream($body = null)
     {
         if ($body instanceof StreamInterface) {
diff --git a/src/UriFactory/DiactorosUriFactory.php b/src/UriFactory/DiactorosUriFactory.php
index f67c7b3..84d5397 100644
--- a/src/UriFactory/DiactorosUriFactory.php
+++ b/src/UriFactory/DiactorosUriFactory.php
@@ -20,9 +20,6 @@
  */
 final class DiactorosUriFactory implements UriFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createUri($uri)
     {
         if ($uri instanceof UriInterface) {
diff --git a/src/UriFactory/GuzzleUriFactory.php b/src/UriFactory/GuzzleUriFactory.php
index 7256740..deac230 100644
--- a/src/UriFactory/GuzzleUriFactory.php
+++ b/src/UriFactory/GuzzleUriFactory.php
@@ -20,9 +20,6 @@
  */
 final class GuzzleUriFactory implements UriFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createUri($uri)
     {
         if (class_exists(Utils::class)) {
diff --git a/src/UriFactory/SlimUriFactory.php b/src/UriFactory/SlimUriFactory.php
index f39d0f6..e4ff079 100644
--- a/src/UriFactory/SlimUriFactory.php
+++ b/src/UriFactory/SlimUriFactory.php
@@ -19,9 +19,6 @@
  */
 final class SlimUriFactory implements UriFactory
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createUri($uri)
     {
         if ($uri instanceof UriInterface) {