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

Author: duncanmcclean

src/StaticCaching/DefaultInvalidator.php

@@ -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();
 

tests/StaticCaching/DefaultInvalidatorTest.php

@@ -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());
         });
 
@@ -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'));
         });