Skip to content

Commit 3ee6a78

Browse files
committed
Fix tests usage
1 parent d1bbdac commit 3ee6a78

3 files changed

Lines changed: 8 additions & 33 deletions

File tree

src/Http/Request.php

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -504,32 +504,7 @@ public function setPayload(array $params): static
504504
*
505505
* @return array
506506
*/
507-
protected function generateHeaders(): array
508-
{
509-
if (null === $this->headers) {
510-
/**
511-
* Fallback for older PHP versions
512-
* that do not support generateHeaders
513-
*/
514-
if (!\function_exists('getallheaders')) {
515-
$headers = [];
516-
517-
foreach ($_SERVER as $name => $value) {
518-
if (\substr($name, 0, 5) == 'HTTP_') {
519-
$headers[\str_replace(' ', '-', \strtolower(\str_replace('_', ' ', \substr($name, 5))))] = $value;
520-
}
521-
}
522-
523-
$this->headers = $headers;
524-
525-
return $this->headers;
526-
}
527-
528-
$this->headers = array_change_key_case(getallheaders());
529-
}
530-
531-
return $this->headers;
532-
}
507+
abstract protected function generateHeaders(): array;
533508

534509
/**
535510
* Generate input

tests/e2e/BaseTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,31 @@ public function testCookie()
8585
{
8686
// One cookie
8787
$cookie = 'cookie1=value1';
88-
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
88+
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie' => $cookie ]);
8989
$this->assertEquals(200, $response['headers']['status-code']);
9090
$this->assertEquals($cookie, $response['body']);
9191

9292
// Two cookiees
9393
$cookie = 'cookie1=value1; cookie2=value2';
94-
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
94+
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie' => $cookie ]);
9595
$this->assertEquals(200, $response['headers']['status-code']);
9696
$this->assertEquals($cookie, $response['body']);
9797

9898
// Two cookies without optional space
9999
$cookie = 'cookie1=value1;cookie2=value2';
100-
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
100+
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie' => $cookie ]);
101101
$this->assertEquals(200, $response['headers']['status-code']);
102102
$this->assertEquals($cookie, $response['body']);
103103

104104
// Cookie with "=" in value
105105
$cookie = 'cookie1=value1=value2';
106-
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
106+
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie' => $cookie ]);
107107
$this->assertEquals(200, $response['headers']['status-code']);
108108
$this->assertEquals($cookie, $response['body']);
109109

110110
// Case sensitivity for cookie names
111111
$cookie = 'cookie1=v1; Cookie1=v2';
112-
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie: ' . $cookie ]);
112+
$response = $this->client->call(Client::METHOD_GET, '/cookies', [ 'Cookie' => $cookie ]);
113113
$this->assertEquals(200, $response['headers']['status-code']);
114114
$this->assertEquals($cookie, $response['body']);
115115
}

tests/e2e/init.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
->inject('request')
8585
->inject('response')
8686
->action(function (Request $request, Response $response) {
87-
$response->addHeader('Set-Cookie', 'key1=value1');
88-
$response->addHeader('Set-Cookie', 'key2=value2');
87+
$response->addHeader('Set-Cookie', 'key1=value1', false);
88+
$response->addHeader('Set-Cookie', 'key2=value2', false);
8989
$response->send('OK');
9090
});
9191

0 commit comments

Comments
 (0)