From 860e81c6dad8cc49ebb9cbf505dbd6838ea9231c Mon Sep 17 00:00:00 2001
From: Hans Pagel <mail@hanspagel.com>
Date: Thu, 12 Sep 2024 16:53:56 +0200
Subject: [PATCH] refactor: use controller to respond with view

---
 composer.json                        | 10 +++++-----
 database/factories/ModelFactory.php  |  2 +-
 routes/web.php                       |  3 ++-
 src/Commands/ScalarCommand.php       |  2 +-
 src/Controllers/ScalarController.php | 13 +++++++++++++
 src/Facades/Scalar.php               |  6 +++---
 src/Scalar.php                       |  2 +-
 src/ScalarServiceProvider.php        |  8 ++------
 tests/Pest.php                       |  2 +-
 tests/TestCase.php                   |  4 ++--
 10 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 src/Controllers/ScalarController.php

diff --git a/composer.json b/composer.json
index 7d887fd..b485570 100644
--- a/composer.json
+++ b/composer.json
@@ -31,13 +31,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Scalar\\Scalar\\": "src/",
-            "Scalar\\Scalar\\Database\\Factories\\": "database/factories/"
+            "Scalar\\": "src/",
+            "Scalar\\Database\\Factories\\": "database/factories/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Scalar\\Scalar\\Tests\\": "tests/",
+            "Scalar\\Tests\\": "tests/",
             "Workbench\\App\\": "workbench/app/"
         }
     },
@@ -69,10 +69,10 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Scalar\\Scalar\\ScalarServiceProvider"
+                "Scalar\\ScalarServiceProvider"
             ],
             "aliases": {
-                "Scalar": "Scalar\\Scalar\\Facades\\Scalar"
+                "Scalar": "Scalar\\Facades\\Scalar"
             }
         }
     },
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 071babf..35b246c 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Scalar\Scalar\Database\Factories;
+namespace Scalar\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
diff --git a/routes/web.php b/routes/web.php
index 6db09e6..7a72d65 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,11 +1,12 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
+use Scalar\Controllers\ScalarController;
 
 Route::group([
     'domain' => config('scalar.domain', null),
     'prefix' => config('scalar.path'),
     'middleware' => config('scalar.middleware', 'web'),
 ], function () {
-    Route::view('/', 'scalar::reference');
+    Route::get('/', ScalarController::class);
 });
diff --git a/src/Commands/ScalarCommand.php b/src/Commands/ScalarCommand.php
index 155f227..bd2c542 100644
--- a/src/Commands/ScalarCommand.php
+++ b/src/Commands/ScalarCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Scalar\Scalar\Commands;
+namespace Scalar\Commands;
 
 use Illuminate\Console\Command;
 
diff --git a/src/Controllers/ScalarController.php b/src/Controllers/ScalarController.php
new file mode 100644
index 0000000..f47862b
--- /dev/null
+++ b/src/Controllers/ScalarController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Scalar\Controllers;
+
+use Illuminate\Routing\Controller;
+
+class ScalarController extends Controller
+{
+    public function __invoke()
+    {
+        return view('scalar::reference');
+    }
+}
diff --git a/src/Facades/Scalar.php b/src/Facades/Scalar.php
index c3c4c2f..131acd4 100644
--- a/src/Facades/Scalar.php
+++ b/src/Facades/Scalar.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Scalar\Scalar\Facades;
+namespace Scalar\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \Scalar\Scalar\Scalar
+ * @see \Scalar\Scalar
  */
 class Scalar extends Facade
 {
     protected static function getFacadeAccessor(): string
     {
-        return \Scalar\Scalar\Scalar::class;
+        return \Scalar\Scalar::class;
     }
 }
diff --git a/src/Scalar.php b/src/Scalar.php
index 71d21b1..c99a85e 100755
--- a/src/Scalar.php
+++ b/src/Scalar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Scalar\Scalar;
+namespace Scalar;
 
 class Scalar
 {
diff --git a/src/ScalarServiceProvider.php b/src/ScalarServiceProvider.php
index c7a7090..00c1d69 100644
--- a/src/ScalarServiceProvider.php
+++ b/src/ScalarServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Scalar\Scalar;
+namespace Scalar;
 
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -9,15 +9,11 @@ class ScalarServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
-        /*
-         * This class is a Package Service Provider
-         *
-         * More info: https://github.com/spatie/laravel-package-tools
-         */
         $package
             ->name('scalar')
             ->hasConfigFile()
             ->hasViews('scalar')
             ->hasRoute('web');
+
     }
 }
diff --git a/tests/Pest.php b/tests/Pest.php
index c6275d6..c387027 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -1,5 +1,5 @@
 <?php
 
-use Scalar\Scalar\Tests\TestCase;
+use Scalar\Tests\TestCase;
 
 uses(TestCase::class)->in(__DIR__);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index fe77f9e..10a2c95 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Scalar\Scalar\Tests;
+namespace Scalar\Tests;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
-use Scalar\Scalar\ScalarServiceProvider;
+use Scalar\ScalarServiceProvider;
 
 class TestCase extends Orchestra
 {