Separate encode functions

icicleio · Feb 3, 2016 · 8dd104d · 8dd104d
1 parent f5aae3a
commit 8dd104d
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 48 deletions.
diff --git a/src/Driver/Encoder/Http1Encoder.php b/src/Driver/Encoder/Http1Encoder.php
@@ -48,11 +48,11 @@ protected function encodeHeaders(array $headers)
             foreach ($values as $value) {
                 switch (strtolower($name)) {
                     case 'host':
-                        $data = sprintf("%s: %s\r\n%s", $name, Message\encode($value), $data);
+                        $data = sprintf("%s: %s\r\n%s", $name, Message\encodeHeader($value), $data);
                         break;
 
                     default:
-                        $data .= sprintf("%s: %s\r\n", $name, Message\encode($value));
+                        $data .= sprintf("%s: %s\r\n", $name, Message\encodeHeader($value));
                 }
             }
         }

diff --git a/src/Message/BasicRequest.php b/src/Message/BasicRequest.php
@@ -77,32 +77,6 @@ public function getRequestTarget()
         }
 
         return $this->uri;
-
-        $target = encode($this->uri->getPath(), true);
-
-        if ('' === $target) {
-            $target = '/';
-        }
-
-        $query = $this->uri->getQueryValues();
-
-        if (empty($query)) {
-            return $target;
-        }
-
-        $encoded = [];
-
-        foreach ($query as $name => $values) {
-            foreach ($values as $value) {
-                if ('' === $value) {
-                    $encoded[] = encode($name);
-                } else {
-                    $encoded[] = sprintf('%s=%s', encode($name), encode($value));
-                }
-            }
-        }
-
-        return sprintf('%s?%s', $target, implode('&', $encoded));
     }
 
     /**

diff --git a/src/Message/BasicUri.php b/src/Message/BasicUri.php
@@ -291,15 +291,15 @@ public function __toString()
             }
         }
 
-        $uri .= encode($this->path);
+        $uri .= encodePath($this->path);
 
         $query = $this->encodeQuery();
         if ($query) {
             $uri = sprintf('%s?%s', $uri, $query);
         }
 
         if ($this->fragment) {
-            $uri = sprintf('%s#%s', $uri, encode($this->fragment));
+            $uri = sprintf('%s#%s', $uri, encodeValue($this->fragment));
         }
 
         return $uri;
@@ -514,9 +514,9 @@ protected function encodeAuthority()
 
         if ('' !== $this->user) {
             if ('' !== $this->password) {
-                $authority = sprintf('%s:%s@%s', encode($this->user), encode($this->password), $authority);
+                $authority = sprintf('%s:%s@%s', encodeValue($this->user), encodeValue($this->password), $authority);
             } else {
-                $authority = sprintf('%s@%s', encode($this->user), $authority);
+                $authority = sprintf('%s@%s', encodeValue($this->user), $authority);
             }
         }
 
@@ -542,9 +542,9 @@ protected function encodeQuery()
         foreach ($this->query as $name => $values) {
             foreach ($values as $value) {
                 if ('' === $value) {
-                    $query[] = encode($name);
+                    $query[] = encodeValue($name);
                 } else {
-                    $query[] = sprintf('%s=%s', encode($name), encode($value));
+                    $query[] = sprintf('%s=%s', encodeValue($name), encodeValue($value));
                 }
             }
         }

diff --git a/src/Message/Cookie/BasicCookie.php b/src/Message/Cookie/BasicCookie.php
@@ -71,7 +71,7 @@ public function __toString()
      */
     public function toHeader()
     {
-        return Message\encode($this->name) . '=' . Message\encode($this->value);
+        return Message\encodeValue($this->name) . '=' . Message\encodeValue($this->value);
     }
 
     /**

diff --git a/src/Message/Cookie/SetCookie.php b/src/Message/Cookie/SetCookie.php
@@ -183,7 +183,7 @@ public function toHeader()
         }
 
         if ('' !== $this->path) {
-            $line .= '; Path=' . Message\encode($this->path, true);
+            $line .= '; Path=' . Message\encodePath($this->path);
         }
 
         if ('' !== $this->domain) {

diff --git a/src/Message/functions.php b/src/Message/functions.php
@@ -3,24 +3,58 @@
 
 if (!function_exists(__NAMESPACE__ . '\encode')) {
     /**
-     * Escapes all reserved chars.
+     * Escapes URI value.
      *
-     * @param string $string
-     * @param bool $isPath
+     * @param string $value
      *
      * @return string
      */
-    function encode($string, $isPath = false)
+    function encodeValue($value)
     {
-        if ($isPath) {
-            $regex = '/(?:[^A-Za-z0-9_\-\.~\/:%]+|%(?![A-Fa-f0-9]{2}))/';
-        } else {
-            $regex = '/(?:[^A-Za-z0-9_\-\.~!\$&\'\(\)\[\]\*\+,:;=\/% ]+|%(?![A-Fa-f0-9]{2}))/';
-        }
+        return preg_replace_callback(
+            '/(?:[^A-Za-z0-9_\-\.~!\$&\'\(\)\[\]\*\+,:;=\/%]+|%(?![A-Fa-f0-9]{2}))/',
+            function (array $matches) {
+                return rawurlencode($matches[0]);
+            },
+            $value
+        );
+    }
 
-        return preg_replace_callback($regex, function (array $matches) {
-            return rawurlencode($matches[0]);
-        }, $string);
+    /**
+     * Escapes path.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    function encodePath($path)
+    {
+        return preg_replace_callback(
+            '/(?:[^A-Za-z0-9_\-\.~\/:%]+|%(?![A-Fa-f0-9]{2}))/',
+            function (array $matches) {
+                return rawurlencode($matches[0]);
+            },
+            $path
+        );
+    }
+
+
+    /**
+     * Escapes header value.
+     *
+     * @param string $header
+     *
+     * @return string
+     */
+    function encodeHeader($header)
+    {
+        return preg_replace_callback(
+            '/(?:[^A-Za-z0-9_\-\.~!\$&\'\(\)\[\]\*\+,:;=\/% ]+|%(?![A-Fa-f0-9]{2}))/',
+            function (array $matches) {
+                return rawurlencode($matches[0]);
+            },
+            $header
+        );
     }
 
     /**