refactoring

Author: arojunior

README.md

@@ -1,6 +1,6 @@
 # PHP ORM PDO Micro Framework
 
-*I had to make a simple application but I didnt find good options of simple ORM for PHP, that's why I made this basic classes.* Ps.: It's under development yet.
+*I had to make a simple application but I didnt find good options of simple ORM for PHP, that's why I made this basic classes.* Ps.: It's under development.
 
 Let's get started:
 

app/controller/UsersController.php

@@ -16,6 +16,6 @@ public function get()
     {
         $result = $this->Users->find();
 
-        return ['list' => $this->Helper->json($result)];
+        return ['list' => $this->Helper->toJson($result)];
     }
 }

app/model/AppModel.php

@@ -20,6 +20,6 @@ public function where($dados = null)
             return (count($where) > 1) ? implode(' AND ', $where) : ' AND '.$where[0];
         }
 
-        return null;
+        return $dados;
     }
 }

app/model/Users.php

@@ -6,6 +6,6 @@
 
 class Users extends AppModel
 {
-    protected $table = 't_user';
-    protected $pk = 'user_id';
+    protected $table    = 't_user';
+    protected $pk       = 'user_id';
 }

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "arojunior/php-orm-pdo",
     "license": "MIT",
-    "description": "Micro PHP ORM Framework to solve basic problems",
+    "description": "Micro PHP ORM Framework",
     "version": "1.0",
     "authors": [
         {

core/controller/Controller.php

@@ -13,16 +13,20 @@ class Controller
     */
     public function __construct()
     {
-        $namespace = 'SimpleORM\app\controller\\';
-        $class = str_replace($namespace, '', get_class($this));
-        $this->class = str_replace('Controller', '', $class);
-
         $this->Helper = new Helper();
 
+        self::setClass();
         self::loadModels();
         self::loadHelpers();
     }
 
+    private function setClass()
+    {
+        $namespace = 'SimpleORM\app\controller\\';
+        $class = str_replace($namespace, '', get_class($this));
+        $this->class = str_replace('Controller', '', $class);
+    }
+
     /*
     * create instances of models with different names when set $this->use = []
     */

core/helper/Helper.php

@@ -3,15 +3,17 @@
 
 class Helper
 {
-    public function json($dados)
+    public function toJson($dados, $charset = 'UTF-8')
     {
         header('Content-Type: application/json');
 
-        array_walk_recursive($dados, function (&$value, $key) {
-            if (is_string($value)) {
-                $value = utf8_encode(self::clean($value));
-            }
-        });
+        if ($charset <> 'UFT-8') {
+            array_walk_recursive($dados, function (&$value, $key) {
+                if (is_string($value)) {
+                    $value = utf8_encode(self::clean($value));
+                }
+            });
+        }
 
         return json_encode($dados);
     }

core/model/Database.php

@@ -4,8 +4,8 @@
 
 class Database
 {
-    protected $conn;
-    public $db_config;
+    protected   $conn;
+    public      $db_config;
 
     /*
     * create database connection

core/model/Model.php

@@ -12,7 +12,7 @@ class Model extends Database
     private $stmt;
     private $dados;
     private $sql;
-    public $count;
+    public  $count;
 
     private function param($dados = null)
     {

index.php

@@ -25,64 +25,62 @@
 if ($uri == '/') {
     $response = ['response' => 'No content to show'];
     echo json_encode($response);
-} else {
-    $src = explode('/', $uri);
-    $model = ucfirst($src[1]);
-    $controller = $model.'Controller';
-    $method = (isset($src[2])) ? $src[2] : 'index';
-
-    if (isset($src[3]) && empty($the_request)) {
-        $the_request = filter_var($src[3], FILTER_SANITIZE_STRING);
-    }
+    exit;
+}
 
-    /*
-    * AppModel file
-    */
-    $app_model =  APP . 'model' . DS .'AppModel.php';
+$src = explode('/', $uri);
+$model = ucfirst($src[1]);
+$controller = $model.'Controller';
+$method = (isset($src[2])) ? $src[2] : 'index';
 
-    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';
+if (isset($src[3]) && empty($the_request)) {
+    $the_request = filter_var($src[3], FILTER_SANITIZE_STRING);
+}
 
-    if (file_exists($controller_file)) {
+/*
+* AppModel file
+*/
+$app_model =  APP . 'model' . DS .'AppModel.php';
 
-        require $controller_file;
+if (file_exists($app_model)) {
+    require_once $app_model;
+}
+/*
+* require files of current Model/Controller
+*/
+$model_file = APP . 'model ' . DS . $model.'.php';
 
-        $load_class = 'SimpleORM\app\controller\\' . $controller;
-        $class = new $load_class();
-        $set = $class->$method($the_request);
+if (file_exists($model_file)) {
+    require_once $model_file;
+}
+/*
+* call current class/method
+*/
+$controller_file = APP . 'controller' . DS . $controller.'.php';
 
-    } else {
-        throw new Exception('Controller '.$controller.' Not Found');
-    }
+if (!file_exists($controller_file)) {
+    throw new Exception('Controller '.$controller.' Not Found');
+}
 
-    /*
-    * Declare all variables if passed in return
-    */
-    if (!empty($set) && is_array($set)) {
-        foreach ($set as $k => $v) {
-            ${$k} = $v;
-        }
+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
+*/
+if (!empty($set) && is_array($set)) {
+    foreach ($set as $k => $v) {
+        ${$k} = $v;
     }
+}
 
-    /*
-    * If method has a view file, include
-    */
-    $view_file = __DIR__ . DS . 'app' . DS . 'view' . DS . $model . DS . $method .'.php';
+/*
+* If method has a view file, include
+*/
+$view_file = __DIR__ . DS . 'app' . DS . 'view' . DS . $model . DS . $method .'.php';
 
-    if (file_exists($view_file)) {
-        include $view_file;
-    }
+if (file_exists($view_file)) {
+    include $view_file;
 }