kambo-1st / HttpMessage

src/Uri.php

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
      *
      * @var integer
      */
-    const HTTP_PORT  = 80;
+    const HTTP_PORT = 80;
 
     /**
      * Https port
@@ -198,7 +198,7 @@ 
         $port     = $this->getPort();
         $userInfo = $this->getUserInfo();
 
-        return ($userInfo ? $userInfo. '@' : '').$this->getHost().($port ? ':' . $port : '');
+        return ($userInfo ? $userInfo . '@' : '') . $this->getHost() . ($port ? ':' . $port : '');
     }
 
     /**
@@ -220,7 +220,7 @@ 
         if (!empty($this->user)) {
             $userInfo = $this->user;
             if (!empty($this->password)) {
-                $userInfo .= ':'.$this->password;
+                $userInfo .= ':' . $this->password;
             }
         }
 
@@ -470,7 +470,7 @@ 
         $this->validatePath($path);
 
         $clone       = clone $this;
-        $clone->path = $this->urlEncode((string)$path);
+        $clone->path = $this->urlEncode((string) $path);
 
         return $clone;
     }
@@ -497,7 +497,7 @@ 
         $this->validateQuery($query);
 
         $clone        = clone $this;
-        $clone->query = $this->urlEncode((string)$query);
+        $clone->query = $this->urlEncode((string) $query);
 
         return $clone;
     }
@@ -566,8 +566,8 @@ 
 
         $path = '/' . ltrim($path, '/');
 
-        return ($scheme ? $scheme.':' : '').($authority ? '//'.$authority : '')
-            .$path.($query ? '?' . $query : '').($fragment ? '#' . $fragment : '');
+        return ($scheme ? $scheme . ':' : '') . ($authority ? '//' . $authority : '')
+            .$path . ($query ? '?' . $query : '') . ($fragment ? '#' . $fragment : '');
     }
 
     // ------------ PRIVATE METHODS
@@ -599,7 +599,7 @@ 
             throw new InvalidArgumentException('Uri scheme must be a string');
         }
 
-        $scheme = str_replace('://', '', strtolower((string)$scheme));
+        $scheme = str_replace('://', '', strtolower((string) $scheme));
         if (!isset($this->validSchema[$scheme])) {
             throw new InvalidArgumentException('Uri scheme must be one of: "", "https", "http"');
         }
@@ -702,7 +702,7 @@ 
     {
         return preg_replace_callback(
             '/(?:[^a-zA-Z0-9_\-\.~:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
-            function ($match) {
+            function($match) {
                 return rawurlencode($match[0]);
             },
             $path

src/Request.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Psr\Http\Message\UriInterface;
 
 // \HttpMessage
-use Kambo\HttpMessage\Uri;
 use Kambo\HttpMessage\Message;
 use Kambo\HttpMessage\Headers;
 use Kambo\HttpMessage\RequestTrait;

src/RequestTrait.php

Unused Use Statements -2 removed lines

@@ -5,13 +5,11 @@
 use InvalidArgumentException;
 
 // \Psr
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
 // \HttpMessage
 use Kambo\HttpMessage\Uri;
 use Kambo\HttpMessage\Message;
-use Kambo\HttpMessage\Headers;
 
 /**
  * Shared methods for outgoing, client-side request and server request.

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             $target = '/';
             if ($this->uri->getPath() !== null) {
                 $target = $this->uri->getPath();
-                $target .= (!empty($this->uri->getQuery())) ? '?'.$this->uri->getQuery() : '';
+                $target .= (!empty($this->uri->getQuery())) ? '?' . $this->uri->getQuery() : '';
             }
 
             $this->requestTarget = $target;