From d6282dad42f4bba0ea29fb2144f536aedd6e8550 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:35:37 +0200
Subject: [PATCH 1/8] Update NavigationMenu namespace, moving into Models

---
 .../views/layouts/navigation.blade.php        | 33 +++++++++++++------
 .../Navigation => Models}/NavigationMenu.php  |  3 +-
 .../tests/Feature/NavigationMenuTest.php      |  4 +--
 3 files changed, 26 insertions(+), 14 deletions(-)
 rename packages/framework/src/{Modules/Navigation => Models}/NavigationMenu.php (95%)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 3a9359d1bf1..7da72ce824c 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,29 +1,42 @@
 @php
-$navigation = \Hyde\Framework\Modules\Navigation\NavigationMenu::create($page->getRoute());
+	$navigation = \Hyde\Framework\Models\NavigationMenu::create($page->getRoute());
 @endphp
 
-<nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
+<nav aria-label="Main navigation" id="main-navigation"
+	 class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
 	<div class="flex flex-grow items-center flex-shrink-0 text-gray-700 dark:text-gray-200">
 		@include('hyde::components.navigation.navigation-brand')
 
 		<div class="ml-auto">
-		@include('hyde::components.navigation.theme-toggle-button')
+			@include('hyde::components.navigation.theme-toggle-button')
 		</div>
 	</div>
 
 	<div class="block md:hidden">
-		<button id="navigation-toggle-button" class="flex items-center px-3 py-1 hover:text-gray-700 dark:text-gray-200" aria-label="Toggle navigation menu">
-			<svg title="Open Navigation Menu" class="dark:fill-gray-200" style="display: block;" id="open-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><title>Open Menu</title><path d="M0 0h24v24H0z" fill="none"/><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/></svg>
-			<svg title="Close Navigation Menu" class="dark:fill-gray-200" style="display: none;" id="close-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><title>Close Menu</title> <path d="M0 0h24v24H0z" fill="none"></path> <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path> </svg>
+		<button id="navigation-toggle-button" class="flex items-center px-3 py-1 hover:text-gray-700 dark:text-gray-200"
+				aria-label="Toggle navigation menu">
+			<svg title="Open Navigation Menu" class="dark:fill-gray-200" style="display: block;"
+				 id="open-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24"
+				 width="24"><title>Open Menu</title>
+				<path d="M0 0h24v24H0z" fill="none"/>
+				<path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
+			</svg>
+			<svg title="Close Navigation Menu" class="dark:fill-gray-200" style="display: none;"
+				 id="close-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24"
+				 width="24"><title>Close Menu</title>
+				<path d="M0 0h24v24H0z" fill="none"></path>
+				<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path>
+			</svg>
 		</button>
 	</div>
 
-	<div id="main-navigation-links" class="w-full hidden md:flex flex-grow md:flex-grow-0 md:items-center md:w-auto px-6 -mx-4 border-t mt-3 pt-3 md:border-none md:mt-0 md:py-0 border-gray-200 dark:border-gray-700">
+	<div id="main-navigation-links"
+		 class="w-full hidden md:flex flex-grow md:flex-grow-0 md:items-center md:w-auto px-6 -mx-4 border-t mt-3 pt-3 md:border-none md:mt-0 md:py-0 border-gray-200 dark:border-gray-700">
 		<ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
 			@foreach ($navigation->items as $item)
-			<li class="md:mx-2">
-				@include('hyde::components.navigation.navigation-link')
-			</li>
+				<li class="md:mx-2">
+					@include('hyde::components.navigation.navigation-link')
+				</li>
 			@endforeach
 		</ul>
 	</div>
diff --git a/packages/framework/src/Modules/Navigation/NavigationMenu.php b/packages/framework/src/Models/NavigationMenu.php
similarity index 95%
rename from packages/framework/src/Modules/Navigation/NavigationMenu.php
rename to packages/framework/src/Models/NavigationMenu.php
index 5afa24bad9d..13e33d4c05a 100644
--- a/packages/framework/src/Modules/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Models/NavigationMenu.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Hyde\Framework\Modules\Navigation;
+namespace Hyde\Framework\Models;
 
-use Hyde\Framework\Models\NavItem;
 use Hyde\Framework\Modules\Routing\Route;
 use Hyde\Framework\Modules\Routing\RouteContract;
 use Hyde\Framework\Modules\Routing\Router;
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index fa0ff925874..1b6235951e3 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -3,14 +3,14 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Hyde;
+use Hyde\Framework\Models\NavigationMenu;
 use Hyde\Framework\Models\NavItem;
-use Hyde\Framework\Modules\Navigation\NavigationMenu;
 use Hyde\Framework\Modules\Routing\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Modules\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Models\NavigationMenu
  */
 class NavigationMenuTest extends TestCase
 {

From 9efdbcda90d52e7bafb84fd9c3c1c36c8aa264c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:37:48 +0200
Subject: [PATCH 2/8] Move RouterContract into Contracts namespace

---
 .../src/{Modules/Routing => Contracts}/RouterContract.php       | 2 +-
 packages/framework/src/Modules/Routing/Router.php               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename packages/framework/src/{Modules/Routing => Contracts}/RouterContract.php (95%)

diff --git a/packages/framework/src/Modules/Routing/RouterContract.php b/packages/framework/src/Contracts/RouterContract.php
similarity index 95%
rename from packages/framework/src/Modules/Routing/RouterContract.php
rename to packages/framework/src/Contracts/RouterContract.php
index ec1c0a00dab..1c0d598ed92 100644
--- a/packages/framework/src/Modules/Routing/RouterContract.php
+++ b/packages/framework/src/Contracts/RouterContract.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hyde\Framework\Modules\Routing;
+namespace Hyde\Framework\Contracts;
 
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/src/Modules/Routing/Router.php b/packages/framework/src/Modules/Routing/Router.php
index 792aa3858f6..e8faebbe843 100644
--- a/packages/framework/src/Modules/Routing/Router.php
+++ b/packages/framework/src/Modules/Routing/Router.php
@@ -3,6 +3,7 @@
 namespace Hyde\Framework\Modules\Routing;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouterContract;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;

From 066561326763de0f507887fd7aa64c820312921b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:38:37 +0200
Subject: [PATCH 3/8] Move RouteContract into Contracts namespace

---
 packages/framework/src/Contracts/PageContract.php   |  3 +--
 .../Routing => Contracts}/RouteContract.php         |  4 +---
 packages/framework/src/Contracts/RouterContract.php |  4 ++--
 packages/framework/src/Models/NavItem.php           |  5 ++---
 packages/framework/src/Models/NavigationMenu.php    |  2 +-
 packages/framework/src/Modules/Routing/Route.php    |  1 +
 .../src/Modules/Routing/RouteFacadeContract.php     | 13 +++++++------
 packages/framework/src/Modules/Routing/Router.php   |  3 ++-
 packages/framework/src/Services/BuildService.php    |  2 +-
 packages/framework/tests/Feature/RouteTest.php      |  2 +-
 packages/framework/tests/Feature/RouterTest.php     |  2 +-
 packages/framework/tests/Unit/NavItemTest.php       |  2 +-
 12 files changed, 21 insertions(+), 22 deletions(-)
 rename packages/framework/src/{Modules/Routing => Contracts}/RouteContract.php (95%)

diff --git a/packages/framework/src/Contracts/PageContract.php b/packages/framework/src/Contracts/PageContract.php
index 71b18232ab3..f5d635fba6e 100644
--- a/packages/framework/src/Contracts/PageContract.php
+++ b/packages/framework/src/Contracts/PageContract.php
@@ -2,7 +2,6 @@
 
 namespace Hyde\Framework\Contracts;
 
-use Hyde\Framework\Modules\Routing\RouteContract;
 use Illuminate\Support\Collection;
 
 interface PageContract
@@ -115,7 +114,7 @@ public function getCurrentPagePath(): string;
     /**
      * Get the route for the page.
      *
-     * @return \Hyde\Framework\Modules\Routing\RouteContract
+     * @return \Hyde\Framework\Contracts\RouteContract
      */
     public function getRoute(): RouteContract;
 }
diff --git a/packages/framework/src/Modules/Routing/RouteContract.php b/packages/framework/src/Contracts/RouteContract.php
similarity index 95%
rename from packages/framework/src/Modules/Routing/RouteContract.php
rename to packages/framework/src/Contracts/RouteContract.php
index 31e39cc1679..ebacb508f10 100644
--- a/packages/framework/src/Modules/Routing/RouteContract.php
+++ b/packages/framework/src/Contracts/RouteContract.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Hyde\Framework\Modules\Routing;
-
-use Hyde\Framework\Contracts\PageContract;
+namespace Hyde\Framework\Contracts;
 
 /**
  * This contract defines the methods that a Route object must implement.
diff --git a/packages/framework/src/Contracts/RouterContract.php b/packages/framework/src/Contracts/RouterContract.php
index 1c0d598ed92..2d0106af84f 100644
--- a/packages/framework/src/Contracts/RouterContract.php
+++ b/packages/framework/src/Contracts/RouterContract.php
@@ -21,7 +21,7 @@ public static function getInstance(): RouterContract;
     /**
      * Get the routes discovered by the router.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Modules\Routing\RouteContract>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Contracts\RouteContract>
      */
     public function getRoutes(): Collection;
 
@@ -29,7 +29,7 @@ public function getRoutes(): Collection;
      * Get all discovered routes for the given page class.
      *
      * @param  class-string<\Hyde\Framework\Contracts\PageContract>  $pageClass
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Modules\Routing\RouteContract>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Contracts\RouteContract>
      */
     public function getRoutesForModel(string $pageClass): Collection;
 }
diff --git a/packages/framework/src/Models/NavItem.php b/packages/framework/src/Models/NavItem.php
index 74caf472b21..8d0cdb55ec5 100644
--- a/packages/framework/src/Models/NavItem.php
+++ b/packages/framework/src/Models/NavItem.php
@@ -3,8 +3,7 @@
 namespace Hyde\Framework\Models;
 
 use Hyde\Framework\Contracts\PageContract;
-use Hyde\Framework\Facades\Route;
-use Hyde\Framework\Modules\Routing\RouteContract;
+use Hyde\Framework\Contracts\RouteContract;
 
 /**
  * Abstraction for a navigation menu item.
@@ -26,7 +25,7 @@ class NavItem
     /**
      * Create a new navigation menu item.
      *
-     * @param  \Hyde\Framework\Modules\Routing\RouteContract|null  $route
+     * @param  \Hyde\Framework\Contracts\RouteContract|null  $route
      * @param  string  $title
      * @param  int  $priority
      * @param  bool  $hidden
diff --git a/packages/framework/src/Models/NavigationMenu.php b/packages/framework/src/Models/NavigationMenu.php
index 13e33d4c05a..fe0e736c89b 100644
--- a/packages/framework/src/Models/NavigationMenu.php
+++ b/packages/framework/src/Models/NavigationMenu.php
@@ -2,8 +2,8 @@
 
 namespace Hyde\Framework\Models;
 
+use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Modules\Routing\Route;
-use Hyde\Framework\Modules\Routing\RouteContract;
 use Hyde\Framework\Modules\Routing\Router;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/src/Modules/Routing/Route.php b/packages/framework/src/Modules/Routing/Route.php
index 17aac214f44..edf24f9c71d 100644
--- a/packages/framework/src/Modules/Routing/Route.php
+++ b/packages/framework/src/Modules/Routing/Route.php
@@ -3,6 +3,7 @@
 namespace Hyde\Framework\Modules\Routing;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Hyde;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/src/Modules/Routing/RouteFacadeContract.php b/packages/framework/src/Modules/Routing/RouteFacadeContract.php
index 4452dbcc9ff..79b7c9f4573 100644
--- a/packages/framework/src/Modules/Routing/RouteFacadeContract.php
+++ b/packages/framework/src/Modules/Routing/RouteFacadeContract.php
@@ -3,12 +3,13 @@
 namespace Hyde\Framework\Modules\Routing;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouteContract;
 use Illuminate\Support\Collection;
 
 /**
  * This contract defines the static facade methods for the Route class.
  *
- * @see \Hyde\Framework\Modules\Routing\RouteContract for the interface that each route model must implement.
+ * @see \Hyde\Framework\Contracts\RouteContract for the interface that each route model must implement.
  */
 interface RouteFacadeContract
 {
@@ -18,7 +19,7 @@ interface RouteFacadeContract
      * Alias for static::getFromKey().
      *
      * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Framework\Modules\Routing\RouteContract
+     * @return \Hyde\Framework\Contracts\RouteContract
      *
      * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
      */
@@ -28,7 +29,7 @@ public static function get(string $routeKey): RouteContract;
      * Get a route from the Router index for the specified route key.
      *
      * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Framework\Modules\Routing\RouteContract
+     * @return \Hyde\Framework\Contracts\RouteContract
      *
      * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
      */
@@ -38,7 +39,7 @@ public static function getFromKey(string $routeKey): RouteContract;
      * Get a route from the Router index for the specified source file path.
      *
      * @param  string  $sourceFilePath  Example: _posts/foo.md
-     * @return \Hyde\Framework\Modules\Routing\RouteContract
+     * @return \Hyde\Framework\Contracts\RouteContract
      *
      * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
      */
@@ -48,7 +49,7 @@ public static function getFromSource(string $sourceFilePath): RouteContract;
      * Get a route from the Router index for the supplied page model.
      *
      * @param  \Hyde\Framework\Contracts\PageContract  $page
-     * @return \Hyde\Framework\Modules\Routing\RouteContract
+     * @return \Hyde\Framework\Contracts\RouteContract
      *
      * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
      */
@@ -57,7 +58,7 @@ public static function getFromModel(PageContract $page): RouteContract;
     /**
      * Get all routes from the Router index.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Modules\Routing\RouteContract>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Contracts\RouteContract>
      */
     public static function all(): Collection;
 }
diff --git a/packages/framework/src/Modules/Routing/Router.php b/packages/framework/src/Modules/Routing/Router.php
index e8faebbe843..9d4da5567dc 100644
--- a/packages/framework/src/Modules/Routing/Router.php
+++ b/packages/framework/src/Modules/Routing/Router.php
@@ -3,6 +3,7 @@
 namespace Hyde\Framework\Modules\Routing;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Contracts\RouterContract;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Models\Pages\BladePage;
@@ -43,7 +44,7 @@ class Router implements RouterContract
     /**
      * The routes discovered by the router.
      *
-     * @var \Illuminate\Support\Collection<\Hyde\Framework\Modules\Routing\RouteContract>
+     * @var \Illuminate\Support\Collection<\Hyde\Framework\Contracts\RouteContract>
      */
     protected Collection $routes;
 
diff --git a/packages/framework/src/Services/BuildService.php b/packages/framework/src/Services/BuildService.php
index 596c5e79e73..0efbac63e01 100644
--- a/packages/framework/src/Services/BuildService.php
+++ b/packages/framework/src/Services/BuildService.php
@@ -3,8 +3,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
+use Hyde\Framework\Contracts\RouteContract as Route;
 use Hyde\Framework\Hyde;
-use Hyde\Framework\Modules\Routing\RouteContract as Route;
 use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Framework\StaticPageBuilder;
 use Illuminate\Console\Concerns\InteractsWithIO;
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 23e2dbc6f3b..76347b777f3 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -2,13 +2,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Modules\Routing\Route;
-use Hyde\Framework\Modules\Routing\RouteContract;
 use Hyde\Framework\Modules\Routing\RouteNotFoundException;
 use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Testing\TestCase;
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index e71f3080409..26d51aa5492 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -3,13 +3,13 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Modules\Routing\Route;
-use Hyde\Framework\Modules\Routing\RouteContract;
 use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b549b6f6c79..a029ce3711f 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -3,9 +3,9 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Facades\Route;
 use Hyde\Framework\Models\NavItem;
-use Hyde\Framework\Modules\Routing\RouteContract;
 use Hyde\Testing\TestCase;
 
 /**

From aed3aa583c0eb05cd71091d93e052955ef000a9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:38:54 +0200
Subject: [PATCH 4/8] Move RouteFacadeContract into Contracts namespace

---
 packages/framework/src/Contracts/RouteContract.php            | 2 +-
 .../{Modules/Routing => Contracts}/RouteFacadeContract.php    | 4 +---
 packages/framework/src/Facades/Route.php                      | 2 +-
 packages/framework/src/Modules/Routing/Route.php              | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename packages/framework/src/{Modules/Routing => Contracts}/RouteFacadeContract.php (93%)

diff --git a/packages/framework/src/Contracts/RouteContract.php b/packages/framework/src/Contracts/RouteContract.php
index ebacb508f10..0366d6c160d 100644
--- a/packages/framework/src/Contracts/RouteContract.php
+++ b/packages/framework/src/Contracts/RouteContract.php
@@ -8,7 +8,7 @@
  *
  * In Hyde, the route models also serve as a facade for all routes, see the dedicated interface:
  *
- * @see \Hyde\Framework\Modules\Routing\RouteFacadeContract for the static facade methods.
+ * @see \Hyde\Framework\Contracts\RouteFacadeContract for the static facade methods.
  */
 interface RouteContract
 {
diff --git a/packages/framework/src/Modules/Routing/RouteFacadeContract.php b/packages/framework/src/Contracts/RouteFacadeContract.php
similarity index 93%
rename from packages/framework/src/Modules/Routing/RouteFacadeContract.php
rename to packages/framework/src/Contracts/RouteFacadeContract.php
index 79b7c9f4573..a75602c2291 100644
--- a/packages/framework/src/Modules/Routing/RouteFacadeContract.php
+++ b/packages/framework/src/Contracts/RouteFacadeContract.php
@@ -1,9 +1,7 @@
 <?php
 
-namespace Hyde\Framework\Modules\Routing;
+namespace Hyde\Framework\Contracts;
 
-use Hyde\Framework\Contracts\PageContract;
-use Hyde\Framework\Contracts\RouteContract;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index f62e653b887..c386dac6d2b 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -3,8 +3,8 @@
 namespace Hyde\Framework\Facades;
 
 use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Contracts\RouteFacadeContract;
 use Hyde\Framework\Modules\Routing\Route as RouteModel;
-use Hyde\Framework\Modules\Routing\RouteFacadeContract;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Modules/Routing/Route.php b/packages/framework/src/Modules/Routing/Route.php
index edf24f9c71d..38bec1339b4 100644
--- a/packages/framework/src/Modules/Routing/Route.php
+++ b/packages/framework/src/Modules/Routing/Route.php
@@ -4,6 +4,7 @@
 
 use Hyde\Framework\Contracts\PageContract;
 use Hyde\Framework\Contracts\RouteContract;
+use Hyde\Framework\Contracts\RouteFacadeContract;
 use Hyde\Framework\Hyde;
 use Illuminate\Support\Collection;
 

From d7d692cf67b3b348dc8458ce5531149f07aa88a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:39:43 +0200
Subject: [PATCH 5/8] Move RouteNotFoundException into Exceptions namespace

---
 packages/framework/src/Contracts/RouteFacadeContract.php  | 8 ++++----
 .../Routing => Exceptions}/RouteNotFoundException.php     | 2 +-
 packages/framework/src/Modules/Routing/Route.php          | 1 +
 packages/framework/tests/Feature/RouteTest.php            | 2 +-
 .../framework/tests/Unit/RouteNotFoundExceptionTest.php   | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename packages/framework/src/{Modules/Routing => Exceptions}/RouteNotFoundException.php (89%)

diff --git a/packages/framework/src/Contracts/RouteFacadeContract.php b/packages/framework/src/Contracts/RouteFacadeContract.php
index a75602c2291..a9082743aae 100644
--- a/packages/framework/src/Contracts/RouteFacadeContract.php
+++ b/packages/framework/src/Contracts/RouteFacadeContract.php
@@ -19,7 +19,7 @@ interface RouteFacadeContract
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Framework\Contracts\RouteContract
      *
-     * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
     public static function get(string $routeKey): RouteContract;
 
@@ -29,7 +29,7 @@ public static function get(string $routeKey): RouteContract;
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Framework\Contracts\RouteContract
      *
-     * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
     public static function getFromKey(string $routeKey): RouteContract;
 
@@ -39,7 +39,7 @@ public static function getFromKey(string $routeKey): RouteContract;
      * @param  string  $sourceFilePath  Example: _posts/foo.md
      * @return \Hyde\Framework\Contracts\RouteContract
      *
-     * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
     public static function getFromSource(string $sourceFilePath): RouteContract;
 
@@ -49,7 +49,7 @@ public static function getFromSource(string $sourceFilePath): RouteContract;
      * @param  \Hyde\Framework\Contracts\PageContract  $page
      * @return \Hyde\Framework\Contracts\RouteContract
      *
-     * @throws \Hyde\Framework\Modules\Routing\RouteNotFoundException
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
     public static function getFromModel(PageContract $page): RouteContract;
 
diff --git a/packages/framework/src/Modules/Routing/RouteNotFoundException.php b/packages/framework/src/Exceptions/RouteNotFoundException.php
similarity index 89%
rename from packages/framework/src/Modules/Routing/RouteNotFoundException.php
rename to packages/framework/src/Exceptions/RouteNotFoundException.php
index d956132bd67..7334992be50 100644
--- a/packages/framework/src/Modules/Routing/RouteNotFoundException.php
+++ b/packages/framework/src/Exceptions/RouteNotFoundException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hyde\Framework\Modules\Routing;
+namespace Hyde\Framework\Exceptions;
 
 class RouteNotFoundException extends \Exception
 {
diff --git a/packages/framework/src/Modules/Routing/Route.php b/packages/framework/src/Modules/Routing/Route.php
index 38bec1339b4..c45d5a7b832 100644
--- a/packages/framework/src/Modules/Routing/Route.php
+++ b/packages/framework/src/Modules/Routing/Route.php
@@ -5,6 +5,7 @@
 use Hyde\Framework\Contracts\PageContract;
 use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Contracts\RouteFacadeContract;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Hyde;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 76347b777f3..da682357fde 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -3,13 +3,13 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Contracts\RouteContract;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Modules\Routing\Route;
-use Hyde\Framework\Modules\Routing\RouteNotFoundException;
 use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/RouteNotFoundExceptionTest.php b/packages/framework/tests/Unit/RouteNotFoundExceptionTest.php
index cdfe7a3b015..15e21222f10 100644
--- a/packages/framework/tests/Unit/RouteNotFoundExceptionTest.php
+++ b/packages/framework/tests/Unit/RouteNotFoundExceptionTest.php
@@ -2,11 +2,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Modules\Routing\RouteNotFoundException;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Modules\Routing\RouteNotFoundException
+ * @covers \Hyde\Framework\Exceptions\RouteNotFoundException
  */
 class RouteNotFoundExceptionTest extends TestCase
 {

From 2ade265c4c856086f56b0d370c6028d8f5a4551c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:40:20 +0200
Subject: [PATCH 6/8] Move Route into Models namespace

---
 packages/framework/src/Concerns/CanBeInNavigation.php        | 2 +-
 packages/framework/src/Contracts/AbstractPage.php            | 2 +-
 packages/framework/src/Facades/Route.php                     | 4 ++--
 packages/framework/src/Models/NavigationMenu.php             | 1 -
 packages/framework/src/{Modules/Routing => Models}/Route.php | 3 ++-
 packages/framework/src/Modules/Routing/Router.php            | 1 +
 packages/framework/src/Services/RebuildService.php           | 2 +-
 packages/framework/tests/Feature/AbstractPageTest.php        | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php      | 2 +-
 packages/framework/tests/Feature/RouteFacadeTest.php         | 2 +-
 packages/framework/tests/Feature/RouteTest.php               | 4 ++--
 packages/framework/tests/Feature/RouterTest.php              | 2 +-
 12 files changed, 14 insertions(+), 13 deletions(-)
 rename packages/framework/src/{Modules/Routing => Models}/Route.php (97%)

diff --git a/packages/framework/src/Concerns/CanBeInNavigation.php b/packages/framework/src/Concerns/CanBeInNavigation.php
index df1c77af6d5..b8daf50cc1d 100644
--- a/packages/framework/src/Concerns/CanBeInNavigation.php
+++ b/packages/framework/src/Concerns/CanBeInNavigation.php
@@ -112,7 +112,7 @@ public function navigationMenuTitle(): string
      * If an item returns a route collection,
      * it will automatically be made into a dropdown.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Modules\Routing\Route>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Models\Route>
      */
     // public function navigationMenuChildren(): Collection;
 }
diff --git a/packages/framework/src/Contracts/AbstractPage.php b/packages/framework/src/Contracts/AbstractPage.php
index d44ea2e4cb4..1a0eea92c93 100644
--- a/packages/framework/src/Contracts/AbstractPage.php
+++ b/packages/framework/src/Contracts/AbstractPage.php
@@ -4,7 +4,7 @@
 
 use Hyde\Framework\Concerns\CanBeInNavigation;
 use Hyde\Framework\Concerns\HasPageMetadata;
-use Hyde\Framework\Modules\Routing\Route;
+use Hyde\Framework\Models\Route;
 use Hyde\Framework\Services\CollectionService;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index c386dac6d2b..bde8e17b5e2 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -4,11 +4,11 @@
 
 use Hyde\Framework\Contracts\PageContract;
 use Hyde\Framework\Contracts\RouteFacadeContract;
-use Hyde\Framework\Modules\Routing\Route as RouteModel;
+use Hyde\Framework\Models\Route as RouteModel;
 use Illuminate\Support\Collection;
 
 /**
- * @see \Hyde\Framework\Modules\Routing\Route
+ * @see \Hyde\Framework\Models\Route
  * @see \Hyde\Framework\Testing\Feature\RouteFacadeTest
  */
 class Route implements RouteFacadeContract
diff --git a/packages/framework/src/Models/NavigationMenu.php b/packages/framework/src/Models/NavigationMenu.php
index fe0e736c89b..8f37feac0c8 100644
--- a/packages/framework/src/Models/NavigationMenu.php
+++ b/packages/framework/src/Models/NavigationMenu.php
@@ -3,7 +3,6 @@
 namespace Hyde\Framework\Models;
 
 use Hyde\Framework\Contracts\RouteContract;
-use Hyde\Framework\Modules\Routing\Route;
 use Hyde\Framework\Modules\Routing\Router;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/src/Modules/Routing/Route.php b/packages/framework/src/Models/Route.php
similarity index 97%
rename from packages/framework/src/Modules/Routing/Route.php
rename to packages/framework/src/Models/Route.php
index c45d5a7b832..26a1ae3efac 100644
--- a/packages/framework/src/Modules/Routing/Route.php
+++ b/packages/framework/src/Models/Route.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Hyde\Framework\Modules\Routing;
+namespace Hyde\Framework\Models;
 
 use Hyde\Framework\Contracts\PageContract;
 use Hyde\Framework\Contracts\RouteContract;
 use Hyde\Framework\Contracts\RouteFacadeContract;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Hyde;
+use Hyde\Framework\Modules\Routing\Router;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Modules/Routing/Router.php b/packages/framework/src/Modules/Routing/Router.php
index 9d4da5567dc..f34d6954b13 100644
--- a/packages/framework/src/Modules/Routing/Router.php
+++ b/packages/framework/src/Modules/Routing/Router.php
@@ -10,6 +10,7 @@
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Framework\Models\Route;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Services/RebuildService.php b/packages/framework/src/Services/RebuildService.php
index 0dd30c34287..4d7d350ff21 100644
--- a/packages/framework/src/Services/RebuildService.php
+++ b/packages/framework/src/Services/RebuildService.php
@@ -2,7 +2,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Modules\Routing\Route;
+use Hyde\Framework\Models\Route;
 use Hyde\Framework\StaticPageBuilder;
 
 /**
diff --git a/packages/framework/tests/Feature/AbstractPageTest.php b/packages/framework/tests/Feature/AbstractPageTest.php
index 804f25daf2b..f8cdb4ffae2 100644
--- a/packages/framework/tests/Feature/AbstractPageTest.php
+++ b/packages/framework/tests/Feature/AbstractPageTest.php
@@ -14,7 +14,7 @@
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Parsers\MarkdownPageParser;
 use Hyde\Framework\Models\Parsers\MarkdownPostParser;
-use Hyde\Framework\Modules\Routing\Route;
+use Hyde\Framework\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1b6235951e3..331ba0f9042 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -5,7 +5,7 @@
 use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\NavigationMenu;
 use Hyde\Framework\Models\NavItem;
-use Hyde\Framework\Modules\Routing\Route;
+use Hyde\Framework\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteFacadeTest.php b/packages/framework/tests/Feature/RouteFacadeTest.php
index 53d60699325..71fd2fd02c1 100644
--- a/packages/framework/tests/Feature/RouteFacadeTest.php
+++ b/packages/framework/tests/Feature/RouteFacadeTest.php
@@ -4,7 +4,7 @@
 
 use Hyde\Framework\Facades\Route;
 use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Modules\Routing\Route as BaseRoute;
+use Hyde\Framework\Models\Route as BaseRoute;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index da682357fde..dbc44a43a02 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -9,12 +9,12 @@
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
-use Hyde\Framework\Modules\Routing\Route;
+use Hyde\Framework\Models\Route;
 use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Modules\Routing\Route
+ * @covers \Hyde\Framework\Models\Route
  */
 class RouteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index 26d51aa5492..a7be27ffe5e 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -9,7 +9,7 @@
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
-use Hyde\Framework\Modules\Routing\Route;
+use Hyde\Framework\Models\Route;
 use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;

From 68237027c62ed5ef4098e5493188bdc21f12a6d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:41:02 +0200
Subject: [PATCH 7/8] Move Router into Services namespace

---
 .../framework/src/Models/NavigationMenu.php    |  2 +-
 packages/framework/src/Models/Route.php        |  2 +-
 .../framework/src/Services/BuildService.php    |  1 -
 .../{Modules/Routing => Services}/Router.php   |  2 +-
 packages/framework/tests/Feature/RouteTest.php |  2 +-
 .../framework/tests/Feature/RouterTest.php     | 18 +++++++++---------
 6 files changed, 13 insertions(+), 14 deletions(-)
 rename packages/framework/src/{Modules/Routing => Services}/Router.php (98%)

diff --git a/packages/framework/src/Models/NavigationMenu.php b/packages/framework/src/Models/NavigationMenu.php
index 8f37feac0c8..b965aa52c36 100644
--- a/packages/framework/src/Models/NavigationMenu.php
+++ b/packages/framework/src/Models/NavigationMenu.php
@@ -3,7 +3,7 @@
 namespace Hyde\Framework\Models;
 
 use Hyde\Framework\Contracts\RouteContract;
-use Hyde\Framework\Modules\Routing\Router;
+use Hyde\Framework\Services\Router;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Models/Route.php b/packages/framework/src/Models/Route.php
index 26a1ae3efac..4fba0b1511f 100644
--- a/packages/framework/src/Models/Route.php
+++ b/packages/framework/src/Models/Route.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Contracts\RouteFacadeContract;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Hyde;
-use Hyde\Framework\Modules\Routing\Router;
+use Hyde\Framework\Services\Router;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Services/BuildService.php b/packages/framework/src/Services/BuildService.php
index 0efbac63e01..937e136f334 100644
--- a/packages/framework/src/Services/BuildService.php
+++ b/packages/framework/src/Services/BuildService.php
@@ -5,7 +5,6 @@
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Contracts\RouteContract as Route;
 use Hyde\Framework\Hyde;
-use Hyde\Framework\Modules\Routing\Router;
 use Hyde\Framework\StaticPageBuilder;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
diff --git a/packages/framework/src/Modules/Routing/Router.php b/packages/framework/src/Services/Router.php
similarity index 98%
rename from packages/framework/src/Modules/Routing/Router.php
rename to packages/framework/src/Services/Router.php
index f34d6954b13..d9a4b069c98 100644
--- a/packages/framework/src/Modules/Routing/Router.php
+++ b/packages/framework/src/Services/Router.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hyde\Framework\Modules\Routing;
+namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Contracts\PageContract;
 use Hyde\Framework\Contracts\RouteContract;
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index dbc44a43a02..d90cde32ff2 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -10,7 +10,7 @@
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Route;
-use Hyde\Framework\Modules\Routing\Router;
+use Hyde\Framework\Services\Router;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index a7be27ffe5e..d96f3fff7de 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -10,17 +10,17 @@
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Route;
-use Hyde\Framework\Modules\Routing\Router;
+use Hyde\Framework\Services\Router;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Modules\Routing\Router
+ * @covers \Hyde\Framework\Services\Router
  */
 class RouterTest extends TestCase
 {
     /**
-     * @covers \Hyde\Framework\Modules\Routing\Router::getInstance
+     * @covers \Hyde\Framework\Services\Router::getInstance
      */
     public function test_get_instance_returns_the_router_instance()
     {
@@ -31,8 +31,8 @@ public function test_get_instance_returns_the_router_instance()
     /**
      * Test route autodiscovery.
      *
-     * @covers \Hyde\Framework\Modules\Routing\Router::__construct
-     * @covers \Hyde\Framework\Modules\Routing\Router::getRoutes
+     * @covers \Hyde\Framework\Services\Router::__construct
+     * @covers \Hyde\Framework\Services\Router::getRoutes
      */
     public function test_get_routes_returns_discovered_routes()
     {
@@ -47,7 +47,7 @@ public function test_get_routes_returns_discovered_routes()
     }
 
     /**
-     * @covers \Hyde\Framework\Modules\Routing\Router::getRoutesForModel
+     * @covers \Hyde\Framework\Services\Router::getRoutesForModel
      */
     public function test_get_routes_for_model_returns_only_routes_for_the_given_model()
     {
@@ -65,9 +65,9 @@ public function test_get_routes_for_model_returns_only_routes_for_the_given_mode
     /**
      * Test route autodiscovery.
      *
-     * @covers \Hyde\Framework\Modules\Routing\Router::discover
-     * @covers \Hyde\Framework\Modules\Routing\Router::discoverRoutes
-     * @covers \Hyde\Framework\Modules\Routing\Router::discoverPageRoutes
+     * @covers \Hyde\Framework\Services\Router::discover
+     * @covers \Hyde\Framework\Services\Router::discoverRoutes
+     * @covers \Hyde\Framework\Services\Router::discoverPageRoutes
      */
     public function test_discover_routes_finds_and_adds_all_pages_to_route_collection()
     {

From bbe76ccaf9847aa8aebcf0e6e55fd4d1f260e5d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Jul 2022 20:42:27 +0200
Subject: [PATCH 8/8] Move Router into root namespace

---
 .../framework/src/Models/NavigationMenu.php    |  2 +-
 packages/framework/src/Models/Route.php        |  2 +-
 .../framework/src/{Services => }/Router.php    |  2 +-
 .../framework/src/Services/BuildService.php    |  1 +
 packages/framework/tests/Feature/RouteTest.php |  2 +-
 .../framework/tests/Feature/RouterTest.php     | 18 +++++++++---------
 6 files changed, 14 insertions(+), 13 deletions(-)
 rename packages/framework/src/{Services => }/Router.php (99%)

diff --git a/packages/framework/src/Models/NavigationMenu.php b/packages/framework/src/Models/NavigationMenu.php
index b965aa52c36..9bfeb82e50d 100644
--- a/packages/framework/src/Models/NavigationMenu.php
+++ b/packages/framework/src/Models/NavigationMenu.php
@@ -3,7 +3,7 @@
 namespace Hyde\Framework\Models;
 
 use Hyde\Framework\Contracts\RouteContract;
-use Hyde\Framework\Services\Router;
+use Hyde\Framework\Router;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Models/Route.php b/packages/framework/src/Models/Route.php
index 4fba0b1511f..ab9d1203a89 100644
--- a/packages/framework/src/Models/Route.php
+++ b/packages/framework/src/Models/Route.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Contracts\RouteFacadeContract;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Hyde;
-use Hyde\Framework\Services\Router;
+use Hyde\Framework\Router;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Services/Router.php b/packages/framework/src/Router.php
similarity index 99%
rename from packages/framework/src/Services/Router.php
rename to packages/framework/src/Router.php
index d9a4b069c98..7c7f3c1dbb4 100644
--- a/packages/framework/src/Services/Router.php
+++ b/packages/framework/src/Router.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Hyde\Framework\Services;
+namespace Hyde\Framework;
 
 use Hyde\Framework\Contracts\PageContract;
 use Hyde\Framework\Contracts\RouteContract;
diff --git a/packages/framework/src/Services/BuildService.php b/packages/framework/src/Services/BuildService.php
index 937e136f334..03153d12964 100644
--- a/packages/framework/src/Services/BuildService.php
+++ b/packages/framework/src/Services/BuildService.php
@@ -5,6 +5,7 @@
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Contracts\RouteContract as Route;
 use Hyde\Framework\Hyde;
+use Hyde\Framework\Router;
 use Hyde\Framework\StaticPageBuilder;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index d90cde32ff2..04564c68823 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -10,7 +10,7 @@
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Route;
-use Hyde\Framework\Services\Router;
+use Hyde\Framework\Router;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index d96f3fff7de..eb02900c6ec 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -10,17 +10,17 @@
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Route;
-use Hyde\Framework\Services\Router;
+use Hyde\Framework\Router;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Services\Router
+ * @covers \Hyde\Framework\Router
  */
 class RouterTest extends TestCase
 {
     /**
-     * @covers \Hyde\Framework\Services\Router::getInstance
+     * @covers \Hyde\Framework\Router::getInstance
      */
     public function test_get_instance_returns_the_router_instance()
     {
@@ -31,8 +31,8 @@ public function test_get_instance_returns_the_router_instance()
     /**
      * Test route autodiscovery.
      *
-     * @covers \Hyde\Framework\Services\Router::__construct
-     * @covers \Hyde\Framework\Services\Router::getRoutes
+     * @covers \Hyde\Framework\Router::__construct
+     * @covers \Hyde\Framework\Router::getRoutes
      */
     public function test_get_routes_returns_discovered_routes()
     {
@@ -47,7 +47,7 @@ public function test_get_routes_returns_discovered_routes()
     }
 
     /**
-     * @covers \Hyde\Framework\Services\Router::getRoutesForModel
+     * @covers \Hyde\Framework\Router::getRoutesForModel
      */
     public function test_get_routes_for_model_returns_only_routes_for_the_given_model()
     {
@@ -65,9 +65,9 @@ public function test_get_routes_for_model_returns_only_routes_for_the_given_mode
     /**
      * Test route autodiscovery.
      *
-     * @covers \Hyde\Framework\Services\Router::discover
-     * @covers \Hyde\Framework\Services\Router::discoverRoutes
-     * @covers \Hyde\Framework\Services\Router::discoverPageRoutes
+     * @covers \Hyde\Framework\Router::discover
+     * @covers \Hyde\Framework\Router::discoverRoutes
+     * @covers \Hyde\Framework\Router::discoverPageRoutes
      */
     public function test_discover_routes_finds_and_adds_all_pages_to_route_collection()
     {