namespace fixes

Author: arojunior

app/controller/UsuariosController.php

@@ -1,22 +1,21 @@
 <?php
 
+namespace SimpleORM\app\controller;
+
+use SimpleORM\core\controller\Controller;
+
 class UsuariosController extends Controller
 {
-    public function login($dados)
+
+    public function index()
     {
-        if (!empty($dados)) {
-            $dados['nome'] = utf8_decode($dados['nome']);
-            $this->Usuarios->save($dados);
-        } else {
-            throw new Exception('Acesso indevido');
-        }
+        return ['texto'  => 'teste'];
     }
 
     public function listar()
     {
         $result = $this->Usuarios->find();
 
-        $helper = new Helper();
-        return ['listagem' => $helper->json($result)];
+        return ['listagem' => $this->Helper->json($result)];
     }
 }

app/model/AppModel.php

@@ -2,6 +2,9 @@
 
 namespace SimpleORM\app\model;
 
+require_once CORE . 'model' . DS . 'Model.php';
+use SimpleORM\core\model\Model;
+
 class AppModel extends Model
 {
     public function where($dados = null)

app/model/Usuarios.php

@@ -1,7 +1,12 @@
 <?php
 
-class Usuarios extends Model
+namespace SimpleORM\app\model;
+
+require_once APP . 'model' . DS .'AppModel.php';
+use SimpleORM\app\model\AppModel;
+
+class Usuarios extends AppModel
 {
-    protected $table = 'chat_usuarios';
+    protected $table = 'usuarios';
     //protected $pk = 'id';
 }

app/view/Usuarios/index.php

@@ -0,0 +1 @@
+<?php echo $texto;

core/controller/Controller.php

@@ -2,29 +2,54 @@
 
 namespace SimpleORM\core\controller;
 
+require CORE . 'helper' . DS . 'Helper.php';
+use SimpleORM\core\helper\Helper;
+
 class Controller
 {
+    private $class;
     /*
     * create instance of model with same controller name
     */
     public function __construct()
     {
-        $class = str_replace('Controller', '', get_class($this));
-        $this->{$class} = new $class();
+        $namespace = 'SimpleORM\app\controller\\';
+        $class = str_replace($namespace, '', get_class($this));
+        $this->class = str_replace('Controller', '', $class);
+
+        $this->Helper = new Helper();
 
         self::loadModels();
+        self::loadHelpers();
     }
 
     /*
     * create instances of models with different names when set $this->use = []
     */
     private function loadModels()
     {
-        if (isset($this->use)) {
+        $this->use = !isset($this->use) ? [$this->class] : $this->use;
+
+        if ($this->use) {
             foreach ($this->use as $model) {
-                require './app/model/'.$model.'.php';
-                $this->{$model} = new $model();
+                self::load('model', $model);
             }
         }
     }
+
+    private function loadHelpers()
+    {
+        if (isset($this->helpers)) {
+            foreach ($this->helpers as $helper) {
+                self::load('helper', $helper);
+            }
+        }
+    }
+
+    private function load($path, $class)
+    {
+        require APP . $path . DS . $class . '.php';
+        $load_class = 'SimpleORM\app\\' . $path . '\\' . $class;
+        $this->{$class} = new $load_class();
+    }
 }

core/model/Model.php

@@ -2,7 +2,10 @@
 
 namespace SimpleORM\core\model;
 
+require_once 'Database.php';
+
 use SimpleORM\core\model\Database;
+use \PDO;
 
 class Model extends Database
 {

index.php

@@ -4,11 +4,11 @@
 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);
 
-use SimpleORM\core\helper\Helper;
-use SimpleORM\core\model\Model;
-use SimpleORM\core\controller\Controller;
-use SimpleORM\core\model\AppModel;
+require_once CORE . 'controller' . DS . 'Controller.php';
+use SimpleORM\app\controller;
 
 $uri = $_SERVER['REQUEST_URI'];
 
@@ -28,7 +28,7 @@
     $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);
@@ -37,26 +37,29 @@
     /*
     * require files of current Model/Controller
     */
-    $model_file = __DIR__ . DS .'app' . DS. ' model ' . DS . $model.'.php';
+    $model_file = __DIR__ . DS . 'app' . DS. ' model ' . DS . $model.'.php';
 
     if (file_exists($model_file)) {
         require_once $model_file;
     }
 
-    $controller_file = __DIR__ . DS . 'app' . DS . 'controller' . DS . $controller.'.php';
+    /*
+    * call current class/method
+    */
+    $controller_file = APP . 'controller' . DS . $controller.'.php';
 
     if (file_exists($controller_file)) {
-        require_once $controller_file;
+
+        require $controller_file;
+
+        $load_class = 'SimpleORM\app\controller\\' . $controller;
+        $class = new $load_class();
+        $set = $class->$method($the_request);
+
     } else {
         throw new Exception('Controller '.$controller.' Not Found');
     }
 
-    /*
-    * call current class/method
-    */
-    $class = new $controller();
-    $set = $class->$method($the_request);
-
     /*
     * Declare all variables if passed in return
     */