PSR-4 added and refactoring

Author: arojunior

.gitignore

@@ -1,3 +1,4 @@
+/vendor
 config.ini
 .DS_Store
 .idea

composer.json

@@ -9,7 +9,12 @@
             "email": "arojunior@gmail.com"
         }
     ],
+    "autoload": {
+        "psr-4": {
+            "SimpleORM\\": ""
+        }
+    },
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.6.0"
     }
 }

composer.lock

@@ -0,0 +1,13 @@
+<?php
+
+const DS    = DIRECTORY_SEPARATOR;
+const APP   = __DIR__ . DS . 'app' . DS;
+const CORE  = __DIR__ . DS . 'core' . DS;
+const PHP   = '.php';
+
+const APP_MODEL         = APP . 'model' . DS;
+const APP_VIEW          = APP . 'view' . DS;
+const APP_CONTROLLER    = APP . 'controller' . DS;
+
+const CORE_MODEL        = CORE . 'model' . DS . 'Model.php';
+const CORE_CONTROLLER   = CORE . 'controller' . DS . 'Controller.php';

constants.php

@@ -2,7 +2,6 @@
 
 namespace SimpleORM\core\controller;
 
-require CORE . 'helper' . DS . 'Helper.php';
 use SimpleORM\core\helper\Helper;
 
 class Controller
@@ -52,7 +51,6 @@ private function loadHelpers()
 
     private function load($path, $class)
     {
-        require APP . $path . DS . $class . '.php';
         $load_class = 'SimpleORM\app\\' . $path . '\\' . $class;
         $this->{$class} = new $load_class();
     }

core/controller/Controller.php

@@ -2,8 +2,6 @@
 
 namespace SimpleORM\core\model;
 
-require_once 'Database.php';
-
 use SimpleORM\core\model\Database;
 use \PDO;
 

core/model/Model.php

@@ -3,12 +3,12 @@
 header('Access-Control-Allow-Origin: *');
 header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept');
 
-define('DS', DIRECTORY_SEPARATOR);
-define('APP', __DIR__ . DS . 'app' . DS);
-define('CORE', __DIR__ . DS . 'core' . DS);
+require 'constants.php';
+require __DIR__ . '/vendor/autoload.php';
+
+require_once CORE_MODEL;
+require_once CORE_CONTROLLER;
 
-require_once CORE . 'model' . DS . 'Model.php';
-require_once CORE . 'controller' . DS . 'Controller.php';
 use SimpleORM\app\controller;
 
 $uri = $_SERVER['REQUEST_URI'];
@@ -28,45 +28,28 @@
     exit;
 }
 
-$src = explode('/', $uri);
-$model = ucfirst($src[1]);
+$src        = explode('/', $uri);
+$model      = ucfirst($src[1]);
 $controller = $model.'Controller';
-$method = (isset($src[2])) ? $src[2] : 'index';
+$method     = (isset($src[2])) ? $src[2] : 'index';
 
 if (isset($src[3]) && empty($the_request)) {
     $the_request = filter_var($src[3], FILTER_SANITIZE_STRING);
 }
 
-/*
-* AppModel file
-*/
-$app_model =  APP . 'model' . DS .'AppModel.php';
-
-if (file_exists($app_model)) {
-    require_once $app_model;
-}
-/*
-* require files of current Model/Controller
-*/
-$model_file = APP . 'model ' . DS . $model.'.php';
-
-if (file_exists($model_file)) {
-    require_once $model_file;
-}
 /*
 * call current class/method
 */
-$controller_file = APP . 'controller' . DS . $controller.'.php';
+$controller_file = APP_CONTROLLER . $controller . PHP;
 
-if (!file_exists($controller_file)) {
-    throw new Exception('Controller '.$controller.' Not Found');
+try {
+    require $controller_file;
+    $load_class = 'SimpleORM\app\controller\\' . $controller;
+    $class      = new $load_class();
+    $set        = $class->$method($the_request);
+} catch(Exception $e) {
+    echo 'No '.$controller.' found for this route',  $e->getMessage(), "\n";
 }
-
-require $controller_file;
-$load_class = 'SimpleORM\app\controller\\' . $controller;
-$class = new $load_class();
-$set = $class->$method($the_request);
-
 /*
 * Declare all variables if passed in return
 */
@@ -79,7 +62,7 @@
 /*
 * If method has a view file, include
 */
-$view_file = __DIR__ . DS . 'app' . DS . 'view' . DS . $model . DS . $method .'.php';
+$view_file = APP_VIEW . $model . DS . $method . PHP;
 
 if (file_exists($view_file)) {
     include $view_file;