Save services from app service provider

src/Application.php

@@ -73,15 +73,12 @@ public static function getInstance(?string $root_dir = null, bool $isConsole = f
     }
 
     /**
-     * Save all applications services (middlewares, consoles, etc)
+     * Save all applications services
      */
-    private function saveAppServices(array $services)
+    private function saveAppServices()
     {
 
-        foreach ($services as $service) {
-
-            (new $service)->register();
-        }
+        return (new \App\Providers\AppServiceProvider)->register();
     }
 
     public function services(): Container
@@ -98,9 +95,7 @@ public function run()
 
         require(__DIR__ . "/Helpers.php"); // load function helpers
 
-        $services = $this->getAllServices();
-
-        $this->saveAppServices($services);
+        $this->saveAppServices();
 
         // Collect GET, POST, PUT, PATCH, DELETE together
         $requestData = $this->collectRequestData();
@@ -125,20 +120,6 @@ private function dispatch(Request $request, Kernel $kernel)
     }
 
 
-    public function getAllServices(): array
-    {
-
-        $servicesKernelPath = core_services_path("Kernel.php");
-
-        $appServicesPath = app_services_path("Kernel.php");
-
-        $appServices = require($appServicesPath);
-
-        $servicesKernel = require($servicesKernelPath);
-
-        return [...$servicesKernel, ...$appServices];
-    }
-
     public static function getHttpKernel()
     {
         $appHttpKernel = app_http_path("Kernel.php");

src/Console/Kernel.php

@@ -7,7 +7,6 @@
     Floky\Console\Commands\MakeController::class,
     Floky\Console\Commands\MakeMiddleware::class,
     Floky\Console\Commands\MakeRequest::class,
-    Floky\Console\Commands\MakeService::class,
     Floky\Console\Commands\MakeCommand::class,
     Floky\Console\Commands\MakeResource::class,
     Floky\Console\Commands\MakeModel::class,

src/Console/Stubs/controller.make.stub

@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Floky\Http\Controllers\Controller;
-
 class {{name}} extends Controller
 {
 

src/Helpers.php

@@ -274,11 +274,11 @@ function app_resources_path(string $path = "")
     }
 }
 
-if (!function_exists('app_services_path')) {
-    function app_services_path(string $path = "")
+if (!function_exists('app_providers_path')) {
+    function app_providers_path(string $path = "")
     {
 
-        return app_path("Services/$path");
+        return app_path("Providers/$path");
     }
 }
 

src/Http/Requests/Request.php

@@ -14,8 +14,6 @@ class Request
 
     public static ?Request $instance = null;
 
-    public string $attr = "start"; /* Just for middlewares testing */
-
     public static array $data = [];
 
     public static function getInstance()

src/Services/ServiceProvider.php → src/Providers/ServiceProvider.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Floky\Services;
+namespace Floky\Providers;
 
-use Closure;
 use Floky\Application;
+use Floky\Http\Requests\Request;
 
 abstract class ServiceProvider
 {
@@ -13,6 +13,11 @@ abstract class ServiceProvider
     public function __construct()
     {
         $this->app = Application::getInstance();
+
+        $this->app->services()->set(Request::class, function() {
+
+            return Request::getInstance();
+        });
     }
 
     abstract public function register();