Inline GeneratesMainNavigationMenu::handle method

hydephp · Feb 21, 2024 · eb5d79e · eb5d79e
1 parent e06f1c0
commit eb5d79e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,10 +6,10 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -22,7 +22,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(NavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,8 +9,5 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public static function handle(): NavigationMenu
-    {
-        return NavigationMenuGenerator::handle(NavigationMenu::class);
-    }
+    //
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,9 +18,9 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -1248,7 +1248,7 @@ public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
             ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
-            : GeneratesMainNavigationMenu::handle()->getItems();
+            : NavigationMenuGenerator::handle(NavigationMenu::class)->getItems();
 
         $this->test = $test;
     }

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
@@ -271,6 +271,6 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
 
     protected function createNavigationMenu(): NavigationMenu
     {
-        return GeneratesMainNavigationMenu::handle();
+        return NavigationMenuGenerator::handle(NavigationMenu::class);
     }
 }