Skip to content

Commit eb5d79e

Browse files
committed
Inline GeneratesMainNavigationMenu::handle method
1 parent e06f1c0 commit eb5d79e

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

packages/framework/src/Foundation/Providers/NavigationServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
use Hyde\Foundation\HydeKernel;
88
use Illuminate\Support\ServiceProvider;
9+
use Hyde\Framework\Features\Navigation\NavigationMenu;
910
use Hyde\Framework\Features\Navigation\NavigationManager;
1011
use Hyde\Framework\Features\Navigation\DocumentationSidebar;
1112
use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
12-
use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
1313

1414
class NavigationServiceProvider extends ServiceProvider
1515
{
@@ -22,7 +22,7 @@ public function register(): void
2222
$this->app->alias(NavigationManager::class, 'navigation');
2323

2424
$this->app->make(HydeKernel::class)->booted(function () {
25-
$this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
25+
$this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(NavigationMenu::class));
2626
$this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
2727
});
2828
}

packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,5 @@
99
*/
1010
class GeneratesMainNavigationMenu
1111
{
12-
public static function handle(): NavigationMenu
13-
{
14-
return NavigationMenuGenerator::handle(NavigationMenu::class);
15-
}
12+
//
1613
}

packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
use Illuminate\Support\Collection;
1919
use Hyde\Foundation\Kernel\RouteCollection;
2020
use Hyde\Framework\Features\Navigation\NavItem;
21+
use Hyde\Framework\Features\Navigation\NavigationMenu;
2122
use Hyde\Framework\Features\Navigation\DocumentationSidebar;
2223
use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
23-
use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
2424

2525
/**
2626
* High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -1248,7 +1248,7 @@ public function __construct(TestCase $test, $sidebar = false)
12481248
{
12491249
$this->items = $sidebar
12501250
? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
1251-
: GeneratesMainNavigationMenu::handle()->getItems();
1251+
: NavigationMenuGenerator::handle(NavigationMenu::class)->getItems();
12521252

12531253
$this->test = $test;
12541254
}

packages/framework/tests/Feature/NavigationMenuTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Hyde\Pages\MarkdownPage;
1313
use Hyde\Testing\TestCase;
1414
use Illuminate\Support\Collection;
15-
use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
15+
use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
1616

1717
/**
1818
* @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
@@ -271,6 +271,6 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
271271

272272
protected function createNavigationMenu(): NavigationMenu
273273
{
274-
return GeneratesMainNavigationMenu::handle();
274+
return NavigationMenuGenerator::handle(NavigationMenu::class);
275275
}
276276
}

0 commit comments

Comments
 (0)