From eb971c05124a18776c119e42146a8b5be7bcdffc Mon Sep 17 00:00:00 2001 From: John Koster Date: Fri, 23 Feb 2024 18:19:39 -0600 Subject: [PATCH 1/7] Cache augmentation keys on the instance --- src/Assets/AugmentedAsset.php | 114 +++++++++++++++-------------- src/Auth/AugmentedUser.php | 20 +++-- src/Data/HasOrigin.php | 22 ++++-- src/Entries/AugmentedEntry.php | 16 ++-- src/Filesystem/AbstractAdapter.php | 1 + src/Globals/AugmentedVariables.php | 8 +- src/Structures/AugmentedPage.php | 24 +++--- src/Taxonomies/AugmentedTerm.php | 16 ++-- 8 files changed, 132 insertions(+), 89 deletions(-) diff --git a/src/Assets/AugmentedAsset.php b/src/Assets/AugmentedAsset.php index fb895df50b3..d54346b0b8c 100644 --- a/src/Assets/AugmentedAsset.php +++ b/src/Assets/AugmentedAsset.php @@ -8,64 +8,70 @@ class AugmentedAsset extends AbstractAugmented { + protected $cachedKeys = null; + public function keys() { - $keys = $this->data->data()->keys() - ->merge($this->data->supplements()->keys()) - ->merge([ - 'id', - 'title', - 'path', - 'filename', - 'basename', - 'extension', - 'is_asset', - 'is_audio', - 'is_previewable', - 'is_image', - 'is_svg', - 'is_video', - 'blueprint', - 'edit_url', - 'container', - 'folder', - 'url', - 'permalink', - 'api_url', - ]); - - if ($this->data->exists()) { - $keys = $keys->merge([ - 'size', - 'size_bytes', - 'size_kilobytes', - 'size_megabytes', - 'size_gigabytes', - 'size_b', - 'size_kb', - 'size_mb', - 'size_gb', - 'last_modified', - 'last_modified_timestamp', - 'last_modified_instance', - 'focus', - 'has_focus', - 'focus_css', - 'height', - 'width', - 'orientation', - 'ratio', - 'mime_type', - 'duration', - 'duration_seconds', - 'duration_minutes', - 'duration_sec', - 'duration_min', - 'playtime', - ]); + if (! $this->cachedKeys) { + $keys = $this->data->data()->keys() + ->merge($this->data->supplements()->keys()) + ->merge([ + 'id', + 'title', + 'path', + 'filename', + 'basename', + 'extension', + 'is_asset', + 'is_audio', + 'is_previewable', + 'is_image', + 'is_svg', + 'is_video', + 'blueprint', + 'edit_url', + 'container', + 'folder', + 'url', + 'permalink', + 'api_url', + ]); + + if ($this->data->exists()) { + $keys = $keys->merge([ + 'size', + 'size_bytes', + 'size_kilobytes', + 'size_megabytes', + 'size_gigabytes', + 'size_b', + 'size_kb', + 'size_mb', + 'size_gb', + 'last_modified', + 'last_modified_timestamp', + 'last_modified_instance', + 'focus', + 'has_focus', + 'focus_css', + 'height', + 'width', + 'orientation', + 'ratio', + 'mime_type', + 'duration', + 'duration_seconds', + 'duration_minutes', + 'duration_sec', + 'duration_min', + 'playtime', + ]); + } + + $this->cachedKeys = $keys->merge($this->blueprintFields()->keys())->unique()->all(); } - return $keys->merge($this->blueprintFields()->keys())->unique()->all(); + return $this->cachedKeys; } protected function isAsset() diff --git a/src/Auth/AugmentedUser.php b/src/Auth/AugmentedUser.php index 296459d4c31..a59e832e133 100644 --- a/src/Auth/AugmentedUser.php +++ b/src/Auth/AugmentedUser.php @@ -11,15 +11,21 @@ class AugmentedUser extends AbstractAugmented { + protected $cachedKeys = null; + public function keys() { - return $this->data->data()->keys() - ->merge(collect($this->data->supplements() ?? [])->keys()) - ->merge($this->commonKeys()) - ->merge($this->roleHandles()) - ->merge($this->groupHandles()) - ->merge($this->blueprintFields()->keys()) - ->unique()->sort()->values()->all(); + if (! $this->cachedKeys) { + $this->cachedKeys = $this->data->data()->keys() + ->merge(collect($this->data->supplements() ?? [])->keys()) + ->merge($this->commonKeys()) + ->merge($this->roleHandles()) + ->merge($this->groupHandles()) + ->merge($this->blueprintFields()->keys()) + ->unique()->sort()->values()->all(); + } + + return $this->cachedKeys; } private function commonKeys() diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php index 186299cfad9..f54bde94ecd 100644 --- a/src/Data/HasOrigin.php +++ b/src/Data/HasOrigin.php @@ -11,19 +11,25 @@ trait HasOrigin */ protected $origin; + protected $cachedKeys = null; + public function keys() { - $originFallbackKeys = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues()->keys() : collect(); + if (! $this->cachedKeys) { + $originFallbackKeys = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues()->keys() : collect(); - $originKeys = $this->hasOrigin() ? $this->origin()->keys() : collect(); + $originKeys = $this->hasOrigin() ? $this->origin()->keys() : collect(); - $computedKeys = method_exists($this, 'computedKeys') ? $this->computedKeys() : []; + $computedKeys = method_exists($this, 'computedKeys') ? $this->computedKeys() : []; - return collect() - ->merge($originFallbackKeys) - ->merge($originKeys) - ->merge($this->data->keys()) - ->merge($computedKeys); + $this->cachedKeys = collect() + ->merge($originFallbackKeys) + ->merge($originKeys) + ->merge($this->data->keys()) + ->merge($computedKeys); + } + + return $this->cachedKeys; } public function values() diff --git a/src/Entries/AugmentedEntry.php b/src/Entries/AugmentedEntry.php index 6388f554e81..9cb7f76d830 100644 --- a/src/Entries/AugmentedEntry.php +++ b/src/Entries/AugmentedEntry.php @@ -8,13 +8,19 @@ class AugmentedEntry extends AbstractAugmented { + protected $keysCache = null; + public function keys() { - return $this->data->keys() - ->merge($this->data->supplements()->keys()) - ->merge($this->commonKeys()) - ->merge($this->blueprintFields()->keys()) - ->unique()->sort()->values()->all(); + if (! $this->keysCache) { + $this->keysCache = $this->data->keys() + ->merge($this->data->supplements()->keys()) + ->merge($this->commonKeys()) + ->merge($this->blueprintFields()->keys()) + ->unique()->sort()->values()->all(); + } + + return $this->keysCache; } private function commonKeys() diff --git a/src/Filesystem/AbstractAdapter.php b/src/Filesystem/AbstractAdapter.php index 1a803fa87c8..1130b953623 100644 --- a/src/Filesystem/AbstractAdapter.php +++ b/src/Filesystem/AbstractAdapter.php @@ -83,6 +83,7 @@ public function mimeType($path) public function lastModified($path) { + ray()->count(); return $this->filesystem->lastModified($this->normalizePath($path)); } diff --git a/src/Globals/AugmentedVariables.php b/src/Globals/AugmentedVariables.php index 9eacf32dd98..63ede4006f5 100644 --- a/src/Globals/AugmentedVariables.php +++ b/src/Globals/AugmentedVariables.php @@ -6,9 +6,15 @@ class AugmentedVariables extends AbstractAugmented { + protected $cachedKeys = null; + public function keys() { - return $this->data->values()->keys()->all(); + if (! $this->cachedKeys) { + $this->cachedKeys = $this->data->values()->keys()->all(); + } + + return $this->cachedKeys; } public function site() diff --git a/src/Structures/AugmentedPage.php b/src/Structures/AugmentedPage.php index a3dd2d635dc..c9973557fc8 100644 --- a/src/Structures/AugmentedPage.php +++ b/src/Structures/AugmentedPage.php @@ -22,20 +22,26 @@ public function __construct($page) } } + protected $cachedKeys = null; + public function keys() { - $keys = collect($this->hasEntry - ? parent::keys() - : ['title', 'url', 'uri', 'permalink', 'id']); + if (! $this->cachedKeys) { + $keys = collect($this->hasEntry + ? parent::keys() + : ['title', 'url', 'uri', 'permalink', 'id']); + + $keys = $keys + ->merge($this->page->data()->keys()) + ->merge($this->page->supplements()->keys()) + ->merge(['entry_id']); - $keys = $keys - ->merge($this->page->data()->keys()) - ->merge($this->page->supplements()->keys()) - ->merge(['entry_id']); + $keys = Statamic::isApiRoute() ? $this->apiKeys($keys) : $keys; - $keys = Statamic::isApiRoute() ? $this->apiKeys($keys) : $keys; + $this->cachedKeys = $keys->unique()->sort()->values()->all(); + } - return $keys->unique()->sort()->values()->all(); + return $this->cachedKeys; } private function apiKeys($keys) diff --git a/src/Taxonomies/AugmentedTerm.php b/src/Taxonomies/AugmentedTerm.php index 26cfe1a4574..4ccf00ce428 100644 --- a/src/Taxonomies/AugmentedTerm.php +++ b/src/Taxonomies/AugmentedTerm.php @@ -8,13 +8,19 @@ class AugmentedTerm extends AbstractAugmented { + protected $cachedKeys = null; + public function keys() { - return $this->data->values()->keys() - ->merge($this->data->supplements()->keys()) - ->merge($this->commonKeys()) - ->merge($this->blueprintFields()->keys()) - ->unique()->sort()->values()->all(); + if (! $this->cachedKeys) { + $this->cachedKeys = $this->data->values()->keys() + ->merge($this->data->supplements()->keys()) + ->merge($this->commonKeys()) + ->merge($this->blueprintFields()->keys()) + ->unique()->sort()->values()->all(); + } + + return $this->cachedKeys; } private function commonKeys() From 8296503f3e847d160f6a0bd1298e99c591a561b9 Mon Sep 17 00:00:00 2001 From: John Koster Date: Fri, 23 Feb 2024 18:23:12 -0600 Subject: [PATCH 2/7] Update AbstractAdapter.php --- src/Filesystem/AbstractAdapter.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Filesystem/AbstractAdapter.php b/src/Filesystem/AbstractAdapter.php index 1130b953623..1a803fa87c8 100644 --- a/src/Filesystem/AbstractAdapter.php +++ b/src/Filesystem/AbstractAdapter.php @@ -83,7 +83,6 @@ public function mimeType($path) public function lastModified($path) { - ray()->count(); return $this->filesystem->lastModified($this->normalizePath($path)); } From da835b6516596094d791a59d2bfaf69a17ef5c2f Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 26 Feb 2024 10:17:25 -0500 Subject: [PATCH 3/7] use guards to avoid changing indentation --- src/Assets/AugmentedAsset.php | 116 ++++++++++++++--------------- src/Auth/AugmentedUser.php | 18 ++--- src/Data/HasOrigin.php | 23 +++--- src/Entries/AugmentedEntry.php | 14 ++-- src/Globals/AugmentedVariables.php | 6 +- src/Structures/AugmentedPage.php | 24 +++--- src/Taxonomies/AugmentedTerm.php | 14 ++-- 7 files changed, 107 insertions(+), 108 deletions(-) diff --git a/src/Assets/AugmentedAsset.php b/src/Assets/AugmentedAsset.php index d54346b0b8c..39a3be72d9c 100644 --- a/src/Assets/AugmentedAsset.php +++ b/src/Assets/AugmentedAsset.php @@ -12,66 +12,66 @@ class AugmentedAsset extends AbstractAugmented public function keys() { - if (! $this->cachedKeys) { - $keys = $this->data->data()->keys() - ->merge($this->data->supplements()->keys()) - ->merge([ - 'id', - 'title', - 'path', - 'filename', - 'basename', - 'extension', - 'is_asset', - 'is_audio', - 'is_previewable', - 'is_image', - 'is_svg', - 'is_video', - 'blueprint', - 'edit_url', - 'container', - 'folder', - 'url', - 'permalink', - 'api_url', - ]); - - if ($this->data->exists()) { - $keys = $keys->merge([ - 'size', - 'size_bytes', - 'size_kilobytes', - 'size_megabytes', - 'size_gigabytes', - 'size_b', - 'size_kb', - 'size_mb', - 'size_gb', - 'last_modified', - 'last_modified_timestamp', - 'last_modified_instance', - 'focus', - 'has_focus', - 'focus_css', - 'height', - 'width', - 'orientation', - 'ratio', - 'mime_type', - 'duration', - 'duration_seconds', - 'duration_minutes', - 'duration_sec', - 'duration_min', - 'playtime', - ]); - } - - $this->cachedKeys = $keys->merge($this->blueprintFields()->keys())->unique()->all(); + if ($this->cachedKeys) { + return $this->cachedKeys; } - return $this->cachedKeys; + $keys = $this->data->data()->keys() + ->merge($this->data->supplements()->keys()) + ->merge([ + 'id', + 'title', + 'path', + 'filename', + 'basename', + 'extension', + 'is_asset', + 'is_audio', + 'is_previewable', + 'is_image', + 'is_svg', + 'is_video', + 'blueprint', + 'edit_url', + 'container', + 'folder', + 'url', + 'permalink', + 'api_url', + ]); + + if ($this->data->exists()) { + $keys = $keys->merge([ + 'size', + 'size_bytes', + 'size_kilobytes', + 'size_megabytes', + 'size_gigabytes', + 'size_b', + 'size_kb', + 'size_mb', + 'size_gb', + 'last_modified', + 'last_modified_timestamp', + 'last_modified_instance', + 'focus', + 'has_focus', + 'focus_css', + 'height', + 'width', + 'orientation', + 'ratio', + 'mime_type', + 'duration', + 'duration_seconds', + 'duration_minutes', + 'duration_sec', + 'duration_min', + 'playtime', + ]); + } + + return $this->cachedKeys = $keys->merge($this->blueprintFields()->keys())->unique()->all(); } protected function isAsset() diff --git a/src/Auth/AugmentedUser.php b/src/Auth/AugmentedUser.php index a59e832e133..297f1b9a5d2 100644 --- a/src/Auth/AugmentedUser.php +++ b/src/Auth/AugmentedUser.php @@ -15,17 +15,17 @@ class AugmentedUser extends AbstractAugmented public function keys() { - if (! $this->cachedKeys) { - $this->cachedKeys = $this->data->data()->keys() - ->merge(collect($this->data->supplements() ?? [])->keys()) - ->merge($this->commonKeys()) - ->merge($this->roleHandles()) - ->merge($this->groupHandles()) - ->merge($this->blueprintFields()->keys()) - ->unique()->sort()->values()->all(); + if ($this->cachedKeys) { + return $this->cachedKeys; } - return $this->cachedKeys; + return $this->cachedKeys = $this->data->data()->keys() + ->merge(collect($this->data->supplements() ?? [])->keys()) + ->merge($this->commonKeys()) + ->merge($this->roleHandles()) + ->merge($this->groupHandles()) + ->merge($this->blueprintFields()->keys()) + ->unique()->sort()->values()->all(); } private function commonKeys() diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php index f54bde94ecd..47491651e1a 100644 --- a/src/Data/HasOrigin.php +++ b/src/Data/HasOrigin.php @@ -15,21 +15,20 @@ trait HasOrigin public function keys() { - if (! $this->cachedKeys) { - $originFallbackKeys = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues()->keys() : collect(); - - $originKeys = $this->hasOrigin() ? $this->origin()->keys() : collect(); + if ($this->cachedKeys) { + return $this->cachedKeys; + } + $originFallbackKeys = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues()->keys() : collect(); - $computedKeys = method_exists($this, 'computedKeys') ? $this->computedKeys() : []; + $originKeys = $this->hasOrigin() ? $this->origin()->keys() : collect(); - $this->cachedKeys = collect() - ->merge($originFallbackKeys) - ->merge($originKeys) - ->merge($this->data->keys()) - ->merge($computedKeys); - } + $computedKeys = method_exists($this, 'computedKeys') ? $this->computedKeys() : []; - return $this->cachedKeys; + return $this->cachedKeys = collect() + ->merge($originFallbackKeys) + ->merge($originKeys) + ->merge($this->data->keys()) + ->merge($computedKeys); } public function values() diff --git a/src/Entries/AugmentedEntry.php b/src/Entries/AugmentedEntry.php index 9cb7f76d830..6f7e46302ef 100644 --- a/src/Entries/AugmentedEntry.php +++ b/src/Entries/AugmentedEntry.php @@ -12,15 +12,15 @@ class AugmentedEntry extends AbstractAugmented public function keys() { - if (! $this->keysCache) { - $this->keysCache = $this->data->keys() - ->merge($this->data->supplements()->keys()) - ->merge($this->commonKeys()) - ->merge($this->blueprintFields()->keys()) - ->unique()->sort()->values()->all(); + if ($this->keysCache) { + return $this->keysCache; } - return $this->keysCache; + return $this->keysCache = $this->data->keys() + ->merge($this->data->supplements()->keys()) + ->merge($this->commonKeys()) + ->merge($this->blueprintFields()->keys()) + ->unique()->sort()->values()->all(); } private function commonKeys() diff --git a/src/Globals/AugmentedVariables.php b/src/Globals/AugmentedVariables.php index 63ede4006f5..39b9a5181ce 100644 --- a/src/Globals/AugmentedVariables.php +++ b/src/Globals/AugmentedVariables.php @@ -10,11 +10,11 @@ class AugmentedVariables extends AbstractAugmented public function keys() { - if (! $this->cachedKeys) { - $this->cachedKeys = $this->data->values()->keys()->all(); + if ($this->cachedKeys) { + return $this->cachedKeys; } - return $this->cachedKeys; + return $this->cachedKeys = $this->data->values()->keys()->all(); } public function site() diff --git a/src/Structures/AugmentedPage.php b/src/Structures/AugmentedPage.php index c9973557fc8..a5eb6987cdf 100644 --- a/src/Structures/AugmentedPage.php +++ b/src/Structures/AugmentedPage.php @@ -26,22 +26,22 @@ public function __construct($page) public function keys() { - if (! $this->cachedKeys) { - $keys = collect($this->hasEntry - ? parent::keys() - : ['title', 'url', 'uri', 'permalink', 'id']); + if ($this->cachedKeys) { + return $this->cachedKeys; + } - $keys = $keys - ->merge($this->page->data()->keys()) - ->merge($this->page->supplements()->keys()) - ->merge(['entry_id']); + $keys = collect($this->hasEntry + ? parent::keys() + : ['title', 'url', 'uri', 'permalink', 'id']); - $keys = Statamic::isApiRoute() ? $this->apiKeys($keys) : $keys; + $keys = $keys + ->merge($this->page->data()->keys()) + ->merge($this->page->supplements()->keys()) + ->merge(['entry_id']); - $this->cachedKeys = $keys->unique()->sort()->values()->all(); - } + $keys = Statamic::isApiRoute() ? $this->apiKeys($keys) : $keys; - return $this->cachedKeys; + return $this->cachedKeys = $keys->unique()->sort()->values()->all(); } private function apiKeys($keys) diff --git a/src/Taxonomies/AugmentedTerm.php b/src/Taxonomies/AugmentedTerm.php index 4ccf00ce428..13a89c14a24 100644 --- a/src/Taxonomies/AugmentedTerm.php +++ b/src/Taxonomies/AugmentedTerm.php @@ -12,15 +12,15 @@ class AugmentedTerm extends AbstractAugmented public function keys() { - if (! $this->cachedKeys) { - $this->cachedKeys = $this->data->values()->keys() - ->merge($this->data->supplements()->keys()) - ->merge($this->commonKeys()) - ->merge($this->blueprintFields()->keys()) - ->unique()->sort()->values()->all(); + if ($this->cachedKeys) { + return $this->cachedKeys; } - return $this->cachedKeys; + return $this->cachedKeys = $this->data->values()->keys() + ->merge($this->data->supplements()->keys()) + ->merge($this->commonKeys()) + ->merge($this->blueprintFields()->keys()) + ->unique()->sort()->values()->all(); } private function commonKeys() From a1ba023a561e4eda588a80001c3d05359e223ec8 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 26 Feb 2024 10:18:08 -0500 Subject: [PATCH 4/7] breathe --- src/Data/HasOrigin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php index 47491651e1a..1f28b87f2ec 100644 --- a/src/Data/HasOrigin.php +++ b/src/Data/HasOrigin.php @@ -18,6 +18,7 @@ public function keys() if ($this->cachedKeys) { return $this->cachedKeys; } + $originFallbackKeys = method_exists($this, 'getOriginFallbackValues') ? $this->getOriginFallbackValues()->keys() : collect(); $originKeys = $this->hasOrigin() ? $this->origin()->keys() : collect(); From 3c3ef07838d200692b63ef47669a25d58ae5f084 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 12 Mar 2024 13:01:01 -0400 Subject: [PATCH 5/7] visibility, consistent property name, no initial value --- src/Assets/AugmentedAsset.php | 2 +- src/Auth/AugmentedUser.php | 2 +- src/Data/HasOrigin.php | 2 +- src/Entries/AugmentedEntry.php | 8 ++++---- src/Globals/AugmentedVariables.php | 2 +- src/Structures/AugmentedPage.php | 2 +- src/Taxonomies/AugmentedTerm.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Assets/AugmentedAsset.php b/src/Assets/AugmentedAsset.php index 39a3be72d9c..a49727b431a 100644 --- a/src/Assets/AugmentedAsset.php +++ b/src/Assets/AugmentedAsset.php @@ -8,7 +8,7 @@ class AugmentedAsset extends AbstractAugmented { - protected $cachedKeys = null; + private $cachedKeys; public function keys() { diff --git a/src/Auth/AugmentedUser.php b/src/Auth/AugmentedUser.php index 297f1b9a5d2..657eff38ae3 100644 --- a/src/Auth/AugmentedUser.php +++ b/src/Auth/AugmentedUser.php @@ -11,7 +11,7 @@ class AugmentedUser extends AbstractAugmented { - protected $cachedKeys = null; + private $cachedKeys; public function keys() { diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php index 3279cf4a5f4..295b18d8151 100644 --- a/src/Data/HasOrigin.php +++ b/src/Data/HasOrigin.php @@ -11,7 +11,7 @@ trait HasOrigin */ protected $origin; - protected $cachedKeys = null; + private $cachedKeys; public function keys() { diff --git a/src/Entries/AugmentedEntry.php b/src/Entries/AugmentedEntry.php index 6f7e46302ef..65c67b8fd40 100644 --- a/src/Entries/AugmentedEntry.php +++ b/src/Entries/AugmentedEntry.php @@ -8,15 +8,15 @@ class AugmentedEntry extends AbstractAugmented { - protected $keysCache = null; + private $cachedKeys; public function keys() { - if ($this->keysCache) { - return $this->keysCache; + if ($this->cachedKeys) { + return $this->cachedKeys; } - return $this->keysCache = $this->data->keys() + return $this->cachedKeys = $this->data->keys() ->merge($this->data->supplements()->keys()) ->merge($this->commonKeys()) ->merge($this->blueprintFields()->keys()) diff --git a/src/Globals/AugmentedVariables.php b/src/Globals/AugmentedVariables.php index 39b9a5181ce..440b8c685f2 100644 --- a/src/Globals/AugmentedVariables.php +++ b/src/Globals/AugmentedVariables.php @@ -6,7 +6,7 @@ class AugmentedVariables extends AbstractAugmented { - protected $cachedKeys = null; + private $cachedKeys; public function keys() { diff --git a/src/Structures/AugmentedPage.php b/src/Structures/AugmentedPage.php index a5eb6987cdf..a2b6b4992a8 100644 --- a/src/Structures/AugmentedPage.php +++ b/src/Structures/AugmentedPage.php @@ -22,7 +22,7 @@ public function __construct($page) } } - protected $cachedKeys = null; + private $cachedKeys; public function keys() { diff --git a/src/Taxonomies/AugmentedTerm.php b/src/Taxonomies/AugmentedTerm.php index 13a89c14a24..4c9c06e958a 100644 --- a/src/Taxonomies/AugmentedTerm.php +++ b/src/Taxonomies/AugmentedTerm.php @@ -8,7 +8,7 @@ class AugmentedTerm extends AbstractAugmented { - protected $cachedKeys = null; + private $cachedKeys; public function keys() { From a2fe975b04f4661630d4df588c217dbee19944c1 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 12 Mar 2024 13:01:56 -0400 Subject: [PATCH 6/7] move --- src/Structures/AugmentedPage.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Structures/AugmentedPage.php b/src/Structures/AugmentedPage.php index a2b6b4992a8..8e4db1ada0f 100644 --- a/src/Structures/AugmentedPage.php +++ b/src/Structures/AugmentedPage.php @@ -9,6 +9,7 @@ class AugmentedPage extends AugmentedEntry { protected $page; protected $hasEntry = false; + private $cachedKeys; public function __construct($page) { @@ -22,8 +23,6 @@ public function __construct($page) } } - private $cachedKeys; - public function keys() { if ($this->cachedKeys) { From cec866a17dbaeff593889ea6676bfd80e2d479bd Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Tue, 12 Mar 2024 13:02:24 -0400 Subject: [PATCH 7/7] nitpick --- src/Data/HasOrigin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php index 295b18d8151..a22d29a1d8f 100644 --- a/src/Data/HasOrigin.php +++ b/src/Data/HasOrigin.php @@ -10,7 +10,6 @@ trait HasOrigin * @var string */ protected $origin; - private $cachedKeys; public function keys()