Merge branch 'hotfix/148-remove-method-repitition' into develop

Forward port #148

Author: weierophinney

src/Client/Adapter/Proxy.php

@@ -156,9 +156,8 @@ public function write($method, $uri, $httpVer = '1.1', $headers = [], $body = ''
         // Build request headers
         if ($this->negotiated) {
             $path = $uri->getPath();
-            if ($uri->getQuery()) {
-                $path .= '?' . $uri->getQuery();
-            }
+            $query = $uri->getQuery();
+            $path .= $query ? '?' . $query : '';
             $request = sprintf('%s %s HTTP/%s%s', $method, $path, $httpVer, "\r\n");
         } else {
             $request = sprintf('%s %s HTTP/%s%s', $method, $uri, $httpVer, "\r\n");

src/Client/Adapter/Socket.php

@@ -376,9 +376,8 @@ public function write($method, $uri, $httpVer = '1.1', $headers = [], $body = ''
 
         // Build request headers
         $path = $uri->getPath();
-        if ($uri->getQuery()) {
-            $path .= '?' . $uri->getQuery();
-        }
+        $query = $uri->getQuery();
+        $path .= $query ? '?' . $query : '';
         $request = $method . ' ' . $path . ' HTTP/' . $httpVer . "\r\n";
         foreach ($headers as $k => $v) {
             if (is_string($k)) {

src/Client/Adapter/Test.php

@@ -127,9 +127,8 @@ public function write($method, $uri, $httpVer = '1.1', $headers = [], $body = ''
         if (empty($path)) {
             $path = '/';
         }
-        if ($uri->getQuery()) {
-            $path .= '?' . $uri->getQuery();
-        }
+        $query = $uri->getQuery();
+        $path .= $query ? '?' . $query : '';
         $request = $method . ' ' . $path . ' HTTP/' . $httpVer . "\r\n";
         foreach ($headers as $k => $v) {
             if (is_string($k)) {