From 591e0c194ddd85932356c0cae4d43fb01756f8c3 Mon Sep 17 00:00:00 2001
From: Maarten <maarten@suiteseven.nl>
Date: Tue, 26 Nov 2024 14:22:04 +0100
Subject: [PATCH] Refactor classes into Http structure

---
 app/Controllers/Api/SubnetController.php           |  6 +++---
 app/Controllers/HomeController.php                 |  6 +++---
 app/Controllers/TestController.php                 |  6 +++---
 src/{ => Http}/Controllers/Controller.php          |  2 +-
 src/Http/Response.php                              | 14 +++++++-------
 .../View/Engine/HtmlEngine.php}                    |  6 +++---
 .../View/Engine/JsonEngine.php}                    |  6 +++---
 src/{ => Http}/View/Render.php                     |  2 +-
 src/Routing/RouteDispatcher.php                    |  2 +-
 9 files changed, 25 insertions(+), 25 deletions(-)
 rename src/{ => Http}/Controllers/Controller.php (93%)
 rename src/{View/Render/HtmlRender.php => Http/View/Engine/HtmlEngine.php} (82%)
 rename src/{View/Render/JsonRender.php => Http/View/Engine/JsonEngine.php} (70%)
 rename src/{ => Http}/View/Render.php (97%)

diff --git a/app/Controllers/Api/SubnetController.php b/app/Controllers/Api/SubnetController.php
index 1c0abca..384e4a5 100644
--- a/app/Controllers/Api/SubnetController.php
+++ b/app/Controllers/Api/SubnetController.php
@@ -3,8 +3,8 @@
 namespace App\Controllers\Api;
 
 use App\Services\Subnet;
-use Core\Controllers\Controller;
-use Core\View\Render;
+use Core\Http\Controllers\Controller;
+use Core\Http\View\Engine;
 use Exception;
 
 class SubnetController extends Controller
@@ -12,7 +12,7 @@ class SubnetController extends Controller
     /**
      * Get all subnet data
      *
-     * @return \Core\View\Render
+     * @return \Core\Http\View\Render
      */
     public function data(): Render
     {
diff --git a/app/Controllers/HomeController.php b/app/Controllers/HomeController.php
index 3ea8195..f3d50e9 100644
--- a/app/Controllers/HomeController.php
+++ b/app/Controllers/HomeController.php
@@ -2,15 +2,15 @@
 
 namespace App\Controllers;
 
-use Core\Controllers\Controller;
-use Core\View\Render;
+use Core\Http\Controllers\Controller;
+use Core\Http\View\Engine;
 
 class HomeController extends Controller
 {
     /**
      * Render index
      *
-     * @return \Core\View\Render
+     * @return \Core\Http\View\Render
      */
     public function index(): Render
     {
diff --git a/app/Controllers/TestController.php b/app/Controllers/TestController.php
index 8a944a4..28bb40b 100644
--- a/app/Controllers/TestController.php
+++ b/app/Controllers/TestController.php
@@ -2,15 +2,15 @@
 
 namespace App\Controllers;
 
-use Core\Controllers\Controller;
-use Core\View\Render;
+use Core\Http\Controllers\Controller;
+use Core\Http\View\Engine;
 
 class TestController extends Controller
 {
     /**
      * Render index
      *
-     * @return \Core\View\Render
+     * @return \Core\Http\View\Render
      */
     public function test(int $id): Render
     {
diff --git a/src/Controllers/Controller.php b/src/Http/Controllers/Controller.php
similarity index 93%
rename from src/Controllers/Controller.php
rename to src/Http/Controllers/Controller.php
index e8f1cec..d428fcd 100644
--- a/src/Controllers/Controller.php
+++ b/src/Http/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\Controllers;
+namespace Core\Http\Controllers;
 
 use Core\Http\Request;
 use Core\Http\Response;
diff --git a/src/Http/Response.php b/src/Http/Response.php
index 99d4fcb..9050124 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -2,9 +2,9 @@
 
 namespace Core\Http;
 
-use Core\View\Render;
-use Core\View\Render\HtmlRender;
-use Core\View\Render\JsonRender;
+use Core\Http\View\Engine;
+use Core\Http\View\Engine\HtmlEngine;
+use Core\Http\View\Engine\JsonEngine;
 
 class Response
 {
@@ -25,20 +25,20 @@ class Response
      * Render HTML
      *
      * @param string $view
-     * @return \Core\View\Render
+     * @return \Core\Http\View\Render
      */
     public function view(string $view): Render
     {
-        return (new HtmlRender())->view($view);
+        return (new HtmlEngine())->view($view);
     }
 
     /**
      * Render JSON
      *
-     * @return \Core\View\Render
+     * @return \Core\Http\View\Render
      */
     public function json(): Render
     {
-        return new JsonRender();
+        return new JsonEngine();
     }
 }
\ No newline at end of file
diff --git a/src/View/Render/HtmlRender.php b/src/Http/View/Engine/HtmlEngine.php
similarity index 82%
rename from src/View/Render/HtmlRender.php
rename to src/Http/View/Engine/HtmlEngine.php
index 2c9224d..3e000a3 100644
--- a/src/View/Render/HtmlRender.php
+++ b/src/Http/View/Engine/HtmlEngine.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Core\View\Render;
+namespace Core\Http\View\Engine;
 
-use Core\View\Render;
+use Core\Http\View\Engine;
 
-class HtmlRender extends Render
+class HtmlEngine extends Render
 {
     /**
      * @inheritDoc
diff --git a/src/View/Render/JsonRender.php b/src/Http/View/Engine/JsonEngine.php
similarity index 70%
rename from src/View/Render/JsonRender.php
rename to src/Http/View/Engine/JsonEngine.php
index 3dc68b5..a0455a2 100644
--- a/src/View/Render/JsonRender.php
+++ b/src/Http/View/Engine/JsonEngine.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Core\View\Render;
+namespace Core\Http\View\Engine;
 
-use Core\View\Render;
+use Core\Http\View\Engine;
 
-class JsonRender extends Render
+class JsonEngine extends Render
 {
     /**
      * @inheritDoc
diff --git a/src/View/Render.php b/src/Http/View/Render.php
similarity index 97%
rename from src/View/Render.php
rename to src/Http/View/Render.php
index fc1608a..bf61d90 100644
--- a/src/View/Render.php
+++ b/src/Http/View/Render.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Core\View;
+namespace Core\Http\View;
 
 abstract class Render
 {
diff --git a/src/Routing/RouteDispatcher.php b/src/Routing/RouteDispatcher.php
index 5ced2a4..9106021 100644
--- a/src/Routing/RouteDispatcher.php
+++ b/src/Routing/RouteDispatcher.php
@@ -5,7 +5,7 @@ namespace Core\Routing;
 use Core\Exceptions\ExceptionHandler;
 use Core\Exceptions\Exceptions\NotFoundHttpException;
 use Core\Http\Request;
-use Core\View\Render;
+use Core\Http\View\Engine;
 use Exception;
 
 class RouteDispatcher