Skip to content

Commit 0efaa00

Browse files
michalsnneznaika0
andcommitted
apply code suggestions
Co-authored-by: neznaika0 <ozornick.ks@gmail.com>
1 parent 2b14b78 commit 0efaa00

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

system/Superglobals.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@ public function __construct(
5555
private ?array $files = null,
5656
private ?array $request = null,
5757
) {
58-
$this->setServerArray($server ?? $_SERVER);
59-
$this->setGetArray($get ?? $_GET);
60-
$this->setPostArray($post ?? $_POST);
61-
$this->setCookieArray($cookie ?? $_COOKIE);
62-
$this->setFilesArray($files ?? $_FILES);
63-
$this->setRequestArray($request ?? $_REQUEST);
58+
$this
59+
->setServerArray($server ?? $_SERVER)
60+
->setGetArray($get ?? $_GET)
61+
->setPostArray($post ?? $_POST)
62+
->setCookieArray($cookie ?? $_COOKIE)
63+
->setFilesArray($files ?? $_FILES)
64+
->setRequestArray($request ?? $_REQUEST);
6465
}
6566

6667
/**

tests/system/HTTP/MessageTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ public function testPopulateHeadersWithoutHTTP(): void
266266
{
267267
// fail path, if argument doesn't have the HTTP_*
268268
$superglobals = service('superglobals');
269-
$original = $superglobals->getServerArray();
270269
$superglobals->setServerArray([
271270
'USER_AGENT' => 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405',
272271
'REQUEST_METHOD' => 'POST',
@@ -276,15 +275,12 @@ public function testPopulateHeadersWithoutHTTP(): void
276275

277276
$this->assertNull($this->message->header('user-agent'));
278277
$this->assertNull($this->message->header('request-method'));
279-
280-
$superglobals->setServerArray($original); // restore so code coverage doesn't break
281278
}
282279

283280
public function testPopulateHeadersKeyNotExists(): void
284281
{
285282
// Success path, if array key is not exists, assign empty string to it's value
286283
$superglobals = service('superglobals');
287-
$original = $superglobals->getServerArray();
288284
$superglobals->setServerArray([
289285
'CONTENT_TYPE' => 'text/html; charset=utf-8',
290286
'HTTP_ACCEPT_CHARSET' => null,
@@ -293,15 +289,12 @@ public function testPopulateHeadersKeyNotExists(): void
293289
$this->message->populateHeaders();
294290

295291
$this->assertSame('', $this->message->header('accept-charset')->getValue());
296-
297-
$superglobals->setServerArray($original); // restore so code coverage doesn't break
298292
}
299293

300294
public function testPopulateHeaders(): void
301295
{
302296
// success path
303297
$superglobals = service('superglobals');
304-
$original = $superglobals->getServerArray();
305298
$superglobals->setServerArray([
306299
'CONTENT_TYPE' => 'text/html; charset=utf-8',
307300
'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.50',
@@ -311,8 +304,6 @@ public function testPopulateHeaders(): void
311304

312305
$this->assertSame('text/html; charset=utf-8', $this->message->header('content-type')->getValue());
313306
$this->assertSame('en-us,en;q=0.50', $this->message->header('accept-language')->getValue());
314-
315-
$superglobals->setServerArray($original); // restore so code coverage doesn't break
316307
}
317308

318309
public function testAddHeaderAddsFirstHeader(): void

0 commit comments

Comments
 (0)