Skip to content

Commit 1380915

Browse files
NyholmNyholm
authored
Apply fixes from StyleCI (#6)
1 parent 98d38e3 commit 1380915

File tree

5 files changed

+120
-118
lines changed

5 files changed

+120
-118
lines changed

‎src/Factory/ServerRequestFactory.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Psr\Http\Message\UploadedFileInterface;
1010
use Interop\Http\Factory\ServerRequestFactoryInterface;
1111
use Nyholm\Psr7\ServerRequest;
12-
use Nyholm\Psr7\Factory\UriFactory;
1312
use Nyholm\Psr7\UploadedFile;
1413

1514
/**
@@ -83,6 +82,7 @@ public function createServerRequestFromGlobals(): ServerRequestInterface
8382
$server['REQUEST_METHOD'] = 'GET';
8483
}
8584
$headers = function_exists('getallheaders') ? getallheaders() : [];
85+
8686
return $this->createServerRequestFromArrays($_SERVER, $headers, $_COOKIE, $_GET, $_POST, $_FILES);
8787
}
8888

@@ -91,6 +91,7 @@ private function getMethodFromEnvironment(array $environment): string
9191
if (false === isset($environment['REQUEST_METHOD'])) {
9292
throw new InvalidArgumentException('Cannot determine HTTP method');
9393
}
94+
9495
return $environment['REQUEST_METHOD'];
9596
}
9697

@@ -100,9 +101,10 @@ private function getUriFromEnvironmentWithHTTP(array $environment): \Psr\Http\Me
100101
if ($uri->getScheme() === '') {
101102
$uri = $uri->withScheme('http');
102103
}
104+
103105
return $uri;
104106
}
105-
107+
106108
/**
107109
* Return an UploadedFile instance array.
108110
*

‎src/Stream.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public function read($length): string
239239
return fread($this->stream, $length);
240240
}
241241

242-
public function getContents():string
242+
public function getContents(): string
243243
{
244244
if (!isset($this->stream)) {
245245
throw new \RuntimeException('Unable to read stream contents');

‎tests/RequestTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function testHostIsAddedFirst()
125125
$r = new Request('GET', 'http://foo.com/baz?bar=bam', ['Foo' => 'Bar']);
126126
$this->assertEquals([
127127
'Host' => ['foo.com'],
128-
'Foo' => ['Bar'],
128+
'Foo' => ['Bar'],
129129
], $r->getHeaders());
130130
}
131131

‎tests/ServerRequestTest.php‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public function dataNormalizeFiles()
1919
'Single file' => [
2020
[
2121
'file' => [
22-
'name' => 'MyFile.txt',
23-
'type' => 'text/plain',
22+
'name' => 'MyFile.txt',
23+
'type' => 'text/plain',
2424
'tmp_name' => '/tmp/php/php1h4j1o',
25-
'error' => '0',
26-
'size' => '123',
25+
'error' => '0',
26+
'size' => '123',
2727
],
2828
],
2929
[
@@ -39,11 +39,11 @@ public function dataNormalizeFiles()
3939
'Empty file' => [
4040
[
4141
'image_file' => [
42-
'name' => '',
43-
'type' => '',
42+
'name' => '',
43+
'type' => '',
4444
'tmp_name' => '',
45-
'error' => '4',
46-
'size' => '0',
45+
'error' => '4',
46+
'size' => '0',
4747
],
4848
],
4949
[
@@ -117,18 +117,18 @@ public function dataNormalizeFiles()
117117
'Multiple files' => [
118118
[
119119
'text_file' => [
120-
'name' => 'MyFile.txt',
121-
'type' => 'text/plain',
120+
'name' => 'MyFile.txt',
121+
'type' => 'text/plain',
122122
'tmp_name' => '/tmp/php/php1h4j1o',
123-
'error' => '0',
124-
'size' => '123',
123+
'error' => '0',
124+
'size' => '123',
125125
],
126126
'image_file' => [
127-
'name' => '',
128-
'type' => '',
127+
'name' => '',
128+
'type' => '',
129129
'tmp_name' => '',
130-
'error' => '4',
131-
'size' => '0',
130+
'error' => '4',
131+
'size' => '0',
132132
],
133133
],
134134
[
@@ -175,35 +175,35 @@ public function dataNormalizeFiles()
175175
'nested' => [
176176
'name' => [
177177
'other' => 'Flag.txt',
178-
'test' => [
178+
'test' => [
179179
0 => 'Stuff.txt',
180180
1 => '',
181181
],
182182
],
183183
'type' => [
184184
'other' => 'text/plain',
185-
'test' => [
185+
'test' => [
186186
0 => 'text/plain',
187187
1 => '',
188188
],
189189
],
190190
'tmp_name' => [
191191
'other' => '/tmp/php/hp9hskjhf',
192-
'test' => [
192+
'test' => [
193193
0 => '/tmp/php/asifu2gp3',
194194
1 => '',
195195
],
196196
],
197197
'error' => [
198198
'other' => '0',
199-
'test' => [
199+
'test' => [
200200
0 => '0',
201201
1 => '4',
202202
],
203203
],
204204
'size' => [
205205
'other' => '421',
206-
'test' => [
206+
'test' => [
207207
0 => '32',
208208
1 => '0',
209209
],
@@ -279,34 +279,34 @@ public function testNormalizeFilesRaisesException()
279279
public function dataGetUriFromGlobals()
280280
{
281281
$server = [
282-
'PHP_SELF' => '/blog/article.php',
283-
'GATEWAY_INTERFACE' => 'CGI/1.1',
284-
'SERVER_ADDR' => 'Server IP: 217.112.82.20',
285-
'SERVER_NAME' => 'www.blakesimpson.co.uk',
286-
'SERVER_SOFTWARE' => 'Apache/2.2.15 (Win32) JRun/4.0 PHP/5.2.13',
287-
'SERVER_PROTOCOL' => 'HTTP/1.0',
288-
'REQUEST_METHOD' => 'POST',
289-
'REQUEST_TIME' => 'Request start time: 1280149029',
290-
'QUERY_STRING' => 'id=10&user=foo',
291-
'DOCUMENT_ROOT' => '/path/to/your/server/root/',
292-
'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
293-
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
282+
'PHP_SELF' => '/blog/article.php',
283+
'GATEWAY_INTERFACE' => 'CGI/1.1',
284+
'SERVER_ADDR' => 'Server IP: 217.112.82.20',
285+
'SERVER_NAME' => 'www.blakesimpson.co.uk',
286+
'SERVER_SOFTWARE' => 'Apache/2.2.15 (Win32) JRun/4.0 PHP/5.2.13',
287+
'SERVER_PROTOCOL' => 'HTTP/1.0',
288+
'REQUEST_METHOD' => 'POST',
289+
'REQUEST_TIME' => 'Request start time: 1280149029',
290+
'QUERY_STRING' => 'id=10&user=foo',
291+
'DOCUMENT_ROOT' => '/path/to/your/server/root/',
292+
'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
293+
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
294294
'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
295295
'HTTP_ACCEPT_LANGUAGE' => 'en-gb,en;q=0.5',
296-
'HTTP_CONNECTION' => 'keep-alive',
297-
'HTTP_HOST' => 'www.blakesimpson.co.uk',
298-
'HTTP_REFERER' => 'http://previous.url.com',
299-
'HTTP_USER_AGENT' => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 ( .NET CLR 3.5.30729)',
300-
'HTTPS' => '1',
301-
'REMOTE_ADDR' => '193.60.168.69',
302-
'REMOTE_HOST' => 'Client server\'s host name',
303-
'REMOTE_PORT' => '5390',
304-
'SCRIPT_FILENAME' => '/path/to/this/script.php',
305-
'SERVER_ADMIN' => '[email protected]',
306-
'SERVER_PORT' => '80',
307-
'SERVER_SIGNATURE' => 'Version signature: 5.123',
308-
'SCRIPT_NAME' => '/blog/article.php',
309-
'REQUEST_URI' => '/blog/article.php?id=10&user=foo',
296+
'HTTP_CONNECTION' => 'keep-alive',
297+
'HTTP_HOST' => 'www.blakesimpson.co.uk',
298+
'HTTP_REFERER' => 'http://previous.url.com',
299+
'HTTP_USER_AGENT' => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 ( .NET CLR 3.5.30729)',
300+
'HTTPS' => '1',
301+
'REMOTE_ADDR' => '193.60.168.69',
302+
'REMOTE_HOST' => 'Client server\'s host name',
303+
'REMOTE_PORT' => '5390',
304+
'SCRIPT_FILENAME' => '/path/to/this/script.php',
305+
'SERVER_ADMIN' => '[email protected]',
306+
'SERVER_PORT' => '80',
307+
'SERVER_SIGNATURE' => 'Version signature: 5.123',
308+
'SCRIPT_NAME' => '/blog/article.php',
309+
'REQUEST_URI' => '/blog/article.php?id=10&user=foo',
310310
];
311311

312312
return [
@@ -348,57 +348,57 @@ public function testGetUriFromGlobals($expected, $serverParams)
348348
public function testFromGlobals()
349349
{
350350
$server = [
351-
'PHP_SELF' => '/blog/article.php',
352-
'GATEWAY_INTERFACE' => 'CGI/1.1',
353-
'SERVER_ADDR' => 'Server IP: 217.112.82.20',
354-
'SERVER_NAME' => 'www.blakesimpson.co.uk',
355-
'SERVER_SOFTWARE' => 'Apache/2.2.15 (Win32) JRun/4.0 PHP/5.2.13',
356-
'SERVER_PROTOCOL' => 'HTTP/1.0',
357-
'REQUEST_METHOD' => 'POST',
358-
'REQUEST_TIME' => 'Request start time: 1280149029',
359-
'QUERY_STRING' => 'id=10&user=foo',
360-
'DOCUMENT_ROOT' => '/path/to/your/server/root/',
361-
'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
362-
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
351+
'PHP_SELF' => '/blog/article.php',
352+
'GATEWAY_INTERFACE' => 'CGI/1.1',
353+
'SERVER_ADDR' => 'Server IP: 217.112.82.20',
354+
'SERVER_NAME' => 'www.blakesimpson.co.uk',
355+
'SERVER_SOFTWARE' => 'Apache/2.2.15 (Win32) JRun/4.0 PHP/5.2.13',
356+
'SERVER_PROTOCOL' => 'HTTP/1.0',
357+
'REQUEST_METHOD' => 'POST',
358+
'REQUEST_TIME' => 'Request start time: 1280149029',
359+
'QUERY_STRING' => 'id=10&user=foo',
360+
'DOCUMENT_ROOT' => '/path/to/your/server/root/',
361+
'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
362+
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
363363
'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
364364
'HTTP_ACCEPT_LANGUAGE' => 'en-gb,en;q=0.5',
365-
'HTTP_CONNECTION' => 'keep-alive',
366-
'HTTP_HOST' => 'www.blakesimpson.co.uk',
367-
'HTTP_REFERER' => 'http://previous.url.com',
368-
'HTTP_USER_AGENT' => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 ( .NET CLR 3.5.30729)',
369-
'HTTPS' => '1',
370-
'REMOTE_ADDR' => '193.60.168.69',
371-
'REMOTE_HOST' => 'Client server\'s host name',
372-
'REMOTE_PORT' => '5390',
373-
'SCRIPT_FILENAME' => '/path/to/this/script.php',
374-
'SERVER_ADMIN' => '[email protected]',
375-
'SERVER_PORT' => '80',
376-
'SERVER_SIGNATURE' => 'Version signature: 5.123',
377-
'SCRIPT_NAME' => '/blog/article.php',
378-
'REQUEST_URI' => '/blog/article.php?id=10&user=foo',
365+
'HTTP_CONNECTION' => 'keep-alive',
366+
'HTTP_HOST' => 'www.blakesimpson.co.uk',
367+
'HTTP_REFERER' => 'http://previous.url.com',
368+
'HTTP_USER_AGENT' => 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 ( .NET CLR 3.5.30729)',
369+
'HTTPS' => '1',
370+
'REMOTE_ADDR' => '193.60.168.69',
371+
'REMOTE_HOST' => 'Client server\'s host name',
372+
'REMOTE_PORT' => '5390',
373+
'SCRIPT_FILENAME' => '/path/to/this/script.php',
374+
'SERVER_ADMIN' => '[email protected]',
375+
'SERVER_PORT' => '80',
376+
'SERVER_SIGNATURE' => 'Version signature: 5.123',
377+
'SCRIPT_NAME' => '/blog/article.php',
378+
'REQUEST_URI' => '/blog/article.php?id=10&user=foo',
379379
];
380380

381381
$cookie = [
382382
'logged-in' => 'yes!',
383383
];
384384

385385
$post = [
386-
'name' => 'Pesho',
386+
'name' => 'Pesho',
387387
'email' => '[email protected]',
388388
];
389389

390390
$get = [
391-
'id' => 10,
391+
'id' => 10,
392392
'user' => 'foo',
393393
];
394394

395395
$files = [
396396
'file' => [
397-
'name' => 'MyFile.txt',
398-
'type' => 'text/plain',
397+
'name' => 'MyFile.txt',
398+
'type' => 'text/plain',
399399
'tmp_name' => '/tmp/php/php1h4j1o',
400-
'error' => UPLOAD_ERR_OK,
401-
'size' => 123,
400+
'error' => UPLOAD_ERR_OK,
401+
'size' => 123,
402402
],
403403
];
404404

0 commit comments

Comments
 (0)