Use PSR 4

app/controllers/Home.php → app/Controllers/HomeController.php

@@ -9,6 +9,10 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace App\Controllers;
+
+use System\Classes\Controller;
+
 class HomeController extends Controller
 {
     public function index()

app/controllers/User.php → app/Controllers/UserController.php

@@ -9,16 +9,25 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace App\Controllers;
+
+use App\Libraries\UserLibrary;
+use App\Models\User;
+use System\Classes\Captcha;
+use System\Classes\Container;
+use System\Classes\Controller;
+
 class UserController extends Controller
 {
-    private UserModel $userModel;
+    private User $userModel;
     private UserLibrary $userLibrary;
 
     function __construct()
     {
         parent::__construct();
-        $this->userModel = $this->load->model('User');
-        $this->userLibrary = $this->load->library('User');
+
+        $this->userModel = new User;
+        $this->userLibrary = new UserLibrary;
     }
 
     public function logout()

app/libraries/User.php → app/Libraries/UserLibrary.php

@@ -9,6 +9,8 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace App\Libraries;
+
 class UserLibrary
 {
     public function validateEmail($email)

app/models/User.php → app/Models/User.php

@@ -9,7 +9,11 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
-class UserModel extends Model
+namespace App\Models;
+
+use System\Classes\Model;
+
+class User extends Model
 {
     public function logout()
     {

app/Providers/RouteServiceProvider.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Providers;
+
+use System\Classes\Container;
+use System\Classes\Router;
+use System\Interfaces\ServiceProviderInterface;
+
+class RouteServiceProvider implements ServiceProviderInterface
+{
+    protected $namespace = 'App\\Controllers\\';
+
+    public function register()
+    {
+        $router = Container::get(Router::class);
+        $router->setNamespace($this->namespace);
+
+        $this->loadRoutes();
+    }
+
+    protected function loadRoutes()
+    {
+        require_once ROOT . 'app' . DS . 'routes.php';
+    }
+}

app/routes.php

@@ -10,6 +10,12 @@
 */
 
 /** @var Router */
+
+use App\Controllers\HomeController;
+use System\Classes\Container;
+use System\Classes\Router;
+use System\Classes\Template;
+
 $router = Container::get(Router::class);
 
 $router->add('/', 'HomeController@index');

composer.json

@@ -1,13 +1,26 @@
 {
     "name": "buihanh2304/simple-php-mvc-framework",
     "description": "A simple PHP MVC Framework",
-    "keywords": ["php", "mvc", "framework"],
+    "keywords": [
+        "php",
+        "mvc",
+        "framework"
+    ],
     "license": "MIT",
     "config": {
         "sort-packages": true
     },
     "require": {
         "php": "^8.0",
         "league/plates": "3.*"
+    },
+    "autoload": {
+        "files": [
+            "system/functions.php"
+        ],
+        "psr-4": {
+            "App\\": "app/",
+            "System\\": "system/"
+        }
     }
 }

configs/autoload/services.php

@@ -9,7 +9,10 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+use App\Providers\RouteServiceProvider;
+use System\Providers\CaptchaServiceProvider;
+
 return [
-    RouteService::class,
-    CaptchaService::class,
+    RouteServiceProvider::class,
+    CaptchaServiceProvider::class,
 ];

public/index.php

@@ -9,6 +9,9 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+use System\Classes\Container;
+use System\Classes\Kernel;
+use System\Classes\Request;
 
 define('_MVC_START', microtime(true));
 

system/classes/Auth.php → system/Classes/Auth.php

@@ -9,6 +9,8 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Auth
 {
     public $id = 0;
@@ -32,6 +34,7 @@ class Auth
     public function __construct()
     {
         $this->db = Container::get(DB::class);
+
         $this->authorize();
     }
 

system/classes/Captcha.php → system/Classes/Captcha.php

@@ -9,6 +9,8 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Captcha
 {
     private $font = 'monofont.ttf';

system/classes/Config.php → system/Classes/Config.php

@@ -9,6 +9,8 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Config
 {
     private $configs;

system/classes/Container.php → system/Classes/Container.php

@@ -9,6 +9,8 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Container
 {
     private static $instances = [];

system/classes/Controller.php → system/Classes/Controller.php

@@ -9,17 +9,17 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Controller
 {
-    protected Loader $load;
     protected Auth $auth;
     protected Request $request;
     protected Config $config;
     protected Template $view;
 
     function __construct()
     {
-        $this->load = Container::get(Loader::class);
         $this->auth = Container::get(Auth::class);
         $this->request = Container::get(Request::class);
         $this->config = Container::get(Config::class);

system/classes/DB.php → system/Classes/DB.php

@@ -9,6 +9,11 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
+use PDO;
+use PDOException;
+
 class DB
 {
     public function __invoke()

system/classes/Kernel.php → system/Classes/Kernel.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace System\Classes;
+
 class Kernel
 {
     public function run(Request $request)
@@ -48,6 +50,7 @@ protected function matchRoute(Request $request, Router $router)
                 exit;
             }
         }
+
         /** @var Template */
         $view = Container::get(Template::class);
 

system/classes/Model.php → system/Classes/Model.php

@@ -9,16 +9,18 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
+use PDO;
+
 class Model
 {
-    protected Loader $load;
     protected PDO $db;
     protected Config $config;
 
     function __construct()
     {
         $this->db = Container::get(DB::class);
         $this->config = Container::get(Config::class);
-        $this->load = Container::get(Loader::class);
     }
 }

system/classes/Request.php → system/Classes/Request.php

@@ -9,6 +9,8 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Request
 {
     private $ip;

system/classes/Router.php → system/Classes/Router.php

@@ -9,12 +9,16 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
 class Router
 {
     private $basePath = '';
 
     private $routes = [];
 
+    protected $namespace;
+
     private $allowedMethods = [];
 
     private $patternMatchers = [
@@ -191,6 +195,15 @@ private function processHandler($handler)
             return $handler;
         }
 
+        if ($this->namespace) {
+            return $this->namespace . $handler;
+        }
+
         return $handler;
     }
+
+    public function setNamespace(string $namespace)
+    {
+        $this->namespace = $namespace;
+    }
 }

system/classes/Template.php → system/Classes/Template.php

@@ -9,9 +9,14 @@
 // docs: https://github.com/buihanh2304/simple-php-mvc-framework/wiki
 */
 
+namespace System\Classes;
+
+use League\Plates\Engine;
+use League\Plates\Extension\Asset;
+
 class Template
 {
-    private $plates;
+    private Engine $plates;
 
     private $global = [];
     private $data = [];
@@ -21,8 +26,8 @@ function __construct()
         /** @var Auth */
         $auth = Container::get(Auth::class);
 
-        $plates = new League\Plates\Engine(ROOT . 'templates');
-        $plates->loadExtension(new League\Plates\Extension\Asset(ROOT . 'public', true));
+        $plates = new Engine(ROOT . 'templates');
+        $plates->loadExtension(new Asset(ROOT . 'public', true));
         $plates->addData([
             'isLogin'            => $auth->isLogin,
             'user'               => $auth->user,
@@ -33,7 +38,7 @@ function __construct()
         $this->plates = $plates;
     }
 
-    public function getEngine()
+    public function getEngine(): Engine
     {
         return $this->plates;
     }

system/Interfaces/ServiceProviderInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace System\Interfaces;
+
+interface ServiceProviderInterface
+{
+    public function register();
+}

system/services/CaptchaService.php → system/Providers/CaptchaServiceProvider.php

@@ -1,6 +1,13 @@
 <?php
 
-class CaptchaService implements ServiceInterface
+namespace System\Providers;
+
+use System\Classes\Captcha;
+use System\Classes\Container;
+use System\Classes\Router;
+use System\Interfaces\ServiceProviderInterface;
+
+class CaptchaServiceProvider implements ServiceProviderInterface
 {
     public function register()
     {