Skip to content

Scope: Delete key when deleting scope #45

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

Merged
danielbeardsley merged 2 commits into from
Jun 30, 2026
Merged

Scope: Delete key when deleting scope #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff2096
Scope: Delete key when deleting scope
danielbeardsley Jun 30, 2026
a88bd08
Scope: Remove unused reset parameter from getScopePrefix
danielbeardsley Jun 30, 2026
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
16 changes: 9 additions & 7 deletions library/iFixit/Matryoshka/Scope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Scope extends Prefix {
private $scopePrefix;

public function __construct(Backend $backend, $scopeName) {
// The prefix we pass along to the Prefix() constructor is never used, so
// The prefix we pass along to the Prefix() constructor is never used, so
// it doesn't matter.
parent::__construct($backend, /* $prefix = */ null);

Expand All @@ -21,9 +21,9 @@ public function getPrefix() {
return $this->scopePrefix ?: $this->getScopePrefix();
}

public function getScopePrefix(bool $reset = false, bool $generateOnMiss = true) {
if ($this->scopePrefix === null || $reset) {
$scopeValue = $reset ? self::MISS : $this->backend->get($this->getScopeKey());
public function getScopePrefix(bool $generateOnMiss = true) {
if ($this->scopePrefix === null) {
$scopeValue = $this->backend->get($this->getScopeKey());
if ($scopeValue === self::MISS) {
if ($generateOnMiss) {
$scopeValue = substr(md5(microtime() . $this->scopeName), 0, 16);
Expand All @@ -47,10 +47,12 @@ public function getScopeName() {
* this scope.
*/
public function deleteScope(): bool {
// Delete the scope by setting a new value for it.
$prefix = $this->getScopePrefix($reset = true);
// Explicitly delete the scope key from the backend to ensure that it is
// removed.
$this->backend->delete($this->getScopeKey());
$this->scopePrefix = null;

return $prefix !== self::MISS;
return true;
}

private function getScopeKey() {
Expand Down
Loading