Nyholm / psr7

tests/StreamTest.php

Spacing +8 added lines, -8 removed lines

@@ -113,7 +113,7 @@ 
         $this->assertFalse($stream->isWritable());
         $this->assertFalse($stream->isSeekable());
 
-        $throws = function (callable $fn) use ($stream) {
+        $throws = function(callable $fn) use ($stream) {
             try {
                 $fn($stream);
                 $this->fail();
@@ -121,25 +121,25 @@ 
             }
         };
 
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->read(10);
         });
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->write('bar');
         });
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->seek(10);
         });
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->tell();
         });
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->eof();
         });
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->getSize();
         });
-        $throws(function ($stream) {
+        $throws(function($stream) {
             $stream->getContents();
         });
         $this->assertSame('', (string) $stream);

tests/UriTest.php

Spacing +52 added lines, -52 removed lines

@@ -212,61 +212,61 @@
     public function getResolveTestCases()
     {
         return [
-            [self::RFC3986_BASE, 'g:h',           'g:h'],
-            [self::RFC3986_BASE, 'g',             'http://a/b/c/g'],
-            [self::RFC3986_BASE, './g',           'http://a/b/c/g'],
-            [self::RFC3986_BASE, 'g/',            'http://a/b/c/g/'],
-            [self::RFC3986_BASE, '/g',            'http://a/g'],
-            [self::RFC3986_BASE, '//g',           'http://g'],
-            [self::RFC3986_BASE, '?y',            'http://a/b/c/d;p?y'],
-            [self::RFC3986_BASE, 'g?y',           'http://a/b/c/g?y'],
-            [self::RFC3986_BASE, '#s',            'http://a/b/c/d;p?q#s'],
-            [self::RFC3986_BASE, 'g#s',           'http://a/b/c/g#s'],
-            [self::RFC3986_BASE, 'g?y#s',         'http://a/b/c/g?y#s'],
-            [self::RFC3986_BASE, ';x',            'http://a/b/c/;x'],
-            [self::RFC3986_BASE, 'g;x',           'http://a/b/c/g;x'],
-            [self::RFC3986_BASE, 'g;x?y#s',       'http://a/b/c/g;x?y#s'],
-            [self::RFC3986_BASE, '',              self::RFC3986_BASE],
-            [self::RFC3986_BASE, '.',             'http://a/b/c/'],
-            [self::RFC3986_BASE, './',            'http://a/b/c/'],
-            [self::RFC3986_BASE, '..',            'http://a/b/'],
-            [self::RFC3986_BASE, '../',           'http://a/b/'],
-            [self::RFC3986_BASE, '../g',          'http://a/b/g'],
-            [self::RFC3986_BASE, '../..',         'http://a/'],
-            [self::RFC3986_BASE, '../../',        'http://a/'],
-            [self::RFC3986_BASE, '../../g',       'http://a/g'],
-            [self::RFC3986_BASE, '../../../g',    'http://a/g'],
+            [self::RFC3986_BASE, 'g:h', 'g:h'],
+            [self::RFC3986_BASE, 'g', 'http://a/b/c/g'],
+            [self::RFC3986_BASE, './g', 'http://a/b/c/g'],
+            [self::RFC3986_BASE, 'g/', 'http://a/b/c/g/'],
+            [self::RFC3986_BASE, '/g', 'http://a/g'],
+            [self::RFC3986_BASE, '//g', 'http://g'],
+            [self::RFC3986_BASE, '?y', 'http://a/b/c/d;p?y'],
+            [self::RFC3986_BASE, 'g?y', 'http://a/b/c/g?y'],
+            [self::RFC3986_BASE, '#s', 'http://a/b/c/d;p?q#s'],
+            [self::RFC3986_BASE, 'g#s', 'http://a/b/c/g#s'],
+            [self::RFC3986_BASE, 'g?y#s', 'http://a/b/c/g?y#s'],
+            [self::RFC3986_BASE, ';x', 'http://a/b/c/;x'],
+            [self::RFC3986_BASE, 'g;x', 'http://a/b/c/g;x'],
+            [self::RFC3986_BASE, 'g;x?y#s', 'http://a/b/c/g;x?y#s'],
+            [self::RFC3986_BASE, '', self::RFC3986_BASE],
+            [self::RFC3986_BASE, '.', 'http://a/b/c/'],
+            [self::RFC3986_BASE, './', 'http://a/b/c/'],
+            [self::RFC3986_BASE, '..', 'http://a/b/'],
+            [self::RFC3986_BASE, '../', 'http://a/b/'],
+            [self::RFC3986_BASE, '../g', 'http://a/b/g'],
+            [self::RFC3986_BASE, '../..', 'http://a/'],
+            [self::RFC3986_BASE, '../../', 'http://a/'],
+            [self::RFC3986_BASE, '../../g', 'http://a/g'],
+            [self::RFC3986_BASE, '../../../g', 'http://a/g'],
             [self::RFC3986_BASE, '../../../../g', 'http://a/g'],
-            [self::RFC3986_BASE, '/./g',          'http://a/g'],
-            [self::RFC3986_BASE, '/../g',         'http://a/g'],
-            [self::RFC3986_BASE, 'g.',            'http://a/b/c/g.'],
-            [self::RFC3986_BASE, '.g',            'http://a/b/c/.g'],
-            [self::RFC3986_BASE, 'g..',           'http://a/b/c/g..'],
-            [self::RFC3986_BASE, '..g',           'http://a/b/c/..g'],
-            [self::RFC3986_BASE, './../g',        'http://a/b/g'],
-            [self::RFC3986_BASE, 'foo////g',      'http://a/b/c/foo////g'],
-            [self::RFC3986_BASE, './g/.',         'http://a/b/c/g/'],
-            [self::RFC3986_BASE, 'g/./h',         'http://a/b/c/g/h'],
-            [self::RFC3986_BASE, 'g/../h',        'http://a/b/c/h'],
-            [self::RFC3986_BASE, 'g;x=1/./y',     'http://a/b/c/g;x=1/y'],
-            [self::RFC3986_BASE, 'g;x=1/../y',    'http://a/b/c/y'],
+            [self::RFC3986_BASE, '/./g', 'http://a/g'],
+            [self::RFC3986_BASE, '/../g', 'http://a/g'],
+            [self::RFC3986_BASE, 'g.', 'http://a/b/c/g.'],
+            [self::RFC3986_BASE, '.g', 'http://a/b/c/.g'],
+            [self::RFC3986_BASE, 'g..', 'http://a/b/c/g..'],
+            [self::RFC3986_BASE, '..g', 'http://a/b/c/..g'],
+            [self::RFC3986_BASE, './../g', 'http://a/b/g'],
+            [self::RFC3986_BASE, 'foo////g', 'http://a/b/c/foo////g'],
+            [self::RFC3986_BASE, './g/.', 'http://a/b/c/g/'],
+            [self::RFC3986_BASE, 'g/./h', 'http://a/b/c/g/h'],
+            [self::RFC3986_BASE, 'g/../h', 'http://a/b/c/h'],
+            [self::RFC3986_BASE, 'g;x=1/./y', 'http://a/b/c/g;x=1/y'],
+            [self::RFC3986_BASE, 'g;x=1/../y', 'http://a/b/c/y'],
             // dot-segments in the query or fragment
-            [self::RFC3986_BASE, 'g?y/./x',       'http://a/b/c/g?y/./x'],
-            [self::RFC3986_BASE, 'g?y/../x',      'http://a/b/c/g?y/../x'],
-            [self::RFC3986_BASE, 'g#s/./x',       'http://a/b/c/g#s/./x'],
-            [self::RFC3986_BASE, 'g#s/../x',      'http://a/b/c/g#s/../x'],
-            [self::RFC3986_BASE, 'g#s/../x',      'http://a/b/c/g#s/../x'],
-            [self::RFC3986_BASE, '?y#s',          'http://a/b/c/d;p?y#s'],
-            ['http://a/b/c/d;p?q#s', '?y',        'http://a/b/c/d;p?y'],
-            ['http://u@a/b/c/d;p?q', '.',         'http://u@a/b/c/'],
-            ['http://u:p@a/b/c/d;p?q', '.',       'http://u:p@a/b/c/'],
-            ['http://a/b/c/d/', 'e',              'http://a/b/c/d/e'],
-            ['urn:no-slash', 'e',                 'urn:e'],
+            [self::RFC3986_BASE, 'g?y/./x', 'http://a/b/c/g?y/./x'],
+            [self::RFC3986_BASE, 'g?y/../x', 'http://a/b/c/g?y/../x'],
+            [self::RFC3986_BASE, 'g#s/./x', 'http://a/b/c/g#s/./x'],
+            [self::RFC3986_BASE, 'g#s/../x', 'http://a/b/c/g#s/../x'],
+            [self::RFC3986_BASE, 'g#s/../x', 'http://a/b/c/g#s/../x'],
+            [self::RFC3986_BASE, '?y#s', 'http://a/b/c/d;p?y#s'],
+            ['http://a/b/c/d;p?q#s', '?y', 'http://a/b/c/d;p?y'],
+            ['http://u@a/b/c/d;p?q', '.', 'http://u@a/b/c/'],
+            ['http://u:p@a/b/c/d;p?q', '.', 'http://u:p@a/b/c/'],
+            ['http://a/b/c/d/', 'e', 'http://a/b/c/d/e'],
+            ['urn:no-slash', 'e', 'urn:e'],
             // falsey relative parts
-            [self::RFC3986_BASE, '//0',           'http://0'],
-            [self::RFC3986_BASE, '0',             'http://a/b/c/0'],
-            [self::RFC3986_BASE, '?0',            'http://a/b/c/d;p?0'],
-            [self::RFC3986_BASE, '#0',            'http://a/b/c/d;p?q#0'],
+            [self::RFC3986_BASE, '//0', 'http://0'],
+            [self::RFC3986_BASE, '0', 'http://a/b/c/0'],
+            [self::RFC3986_BASE, '?0', 'http://a/b/c/d;p?0'],
+            [self::RFC3986_BASE, '#0', 'http://a/b/c/d;p?q#0'],
         ];
     }
 

src/RequestTrait.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
         return $target;
     }
 
+    /**
+     * @param string $requestTarget
+     */
     public function withRequestTarget($requestTarget): self
     {
         if (\preg_match('#\s#', $requestTarget)) {

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
             $target = '/';
         }
         if ('' !== $this->uri->getQuery()) {
-            $target .= '?' . $this->uri->getQuery();
+            $target .= '?'.$this->uri->getQuery();
         }
 
         return $target;
@@ -97,7 +97,7 @@ 
         }
 
         if (null !== ($port = $this->uri->getPort())) {
-            $host .= ':' . $port;
+            $host .= ':'.$port;
         }
 
         if (isset($this->headerNames['host'])) {

src/Factory/Psr17Factory.php

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
         $resource = @\fopen($filename, $mode);
         if (false === $resource) {
             if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {
-                throw new \InvalidArgumentException('The mode ' . $mode . ' is invalid.');
+                throw new \InvalidArgumentException('The mode '.$mode.' is invalid.');
             }
 
-            throw new \RuntimeException('The file ' . $filename . ' cannot be opened.');
+            throw new \RuntimeException('The file '.$filename.' cannot be opened.');
         }
 
         return Stream::create($resource);

src/Stream.php

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
         }
 
         if (-1 === \fseek($this->stream, $offset, $whence)) {
-            throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
+            throw new \RuntimeException('Unable to seek to stream position '.$offset.' with whence '.\var_export($whence, true));
         }
     }
 

src/Uri.php

Spacing +12 added lines, -12 removed lines

@@ -60,7 +60,7 @@ 
             $this->query = isset($parts['query']) ? $this->filterQueryAndFragment($parts['query']) : '';
             $this->fragment = isset($parts['fragment']) ? $this->filterQueryAndFragment($parts['fragment']) : '';
             if (isset($parts['pass'])) {
-                $this->userInfo .= ':' . $parts['pass'];
+                $this->userInfo .= ':'.$parts['pass'];
             }
         }
     }
@@ -83,11 +83,11 @@ 
 
         $authority = $this->host;
         if ('' !== $this->userInfo) {
-            $authority = $this->userInfo . '@' . $authority;
+            $authority = $this->userInfo.'@'.$authority;
         }
 
         if (null !== $this->port) {
-            $authority .= ':' . $this->port;
+            $authority .= ':'.$this->port;
         }
 
         return $authority;
@@ -144,7 +144,7 @@ 
     {
         $info = $user;
         if (null !== $password && '' !== $password) {
-            $info .= ':' . $password;
+            $info .= ':'.$password;
         }
 
         if ($this->userInfo === $info) {
@@ -228,24 +228,24 @@ 
     {
         $uri = '';
         if ('' !== $scheme) {
-            $uri .= $scheme . ':';
+            $uri .= $scheme.':';
         }
 
         if ('' !== $authority) {
-            $uri .= '//' . $authority;
+            $uri .= '//'.$authority;
         }
 
         if ('' !== $path) {
             if ('/' !== $path[0]) {
                 if ('' !== $authority) {
                     // If the path is rootless and an authority is present, the path MUST be prefixed by "/"
-                    $path = '/' . $path;
+                    $path = '/'.$path;
                 }
             } elseif (isset($path[1]) && '/' === $path[1]) {
                 if ('' === $authority) {
                     // If the path is starting with more than one "/" and no authority is present, the
                     // starting slashes MUST be reduced to one.
-                    $path = '/' . \ltrim($path, '/');
+                    $path = '/'.\ltrim($path, '/');
                 }
             }
 
@@ -253,11 +253,11 @@ 
         }
 
         if ('' !== $query) {
-            $uri .= '?' . $query;
+            $uri .= '?'.$query;
         }
 
         if ('' !== $fragment) {
-            $uri .= '#' . $fragment;
+            $uri .= '#'.$fragment;
         }
 
         return $uri;
@@ -291,7 +291,7 @@ 
             throw new \InvalidArgumentException('Path must be a string');
         }
 
-        return \preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
+        return \preg_replace_callback('/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
     }
 
     private function filterQueryAndFragment($str): string
@@ -300,7 +300,7 @@ 
             throw new \InvalidArgumentException('Query and fragment must be a string');
         }
 
-        return \preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
+        return \preg_replace_callback('/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
     }
 
     private static function rawurlencodeMatchZero(array $match): string