Encode URIs according to RFC 3986

Author: GrahamCampbell

CHANGELOG.md

@@ -7,6 +7,7 @@ CHANGE LOG
 * Use PSR-7, PSR-17 and PSR-18 only
 * Update against latest API spec
 * Refactored exceptions and internals
+* Encode URIs according to RFC 3986
 
 
 ## V2.1.5 (29/06/2020)

src/HttpClient/Util/UriBuilder.php

@@ -24,13 +24,6 @@
  */
 final class UriBuilder
 {
-    /**
-     * The URI part separator.
-     *
-     * @var string
-     */
-    private const URI_SEPARATOR = '/';
-
     /**
      * Build a URI from the given parts.
      *
@@ -45,10 +38,10 @@ public static function build(string ...$parts)
                 throw new ValueError(sprintf('%s::buildUri(): Argument #%d ($parts) must non-empty', self::class, $index + 1));
             }
 
-            $parts[$index] = self::encodePart($part);
+            $parts[$index] = rawurlencode($part);
         }
 
-        return implode(self::URI_SEPARATOR, $parts);
+        return implode('/', $parts);
     }
 
     /**
@@ -60,20 +53,6 @@ public static function build(string ...$parts)
      */
     public static function appendSeparator(string $uri)
     {
-        return sprintf('%s%s', $uri, self::URI_SEPARATOR);
-    }
-
-    /**
-     * Encode the given part for a URI.
-     *
-     * @param string $part
-     *
-     * @return string
-     */
-    private static function encodePart(string $part)
-    {
-        $part = rawurlencode($part);
-
-        return str_replace('.', '%2E', $part);
+        return sprintf('%s%s', $uri, '/');
     }
 }