Updated RequestInterface to compose a UriInterface instance

Author: weierophinney

src/RequestInterface.php

@@ -10,7 +10,7 @@
  *
  * - Protocol version
  * - HTTP method
- * - URL
+ * - URI
  * - Headers
  * - Message body
  *
@@ -48,81 +48,24 @@ public function withMethod($method);
     /**
      * Retrieves the absolute URI.
      *
-     * An absolute URI consists of minimally scheme and host, but can also
-     * contain:
-     *
-     * - authentication (user/pass) if provided
-     * - port (if non-standard)
-     * - path (if any)
-     * - query string (if present)
-     * - fragment (if present)
-     *
-     * If either of the scheme or host are not present, this method MUST return
-     * null.
+     * This method MUST return a UriInterface instance.
      *
      * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @return string|null Returns the absolute URL as a string. The URL MUST
-     *     include the scheme and host; if the port is non-standard for the
-     *     scheme, the port MUST be included; authentication data MAY be
-     *     provided. If either host or scheme are missing, this method MUST
-     *     return null.
+     * @return UriInterface Returns a UriInterface instance representing the
+     *     URI of the request, if any.
      */
-    public function getAbsoluteUri();
+    public function getUri();
 
     /**
-     * Create a new instance with the provided absolute URI.
-     *
-     * The absolute URI MUST be a string, and MUST include the scheme and host.
-     *
-     * If the port is non-standard for the scheme, the port MUST be provided.
-     *
-     * Authentication data MAY be provided.
-     *
-     * Path, query string, and fragment are optional.
-     *
-     * When setting the absolute URI, the url (see getUrl() and setUrl()) MUST
-     * be updated.
+     * Create a new instance with the provided URI.
      *
      * This method MUST be implemented in such a way as to retain the
      * immutability of the message, and MUST return a new instance that has the
-     * changed URI and updated URL.
+     * new UriInterface instance.
      *
      * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @param string $uri Absolute request URI.
-     * @return RequestInterface
-     * @throws \InvalidArgumentException If the URI is invalid.
-     */
-    public function withAbsoluteUri($uri);
-
-    /**
-     * Retrieves the request URL.
-     *
-     * The request URL is the path and query string ONLY.
-     *
-     * @link http://tools.ietf.org/html/rfc7230#section-5.3
-     * @return string Returns the URL as a string. The URL MUST be an
-     *     origin-form (path + query string), per RFC 7230 section 5.3
-     */
-    public function getUrl();
-
-    /**
-     * Create a new instance with the specified request URL.
-     *
-     * The URL MUST be a string. The URL SHOULD be an origin-form (path + query
-     * string) per RFC 7230 section 5.3; if other URL parts are present, the
-     * method MUST raise an exception OR remove those parts.
-     *
-     * When setting the URL, the absolute URI (see getAbsoluteUri() and
-     * setAbsoluteUri()) MUST be updated.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * changed URL and updated absolute URI.
-     *
-     * @link http://tools.ietf.org/html/rfc7230#section-5.3
-     * @param string $url Request URL, with path and optionally query string.
+     * @param UriInterface $uri New request URI to use.
      * @return RequestInterface
-     * @throws \InvalidArgumentException If the URL is invalid.
      */
-    public function withUrl($url);
+    public function withUri(UriInterface $uri);
 }