Interface's methods should not return concrete class

src/UriInterface.php

@@ -10,7 +10,7 @@ interface UriInterface
     /**
      * Create a new URI object
      *
-     * @param  Uri|string|null $uri
+     * @param  UriInterface|string|null $uri
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($uri = null);
@@ -42,7 +42,7 @@ public function isAbsolute();
      * Parse a URI string
      *
      * @param  string $uri
-     * @return Uri
+     * @return static
      */
     public function parse($uri);
 
@@ -65,7 +65,7 @@ public function toString();
      * Eventually, two normalized URLs pointing to the same resource should be
      * equal even if they were originally represented by two different strings
      *
-     * @return Uri
+     * @return static
      */
     public function normalize();
 
@@ -79,7 +79,7 @@ public function normalize();
      *  way related to the base URI) the URI will not be modified.
      *
      * @param  Uri|string $baseUri
-     * @return Uri
+     * @return static
      */
     public function makeRelative($baseUri);
 
@@ -155,15 +155,15 @@ public function getFragment();
      *
      * @param  string $scheme
      * @throws Exception\InvalidUriPartException
-     * @return Uri
+     * @return static
      */
     public function setScheme($scheme);
 
     /**
      * Set the URI User-info part (usually user:password)
      *
      * @param  string $userInfo
-     * @return Uri
+     * @return static
      * @throws Exception\InvalidUriPartException If the schema definition does not have this part.
      */
     public function setUserInfo($userInfo);
@@ -184,23 +184,23 @@ public function setUserInfo($userInfo);
      *
      * @param  string $host
      * @throws Exception\InvalidUriPartException
-     * @return Uri
+     * @return static
      */
     public function setHost($host);
 
     /**
      * Set the port part of the URI
      *
      * @param  int $port
-     * @return Uri
+     * @return static
      */
     public function setPort($port);
 
     /**
      * Set the path
      *
      * @param  string $path
-     * @return Uri
+     * @return static
      */
     public function setPath($path);
 
@@ -212,15 +212,15 @@ public function setPath($path);
      * PHP's common square bracket notation.
      *
      * @param  string|array $query
-     * @return Uri
+     * @return static
      */
     public function setQuery($query);
 
     /**
      * Set the URI fragment part
      *
      * @param  string $fragment
-     * @return Uri
+     * @return static
      * @throws Exception\InvalidUriPartException If the schema definition does not have this part.
      */
     public function setFragment($fragment);