@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | if ($path[0] === '/' && (!isset($newPath[0]) || $newPath[0] !== '/')) { |
42 | 42 | // Re-add the leading slash if necessary for cases like "/.." |
43 | - $newPath = '/' . $newPath; |
|
43 | + $newPath = '/'.$newPath; |
|
44 | 44 | } elseif ($newPath !== '' && ($segment === '.' || $segment === '..')) { |
45 | 45 | // Add the trailing slash if necessary |
46 | 46 | // If newPath is not empty, then $segment must be set and is the last segment from the foreach |
@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | $targetPath = $rel->getPath(); |
85 | 85 | } else { |
86 | 86 | if ($targetAuthority != '' && $base->getPath() === '') { |
87 | - $targetPath = '/' . $rel->getPath(); |
|
87 | + $targetPath = '/'.$rel->getPath(); |
|
88 | 88 | } else { |
89 | 89 | $lastSlashPos = strrpos($base->getPath(), '/'); |
90 | 90 | if ($lastSlashPos === false) { |
91 | 91 | $targetPath = $rel->getPath(); |
92 | 92 | } else { |
93 | - $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1) . $rel->getPath(); |
|
93 | + $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1).$rel->getPath(); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } |
194 | 194 | } |
195 | 195 | $targetSegments[] = $targetLastSegment; |
196 | - $relativePath = str_repeat('../', count($sourceSegments)) . implode('/', $targetSegments); |
|
196 | + $relativePath = str_repeat('../', count($sourceSegments)).implode('/', $targetSegments); |
|
197 | 197 | |
198 | 198 | // A reference to am empty last segment or an empty first sub-segment must be prefixed with "./". |
199 | 199 | // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $target = '/'; |
66 | 66 | } |
67 | 67 | if ($this->uri->getQuery() != '') { |
68 | - $target .= '?' . $this->uri->getQuery(); |
|
68 | + $target .= '?'.$this->uri->getQuery(); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | return $target; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | if (($port = $this->uri->getPort()) !== null) { |
129 | - $host .= ':' . $port; |
|
129 | + $host .= ':'.$port; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | if (isset($this->headerNames['host'])) { |
@@ -208,7 +208,7 @@ |
||
208 | 208 | } |
209 | 209 | if (fseek($this->stream, $offset, $whence) === -1) { |
210 | 210 | throw new RuntimeException('Unable to seek to stream position ' |
211 | - . $offset . ' with whence ' . var_export($whence, true)); |
|
211 | + . $offset.' with whence '.var_export($whence, true)); |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 |
@@ -164,7 +164,7 @@ |
||
164 | 164 | $stream->rewind(); |
165 | 165 | } catch (Exception $e) { |
166 | 166 | throw new RuntimeException('Unable to seek stream ' |
167 | - . $i . ' of the AppendStream', 0, $e); |
|
167 | + . $i.' of the AppendStream', 0, $e); |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 |
@@ -2,5 +2,5 @@ |
||
2 | 2 | |
3 | 3 | // Don't redefine the functions if included multiple times. |
4 | 4 | if (!function_exists('GuzzleHttp\Psr7\str')) { |
5 | - require __DIR__ . '/functions.php'; |
|
5 | + require __DIR__.'/functions.php'; |
|
6 | 6 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | private $headers = []; |
13 | 13 | |
14 | 14 | /** @var array Map of lowercase header name => original name at registration */ |
15 | - private $headerNames = []; |
|
15 | + private $headerNames = []; |
|
16 | 16 | |
17 | 17 | /** @var string */ |
18 | 18 | private $protocol = '1.1'; |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | */ |
177 | 177 | private function trimHeaderValues(array $values) |
178 | 178 | { |
179 | - return array_map(function ($value) { |
|
179 | + return array_map(function($value) { |
|
180 | 180 | return trim($value, " \t"); |
181 | 181 | }, $values); |
182 | 182 | } |
@@ -176,7 +176,8 @@ |
||
176 | 176 | */ |
177 | 177 | private function trimHeaderValues(array $values) |
178 | 178 | { |
179 | - return array_map(function ($value) { |
|
179 | + return array_map(function ($value) |
|
180 | + { |
|
180 | 181 | return trim($value, " \t"); |
181 | 182 | }, $values); |
182 | 183 | } |
@@ -118,21 +118,21 @@ discard block |
||
118 | 118 | |
119 | 119 | // weak type checks to also accept null until we can add scalar type hints |
120 | 120 | if ($scheme != '') { |
121 | - $uri .= $scheme . ':'; |
|
121 | + $uri .= $scheme.':'; |
|
122 | 122 | } |
123 | 123 | |
124 | - if ($authority != ''|| $scheme === 'file') { |
|
125 | - $uri .= '//' . $authority; |
|
124 | + if ($authority != '' || $scheme === 'file') { |
|
125 | + $uri .= '//'.$authority; |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | $uri .= $path; |
129 | 129 | |
130 | 130 | if ($query != '') { |
131 | - $uri .= '?' . $query; |
|
131 | + $uri .= '?'.$query; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | if ($fragment != '') { |
135 | - $uri .= '#' . $fragment; |
|
135 | + $uri .= '#'.$fragment; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | return $uri; |
@@ -380,11 +380,11 @@ discard block |
||
380 | 380 | { |
381 | 381 | $authority = $this->host; |
382 | 382 | if ($this->userInfo !== '') { |
383 | - $authority = $this->userInfo . '@' . $authority; |
|
383 | + $authority = $this->userInfo.'@'.$authority; |
|
384 | 384 | } |
385 | 385 | |
386 | 386 | if ($this->port !== null) { |
387 | - $authority .= ':' . $this->port; |
|
387 | + $authority .= ':'.$this->port; |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | return $authority; |
@@ -440,7 +440,7 @@ discard block |
||
440 | 440 | { |
441 | 441 | $info = $user; |
442 | 442 | if ($password != '') { |
443 | - $info .= ':' . $password; |
|
443 | + $info .= ':'.$password; |
|
444 | 444 | } |
445 | 445 | |
446 | 446 | if ($this->userInfo === $info) { |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | ? $this->filterQueryAndFragment($parts['fragment']) |
556 | 556 | : ''; |
557 | 557 | if (isset($parts['pass'])) { |
558 | - $this->userInfo .= ':' . $parts['pass']; |
|
558 | + $this->userInfo .= ':'.$parts['pass']; |
|
559 | 559 | } |
560 | 560 | |
561 | 561 | $this->removeDefaultPort(); |
@@ -632,7 +632,7 @@ discard block |
||
632 | 632 | |
633 | 633 | $decodedKeys = array_map('rawurldecode', $keys); |
634 | 634 | |
635 | - return array_filter(explode('&', $current), function ($part) use ($decodedKeys) { |
|
635 | + return array_filter(explode('&', $current), function($part) use ($decodedKeys) { |
|
636 | 636 | return !in_array(rawurldecode(explode('=', $part)[0]), $decodedKeys, true); |
637 | 637 | }); |
638 | 638 | } |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | $queryString = strtr($key, self::$replaceQuery); |
652 | 652 | |
653 | 653 | if ($value !== null) { |
654 | - $queryString .= '=' . strtr($value, self::$replaceQuery); |
|
654 | + $queryString .= '='.strtr($value, self::$replaceQuery); |
|
655 | 655 | } |
656 | 656 | |
657 | 657 | return $queryString; |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | } |
681 | 681 | |
682 | 682 | return preg_replace_callback( |
683 | - '/(?:[^' . self::$charUnreserved . self::$charSubDelims . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/', |
|
683 | + '/(?:[^'.self::$charUnreserved.self::$charSubDelims.'%:@\/]++|%(?![A-Fa-f0-9]{2}))/', |
|
684 | 684 | [$this, 'rawurlencodeMatchZero'], |
685 | 685 | $path |
686 | 686 | ); |
@@ -702,7 +702,7 @@ discard block |
||
702 | 702 | } |
703 | 703 | |
704 | 704 | return preg_replace_callback( |
705 | - '/(?:[^' . self::$charUnreserved . self::$charSubDelims . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', |
|
705 | + '/(?:[^'.self::$charUnreserved.self::$charSubDelims.'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', |
|
706 | 706 | [$this, 'rawurlencodeMatchZero'], |
707 | 707 | $str |
708 | 708 | ); |
@@ -728,11 +728,11 @@ discard block |
||
728 | 728 | } |
729 | 729 | } elseif (isset($this->path[0]) && $this->path[0] !== '/') { |
730 | 730 | @trigger_error( |
731 | - 'The path of a URI with an authority must start with a slash "/" or be empty. Automagically fixing the URI ' . |
|
731 | + 'The path of a URI with an authority must start with a slash "/" or be empty. Automagically fixing the URI '. |
|
732 | 732 | 'by adding a leading slash to the path is deprecated since version 1.4 and will throw an exception instead.', |
733 | 733 | E_USER_DEPRECATED |
734 | 734 | ); |
735 | - $this->path = '/'. $this->path; |
|
735 | + $this->path = '/'.$this->path; |
|
736 | 736 | //throw new \InvalidArgumentException('The path of a URI with an authority must start with a slash "/" or be empty'); |
737 | 737 | } |
738 | 738 | } |
@@ -632,7 +632,8 @@ |
||
632 | 632 | |
633 | 633 | $decodedKeys = array_map('rawurldecode', $keys); |
634 | 634 | |
635 | - return array_filter(explode('&', $current), function ($part) use ($decodedKeys) { |
|
635 | + return array_filter(explode('&', $current), function ($part) use ($decodedKeys) |
|
636 | + { |
|
636 | 637 | return !in_array(rawurldecode(explode('=', $part)[0]), $decodedKeys, true); |
637 | 638 | }); |
638 | 639 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $str .= "{$key}: {$value}\r\n"; |
58 | 58 | } |
59 | 59 | |
60 | - return "--{$this->boundary}\r\n" . trim($str) . "\r\n\r\n"; |
|
60 | + return "--{$this->boundary}\r\n".trim($str)."\r\n\r\n"; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | // Create the functions on the class |
32 | 32 | foreach ($methods as $name => $fn) { |
33 | - $this->{'_fn_' . $name} = $fn; |
|
33 | + $this->{'_fn_'.$name} = $fn; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 |