Skip to content

Commit d9d10a8

Browse files
authored
Merge pull request #186 from utopia-php/fix-override-backwards-compatibility
Fix: override default (backwards compatibility)
2 parents 5bba671 + f8e8a9d commit d9d10a8

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/Response.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ public function enablePayload(): static
542542
* @param string $value
543543
* @param bool $override
544544
*/
545-
public function addHeader(string $key, string $value, bool $override = false): static
545+
public function addHeader(string $key, string $value, bool $override = true): static
546546
{
547547
if ($override) {
548548
$this->headers[$key] = $value;

tests/e2e/ResponseTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ public function testSetCookie()
160160
{
161161
$response = $this->client->call(Client::METHOD_GET, '/set-cookie');
162162
$this->assertEquals(200, $response['headers']['status-code']);
163-
$this->assertEquals('value1', $response['cookies']['key1']);
163+
$this->assertArrayNotHasKey('key1', $response['cookies']);
164164
$this->assertEquals('value2', $response['cookies']['key2']);
165165

166-
$response = $this->client->call(Client::METHOD_GET, '/set-cookie-override');
166+
$response = $this->client->call(Client::METHOD_GET, '/set-cookie-no-override');
167167
$this->assertEquals(200, $response['headers']['status-code']);
168-
$this->assertArrayNotHasKey('key1', $response['cookies']);
168+
$this->assertEquals('value1', $response['cookies']['key1']);
169169
$this->assertEquals('value2', $response['cookies']['key2']);
170170
}
171171
}

tests/e2e/server.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
$response->send('OK');
4343
});
4444

45-
App::get('/set-cookie-override')
45+
App::get('/set-cookie-no-override')
4646
->inject('request')
4747
->inject('response')
4848
->action(function (Request $request, Response $response) {
49-
$response->addHeader('Set-Cookie', 'key1=value1', override: true);
50-
$response->addHeader('Set-Cookie', 'key2=value2', override: true);
49+
$response->addHeader('Set-Cookie', 'key1=value1', override: false);
50+
$response->addHeader('Set-Cookie', 'key2=value2', override: false);
5151
$response->send('OK');
5252
});
5353

0 commit comments

Comments
 (0)