Skip to content
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

[5.x] Simplify collection and cache getComputedCallbacks on Entry instances #9642

Merged
merged 7 commits into from
Apr 1, 2024
Merged

[5.x] Simplify collection and cache getComputedCallbacks on Entry instances #9642

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f30d71
Cache collection instance on Entry
JohnathonKoster Mar 2, 2024
7a0ed13
Refactors; cache computed callbacks
JohnathonKoster Mar 3, 2024
4d07241
Merge branch 'master' into cache-collection-on-entry
JohnathonKoster Mar 3, 2024
2ea3e8c
Merge branch 'master' into cache-collection-on-entry
JohnathonKoster Mar 30, 2024
092e5d9
just use sleep
jasonvarga Apr 1, 2024
705b34a
visibility
jasonvarga Apr 1, 2024
2104ead
but do it right
jasonvarga Apr 1, 2024
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
10 changes: 8 additions & 2 deletions src/Entries/Entry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class Entry implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableVal
protected $withEvents = true;
protected $template;
protected $layout;
private $computedCallbackCache;
private $siteCache;

public function __construct()
Expand Down Expand Up @@ -128,6 +129,7 @@ public function collection($collection = null)
}) : null;
}

$this->computedCallbackCache = null;
$this->collection = $collection instanceof \Statamic\Contracts\Entries\Collection ? $collection->handle() : $collection;

return $this;
Expand Down Expand Up @@ -1019,7 +1021,11 @@ public function getCpSearchResultBadge(): string

protected function getComputedCallbacks()
{
return Facades\Collection::getComputedCallbacks($this->collection);
if ($this->computedCallbackCache) {
return $this->computedCallbackCache;
}

return $this->computedCallbackCache = Facades\Collection::getComputedCallbacks($this->collection);
}

public function __sleep()
Expand All @@ -1029,6 +1035,6 @@ public function __sleep()
$this->slug = $slug($this);
}

return array_keys(get_object_vars($this));
return array_keys(Arr::except(get_object_vars($this), ['computedCallbackCache']));
}
}
Loading