work!

Author: Yusfuu

config/Database.php renamed to app/Config/Database.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\config;
+namespace App\Config;
 
 use PDO;
 
@@ -13,6 +13,7 @@ class Database
    *
    * @return \PDO
    */
+
   public static function connect()
   {
     if (is_null(self::$dbh)) {

app/Controllers/UserController.php

@@ -4,19 +4,18 @@
 
 use App\Http\Request;
 use App\Http\Response;
-use App\Models\Users;
 
 class UserController extends Controller
 {
+
   /**
    * Display a listing of the resource.
    *
    * @return \Http\Request
    */
   public function index(Request $request)
   {
-    $users = Users::all();
-    Response::json($users);
+    //
   }
 
   /**
@@ -26,7 +25,7 @@ public function index(Request $request)
    */
   public function store(Request $request)
   {
-    Users::create($request->json());
+    //
   }
 
   /**
@@ -36,8 +35,7 @@ public function store(Request $request)
    */
   public function show(Request $request)
   {
-    $user = Users::find($request->params->id);
-    Response::json($user);
+    //
   }
 
   /**
@@ -47,7 +45,7 @@ public function show(Request $request)
    */
   public function update(Request $request)
   {
-    Users::update($request->input(), $request->params->id);
+    //
   }
 
   /**
@@ -57,6 +55,6 @@ public function update(Request $request)
    */
   public function destroy(Request $request)
   {
-    Users::delete($request->params->id);
+    //
   }
 }

app/Http/Request.php

@@ -12,33 +12,30 @@ class Request
 
   public function __construct($args)
   {
+    $this->method = $args->method;
     $this->params = $args->params;
     $this->query = $args->query;
+    $this->url = $args->url;
+    $this->path = $args->path;
     $this->contentType = $_SERVER["CONTENT_TYPE"] ?? null;
-    $this->method = $_SERVER["REQUEST_METHOD"] ?? null;
-    $this->path = $_SERVER["REQUEST_URI"] ?? null;
     $this->authorization = $_SERVER["HTTP_AUTHORIZATION"] ?? null;
   }
 
   public function json()
   {
     if ($this->method !== "POST" || $this->contentType !== "application/json") {
-      return [];
+      return null;
     }
-    $json = json_decode(trim(file_get_contents("php://input")));
 
-    return json_last_error() === JSON_ERROR_NONE ? $json : [];
+    $value = json_decode(file_get_contents("php://input"));
+
+    return json_last_error() === JSON_ERROR_NONE ? $value : null;
   }
 
-  public function input()
+  public function form()
   {
-    if ($this->method === "PUT") {
-      parse_str(file_get_contents("php://input"), $body);
-      return (object)$body;
-    }
-
     if ($this->method !== "POST") {
-      return [];
+      return null;
     }
 
     $body = [];

app/Routing/Route.php

@@ -24,11 +24,11 @@ class Route extends RouteCollector
   protected $currentRoute = null;
 
   /**
-   * The query names for the route.
-   *
-   * @var string[]
+   * The args names for the route.
+   * 
+   * @var object
    */
-  private  $query = [];
+  protected $args;
 
   /**
    * All of the verbs supported by the router.
@@ -39,18 +39,15 @@ class Route extends RouteCollector
 
   public function __construct()
   {
-    $this->req = $this->request();
-    $this->method = $this->req->method;
-    $this->path = $this->req->path;
-    $this->query = $this->req->query;
+    $this->args = $this->request_url();
   }
 
   public function call()
   {
-    $routes = $this->filter_routes_by_method(self::$routes, $this->method);
+    $routes = $this->filter_routes_by_method(self::$routes, $this->args->method);
 
     foreach ($routes as $value) {
-      if ($this->matches($value["uri"], $this->path)) {
+      if ($this->matches($value["uri"], $this->args->path)) {
         $this->currentRoute = (object) $value;
         break 1;
       }
@@ -59,13 +56,8 @@ public function call()
     if (!$this->currentRoute) {
       return Response::json(HttpException::HttpNotFoundException());
     }
-
-    $args = (object)[
-      "params" => $this->params,
-      "query" => (object) $this->query
-    ];
-
-    return call_user_func($this->currentRoute->callback, (new Request($args)));
+    $this->args->params = $this->params;
+    return call_user_func($this->currentRoute->callback, (new Request($this->args)));
   }
 
   /**
@@ -106,7 +98,7 @@ private function matches(string $uri, string $path)
     return false;
   }
 
-  private function request()
+  private function request_url()
   {
     $httpMethod = $_SERVER["REQUEST_METHOD"] ?? null;
 
@@ -120,12 +112,12 @@ private function request()
       return Response::json(HttpException::HttpBadRequestException());
     }
 
-    parse_str($_SERVER["QUERY_STRING"], $qs);
+    parse_str($_SERVER["QUERY_STRING"] ?? "", $qs);
 
-    return ((object) array_merge(parse_url($URL), [
+    return (object) array_merge(parse_url($URL), [
+      "url" => $URL,
       "method" => $httpMethod,
       "query" => (object)$qs,
-      "contentType" => ($_SERVER["CONTENT_TYPE"]) ?? null
-    ]));
+    ]);
   }
 }

app/Routing/RouteCollector.php

@@ -2,7 +2,6 @@
 
 namespace App\Routing;
 
-
 class RouteCollector
 {
 

public/index.php

@@ -3,8 +3,6 @@
 use App\Application;
 use App\Routing\Route;
 use App\Controllers\UserController;
-use App\Http\Request;
-use App\Http\Response;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -28,10 +26,4 @@
 Route::put('/users/{id}', [UserController::class, 'update']);
 Route::delete('/users/{id}', [UserController::class, 'destroy']);
 
-Route::get('/{username}', function (Request $request) {
-  Response::json($request);
-  echo "👋👋 " . $request->params->username . " i 🧡 " . $request->query->city;
-});
-
-
 $app->run();