bug fixes

Author: arojunior

composer.json

@@ -0,0 +1,14 @@
+{
+    "name": "arojunior/php-orm-pdo",
+    "description": "Micro PHP ORM Framework to solve basic problems",
+    "version": "1.0",
+    "authors": [
+        {
+            "name": "Junior Oliveira",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0"
+    }
+}

core/controller/Controller.php

@@ -22,7 +22,7 @@ private function loadModels()
     {
         if (isset($this->use)) {
             foreach ($this->use as $model) {
-                require './model/'.$model.'.php';
+                require './app/model/'.$model.'.php';
                 $this->{$model} = new $model();
             }
         }

core/helper/Helper.php

@@ -9,14 +9,14 @@ public function json($dados)
 
         array_walk_recursive($dados, function (&$value, $key) {
             if (is_string($value)) {
-                $value = utf8_encode(self::removerAcentos($value));
+                $value = utf8_encode(self::clean($value));
             }
         });
 
         return json_encode($dados);
     }
 
-    public function removerAcentos($string)
+    public function clean($string)
     {
         $table = array(
              '?' => 'S', '?' => 's', '?' => 'Dj', '?' => 'dj', '?' => 'Z',
@@ -37,8 +37,7 @@ public function removerAcentos($string)
              'ª' => '',
          );
 
-         // Traduz os caracteres em $string, baseado no vetor $table
-         $string = strtr($string, $table);
+        $string = strtr($string, $table);
 
         return $string;
     }

core/model/Model.php

@@ -1,6 +1,6 @@
 <?php
 
-//namespace SimpleORM\core\model\Model;
+//namespace SimpleORM\Model;
 
 require_once 'Database.php';
 
@@ -57,7 +57,7 @@ public function find($dados = null)
 
         $fields = (isset($this->dados['fields'])) ? self::fields() : '*';
         $table = self::table();
-        $where = (isset($this->dados['conditions'])) ? self::conditions('AND') : '';
+        $where = (isset($this->dados['conditions'])) ? self::conditions(' AND ') : '';
         $sql = "SELECT {$fields} FROM {$table} {$where}";
         $this->stmt = $this->conn->prepare($sql);
 

index.php

@@ -6,17 +6,32 @@
 require_once __DIR__.'/core//model/Model.php';
 require_once __DIR__.'/core/controller/Controller.php';
 require_once __DIR__.'/core/helper/Helper.php';
+require_once __DIR__.'/app//model/AppModel.php';
 
 $uri = $_SERVER['REQUEST_URI'];
 
+switch ($_SERVER['REQUEST_METHOD']) {
+    case 'GET': $the_request = &$_GET;
+        break;
+    case 'POST': $the_request = &$_POST;
+        break;
+    default:
+        $the_request = null;
+}
+
 if ($uri == '/') {
-    echo 'No file selected';
+    $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);
+    }
+
     /*
     * require files of current Model/Controller
     */
@@ -37,7 +52,9 @@
     /*
     * call current class/method
     */
-    $set = call_user_func_array(array(new $controller(), $method), $_POST);
+    //$set = call_user_func_array(array(new $controller(), $method), $the_request);
+    $class = new $controller();
+    $set = $class->$method($the_request);
 
     /*
     * Declare all variables if passed in return