Skip to content

Deduplicate surrogate keys when concatenating with manually-set header #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koriym wants to merge 1 commit into
base: 1.x
Choose a base branch
from
+24 −7
Open

Deduplicate surrogate keys when concatenating with manually-set header #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
/vendor-bin/**/vendor
/.php_cs.cache
/.phpunit-cache/
/.phpunit.cache/
/.dump.rdb
11 changes: 4 additions & 7 deletions src/SurrogateKeys.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,11 @@ public function addTag(ResourceObject $ro): void

public function setSurrogateHeader(ResourceObject $ro): void
{
$key = implode(' ', array_unique($this->surrogateKeys));
$wasSetManually = isset($ro->headers[Header::SURROGATE_KEY]);
if ($wasSetManually) {
$ro->headers[Header::SURROGATE_KEY] .= ' ' . $key;

return;
$keys = $this->surrogateKeys;
if (isset($ro->headers[Header::SURROGATE_KEY])) {
$keys = array_merge(explode(' ', $ro->headers[Header::SURROGATE_KEY]), $keys);
}

$ro->headers[Header::SURROGATE_KEY] = $key;
$ro->headers[Header::SURROGATE_KEY] = implode(' ', array_unique($keys));
}
}
19 changes: 19 additions & 0 deletions tests/SurrogateKeysTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,23 @@ public function testOnePurgeKey(): void
$etags->setSurrogateHeader($foo);
$this->assertSame('_foo_', $foo->headers[Header::SURROGATE_KEY]);
}

public function testSetSurrogateHeaderDeduplicatesWithManualKeys(): void
{
$uri = new Uri('app://self/foo');
$etags = new SurrogateKeys($uri);
$child = new class extends ResourceObject{
/** @var array<string, string> */
public $headers = [Header::SURROGATE_KEY => 'shared-tag']; // phpcs:ignore
};
$child->uri = new Uri('app://self/foo1');
$etags->addTag($child);
$ro = new class extends ResourceObject{
/** @var array<string, string> */
public $headers = [Header::SURROGATE_KEY => 'shared-tag _foo_']; // phpcs:ignore
};
$ro->uri = $uri;
$etags->setSurrogateHeader($ro);
$this->assertSame('shared-tag _foo_ _foo1_', $ro->headers[Header::SURROGATE_KEY]);
}
}
Loading