Skip to content

[5.x] Fix error from DefaultInvalidator when creating a nav #13596

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
duncanmcclean wants to merge 2 commits into
base: 5.x
Choose a base branch
from
+3 −11
Open

[5.x] Fix error from DefaultInvalidator when creating a nav #13596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24efd7b
Handle situation where structure doesn't exist yet
duncanmcclean Jan 19, 2026
9ca73aa
fix tests
duncanmcclean Jan 19, 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
2 changes: 1 addition & 1 deletion src/StaticCaching/DefaultInvalidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ protected function invalidateNavUrls($nav)

protected function invalidateNavTreeUrls($tree)
{
$rules = collect(Arr::get($this->rules, "navigation.{$tree->structure()->handle()}.urls"));
$rules = collect(Arr::get($this->rules, "navigation.{$tree->handle()}.urls"));

$absoluteUrls = $rules->filter(fn (string $rule) => $this->isAbsoluteUrl($rule))->all();

Expand Down
12 changes: 2 additions & 10 deletions tests/StaticCaching/DefaultInvalidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,12 +559,8 @@ public function navigation_urls_can_be_invalidated_by_a_tree()
])->once();
});

$nav = tap(Mockery::mock(Nav::class), function ($m) {
$tree = tap(Mockery::mock(NavTree::class), function ($m) {
$m->shouldReceive('handle')->andReturn('links');
});

$tree = tap(Mockery::mock(NavTree::class), function ($m) use ($nav) {
$m->shouldReceive('structure')->andReturn($nav);
$m->shouldReceive('site')->andReturn(Site::default());
});

Expand Down Expand Up @@ -599,12 +595,8 @@ public function navigation_urls_can_be_invalidated_by_a_tree_in_a_multisite()
])->once();
});

$nav = tap(Mockery::mock(Nav::class), function ($m) {
$tree = tap(Mockery::mock(NavTree::class), function ($m) {
$m->shouldReceive('handle')->andReturn('links');
});

$tree = tap(Mockery::mock(NavTree::class), function ($m) use ($nav) {
$m->shouldReceive('structure')->andReturn($nav);
$m->shouldReceive('site')->andReturn(Site::get('fr'));
});

Expand Down