Rozbo / puck

core/Mysql.php

Doc Comments +28 added lines, -29 removed lines

@@ -255,7 +255,7 @@ 
      *
      * @param string $subQueryAlias
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public static function subQuery($subQueryAlias = "") {
         return new self(array('host' => $subQueryAlias, 'isSubQuery' => true));
@@ -277,7 +277,7 @@ 
     /**
      * Helper function to create dbObject with JSON return type
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function jsonBuilder() {
         $this->returnType = 'json';
@@ -287,7 +287,7 @@ 
     /**
      * Helper function to create dbObject with object return type.
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function objectBuilder() {
         $this->returnType = 'object';
@@ -350,7 +350,7 @@ 
      * Method attempts to prepare the SQL query
      * and throws an error if there was a problem.
      *
-     * @return mysqli_stmt
+     * @return \mysqli_stmt
      */
     protected function _prepareQuery() {
         if (!$stmt = $this->mysqli()->prepare($this->_query)) {
@@ -539,7 +539,7 @@ 
      * This helper method takes care of prepared statements' "bind_result method
      * , when the number of variables to pass is unknown.
      *
-     * @param mysqli_stmt $stmt Equal to the prepared statement object.
+     * @param \mysqli_stmt $stmt Equal to the prepared statement object.
      *
      * @return array The results of the SQL fetch.
      */
@@ -702,7 +702,7 @@ 
      *                               or only $count
      * @param array $tableData Should contain an array of data for updating the database.
      *
-     * @return mysqli_stmt Returns the $stmt object.
+     * @return null|\mysqli_stmt Returns the $stmt object.
      */
     protected function _buildQuery($numRows = null, $tableData = null) {
         // $this->_buildJoinOld();
@@ -1209,9 +1209,8 @@ 
      * A convenient function that returns TRUE if exists at least an element that
      * satisfy the where condition specified calling the "where" method before this one.
      *
-     * @param string $tableName The name of the database table to work with.
      *
-     * @return array Contains the returned rows from the select query.
+     * @return boolean Contains the returned rows from the select query.
      */
     public function has() {
         $this->getOne($this->tableName, '1');
@@ -1311,7 +1310,7 @@ 
      * @param int|array $numRows Array to define SQL limit in format Array ($count, $offset)
      *                               or only $count
      *
-     * @return bool Indicates success. 0 or 1.
+     * @return null|boolean Indicates success. 0 or 1.
      */
     public function delete($numRows = null) {
         if ($this->isSubQuery) {
@@ -1342,7 +1341,7 @@ 
      * @param array $updateColumns Variable with values
      * @param string $lastInsertId Variable value
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function onDuplicate($updateColumns, $lastInsertId = null) {
         $this->_lastInsertId = $lastInsertId;
@@ -1359,7 +1358,7 @@ 
      * @param mixed $whereValue The value of the database field.
      * @param string $operator Comparison operator. Default is =
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function orWhere($whereProp, $whereValue = 'DBNULL', $operator = '=') {
         return $this->where($whereProp, $whereValue, $operator, 'OR');
@@ -1375,7 +1374,7 @@ 
      * @param string $operator Comparison operator. Default is =
      * @param string $cond Condition of where statement (OR, AND)
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function where($whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
         // forkaround for an old operation api
@@ -1401,7 +1400,7 @@ 
      * @param mixed $havingValue The value of the database field.
      * @param string $operator Comparison operator. Default is =
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function orHaving($havingProp, $havingValue = null, $operator = null) {
         return $this->having($havingProp, $havingValue, $operator, 'OR');
@@ -1416,7 +1415,7 @@ 
      * @param mixed $havingValue The value of the database field.
      * @param string $operator Comparison operator. Default is =
      *
-     * @return MysqliDb
+     * @return Mysql
      */
 
     public function having($havingProp, $havingValue = 'DBNULL', $operator = '=', $cond = 'AND') {
@@ -1444,7 +1443,7 @@ 
      * @param string $joinType 'LEFT', 'INNER' etc.
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function join($joinTable, $joinCondition, $joinType = '') {
         $allowedTypes = array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER');
@@ -1529,7 +1528,7 @@ 
      * This method does not escape strings by default so make sure you'll never use it in production.
      *
      * @author Jonas Barascu
-     * @param [[Type]] $query [[Description]]
+     * @param string $query [[Description]]
      */
     private function queryUnprepared($query) {
         // Execute query
@@ -1603,11 +1602,11 @@ 
      * @uses $MySqliDb->orderBy('id', 'desc')->orderBy('name', 'desc');
      *
      * @param string $orderByField The name of the database field.
-     * @param string $orderByDirection Order direction.
+     * @param string $orderbyDirection Order direction.
      * @param array $customFields Fieldset for ORDER BY FIELD() ordering
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function orderBy($orderByField, $orderbyDirection = "DESC", $customFields = null) {
         $allowedDirection = Array("ASC", "DESC");
@@ -1643,7 +1642,7 @@ 
      *
      * @param string $groupByField The name of the database field.
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function groupBy($groupByField) {
         $groupByField = preg_replace("/[^-a-z0-9\.\(\),_\*]+/i", '', $groupByField);
@@ -1659,7 +1658,7 @@ 
      * @param  string $method The table lock method. Can be READ or WRITE.
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setLockMethod($method) {
         // Switch the uppercase string
@@ -1806,7 +1805,7 @@ 
      *
      * @param string $prefix Contains a tableprefix
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setPrefix($prefix = '') {
         $this->prefix = $prefix;
@@ -2016,7 +2015,7 @@ 
      * @param bool $enabled Enable execution time tracking
      * @param string $stripPrefix Prefix to strip from the path in exec log
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setTrace($enabled, $stripPrefix = null) {
         $this->traceEnabled = $enabled;
@@ -2053,7 +2052,7 @@ 
      *
      * @param string $idField field name to use for a mapped element key
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function map($idField) {
         $this->_mapKey = $idField;
@@ -2069,7 +2068,7 @@ 
      * @param string $whereProp The name of the database field.
      * @param mixed $whereValue The value of the database field.
      *
-     * @return dbWrapper
+     * @return Mysql
      */
     public function joinOrWhere($whereJoin, $whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
         return $this->joinWhere($whereJoin, $whereProp, $whereValue, $operator, 'OR');
@@ -2084,7 +2083,7 @@ 
      * @param string $whereProp The name of the database field.
      * @param mixed $whereValue The value of the database field.
      *
-     * @return dbWrapper
+     * @return Mysql
      */
     public function joinWhere($whereJoin, $whereProp, $whereValue = 'DBNULL', $operator = '=', $cond = 'AND') {
         $this->_joinAnd[$whereJoin][] = Array($cond, $whereProp, $operator, $whereValue);
@@ -2160,7 +2159,7 @@ 
      * Helper function to create dbObject with array return type
      * Added for consistency as thats default output type
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function arrayBuilder() {
         $this->returnType = 'array';
@@ -2241,7 +2240,7 @@ 
     /**
      * Function to enable SQL_CALC_FOUND_ROWS in the get queries
      *
-     * @return MysqliDb
+     * @return Mysql
      */
     public function withTotalCount() {
         $this->setQueryOption('SQL_CALC_FOUND_ROWS');
@@ -2253,10 +2252,10 @@ 
      *
      * @uses $MySqliDb->setQueryOption('name');
      *
-     * @param string|array $options The optons name of the query.
+     * @param string $options The optons name of the query.
      *
      * @throws Exception
-     * @return MysqliDb
+     * @return Mysql
      */
     public function setQueryOption($options) {
         $allowedOptions = Array('ALL', 'DISTINCT', 'DISTINCTROW', 'HIGH_PRIORITY', 'STRAIGHT_JOIN', 'SQL_SMALL_RESULT',

core/Model.php

Spacing +127 added lines, -127 removed lines

@@ -9,13 +9,13 @@ 
      *
      * @var int
      */
-    public static $pageLimit = 20;
+    public static $pageLimit=20;
     /**
      * Variable that holds total pages count of last paginate() query
      *
      * @var int
      */
-    public static $totalPages = 0;
+    public static $totalPages=0;
     /**
      * Models path
      *
@@ -33,33 +33,33 @@ 
      *
      * @var boolean
      */
-    public $isNew = true;
+    public $isNew=true;
     /**
      * Return type: 'Array' to return results as array, 'Object' as object
      * 'Json' as json string
      *
      * @var string
      */
-    public $returnType = 'Object';
+    public $returnType='Object';
     /**
      * An array that holds insert/update/select errors
      *
      * @var array
      */
-    public $errors = null;
+    public $errors=null;
     /**
      * Primary key for an object. 'id' is a default value.
      *
      * @var stating
      */
-    protected $primaryKey = 'id';
+    protected $primaryKey='id';
     /**
      * Table name for an object. Class name will be used by default
      *
      * @var stating
      */
     protected $dbTable;
-    protected $dbConn = null;
+    protected $dbConn=null;
     protected $prefix;
     /**
      * Working instance of MysqliDb created earlier
@@ -73,24 +73,24 @@ 
      *
      * @var string
      */
-    private $_with = Array();
+    private $_with=Array();
 
     /**
      * @param array $data Data to preload on object creation
      */
     public function __construct() {
-        $this->db = app('db')->connect($this->dbConn);
+        $this->db=app('db')->connect($this->dbConn);
         if ($this->prefix) {
-            $this->db = $this->db->setPrefix($this->prefix);
+            $this->db=$this->db->setPrefix($this->prefix);
         }
         if (!$this->dbTable) {
-            $classFull = get_class($this);
-            $classArray = explode("\\", $classFull);
-            $classSelf = array_pop($classArray);
-            $classSelf = Str::snake($classSelf);
-            $this->dbTable = $classSelf;
+            $classFull=get_class($this);
+            $classArray=explode("\\", $classFull);
+            $classSelf=array_pop($classArray);
+            $classSelf=Str::snake($classSelf);
+            $this->dbTable=$classSelf;
         }
-        $this->db = $this->db->table($this->dbTable);
+        $this->db=$this->db->table($this->dbTable);
     }
 
     /**
@@ -100,10 +100,10 @@ 
      * @return dbObject
      */
     public static function table($tableName) {
-        $tableName = preg_replace("/[^-a-z0-9_]+/i", '', $tableName);
+        $tableName=preg_replace("/[^-a-z0-9_]+/i", '', $tableName);
         if (!class_exists($tableName))
             eval ("class $tableName extends dbObject {}");
-        return new $tableName ();
+        return new $tableName();
     }
 
     /**
@@ -117,23 +117,23 @@ 
      * @return mixed
      */
     public static function __callStatic($method, $arg) {
-        $obj = new static;
-        $result = call_user_func_array(array($obj, $method), $arg);
+        $obj=new static;
+        $result=call_user_func_array(array($obj, $method), $arg);
         if (method_exists($obj, $method))
             return $result;
         return $obj;
     }
 
-    public static function autoload($path = null) {
+    public static function autoload($path=null) {
         if ($path)
-            static::$modelPath = $path . "/";
+            static::$modelPath=$path."/";
         else
-            static::$modelPath = __DIR__ . "/models/";
+            static::$modelPath=__DIR__."/models/";
         spl_autoload_register("dbObject::dbObjectAutoload");
     }
 
     private static function dbObjectAutoload($classname) {
-        $filename = static::$modelPath . $classname . ".php";
+        $filename=static::$modelPath.$classname.".php";
         if (file_exists($filename))
             include($filename);
     }
@@ -153,20 +153,20 @@ 
             return $this->data[$name];
 
         if (property_exists($this, 'relations') && isset ($this->relations[$name])) {
-            $relationType = strtolower($this->relations[$name][0]);
-            $modelName = $this->relations[$name][1];
+            $relationType=strtolower($this->relations[$name][0]);
+            $modelName=$this->relations[$name][1];
             switch ($relationType) {
                 case 'hasone':
-                    $key = isset ($this->relations[$name][2]) ? $this->relations[$name][2] : $name;
-                    $obj = new $modelName;
-                    $obj->returnType = $this->returnType;
-                    return $this->data[$name] = $obj->byId($this->data[$key]);
+                    $key=isset ($this->relations[$name][2]) ? $this->relations[$name][2] : $name;
+                    $obj=new $modelName;
+                    $obj->returnType=$this->returnType;
+                    return $this->data[$name]=$obj->byId($this->data[$key]);
                     break;
                 case 'hasmany':
-                    $key = $this->relations[$name][2];
-                    $obj = new $modelName;
-                    $obj->returnType = $this->returnType;
-                    return $this->data[$name] = $obj->where($key, $this->data[$this->primaryKey])->get();
+                    $key=$this->relations[$name][2];
+                    $obj=new $modelName;
+                    $obj->returnType=$this->returnType;
+                    return $this->data[$name]=$obj->where($key, $this->data[$this->primaryKey])->get();
                     break;
                 default:
                     break;
@@ -189,7 +189,7 @@ 
         if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false)
             return;
 
-        $this->data[$name] = $value;
+        $this->data[$name]=$value;
     }
 
     public function __isset($name) {
@@ -209,7 +209,7 @@ 
      *
      * @return mixed insert id or false in case of failure
      */
-    public function save($data = null) {
+    public function save($data=null) {
         if ($this->isNew)
             return $this->insert();
         return $this->update($data);
@@ -220,22 +220,22 @@ 
      */
     public function insert() {
         if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps))
-            $this->createdAt = date("Y-m-d H:i:s");
-        $sqlData = $this->prepareData();
+            $this->createdAt=date("Y-m-d H:i:s");
+        $sqlData=$this->prepareData();
         if (!$this->validate($sqlData))
             return false;
 
-        $id = $this->db->insert($this->dbTable, $sqlData);
+        $id=$this->db->insert($this->dbTable, $sqlData);
         if (!empty ($this->primaryKey) && empty ($this->data[$this->primaryKey]))
-            $this->data[$this->primaryKey] = $id;
-        $this->isNew = false;
+            $this->data[$this->primaryKey]=$id;
+        $this->isNew=false;
 
         return $id;
     }
 
     private function prepareData() {
-        $this->errors = Array();
-        $sqlData = Array();
+        $this->errors=Array();
+        $sqlData=Array();
         if (count($this->data) == 0)
             return Array();
 
@@ -247,27 +247,27 @@ 
 
         foreach ($this->data as $key => &$value) {
             if ($value instanceof dbObject && $value->isNew == true) {
-                $id = $value->save();
+                $id=$value->save();
                 if ($id)
-                    $value = $id;
+                    $value=$id;
                 else
-                    $this->errors = array_merge($this->errors, $value->errors);
+                    $this->errors=array_merge($this->errors, $value->errors);
             }
 
             if (!in_array($key, array_keys($this->dbFields)))
                 continue;
 
             if (!is_array($value)) {
-                $sqlData[$key] = $value;
+                $sqlData[$key]=$value;
                 continue;
             }
 
             if (isset ($this->jsonFields) && in_array($key, $this->jsonFields))
-                $sqlData[$key] = json_encode($value);
+                $sqlData[$key]=json_encode($value);
             else if (isset ($this->arrayFields) && in_array($key, $this->arrayFields))
-                $sqlData[$key] = implode("|", $value);
+                $sqlData[$key]=implode("|", $value);
             else
-                $sqlData[$key] = $value;
+                $sqlData[$key]=$value;
         }
         return $sqlData;
     }
@@ -280,23 +280,23 @@ 
             return true;
 
         foreach ($this->dbFields as $key => $desc) {
-            $type = null;
-            $required = false;
+            $type=null;
+            $required=false;
             if (isset ($data[$key]))
-                $value = $data[$key];
+                $value=$data[$key];
             else
-                $value = null;
+                $value=null;
 
             if (is_array($value))
                 continue;
 
             if (isset ($desc[0]))
-                $type = $desc[0];
+                $type=$desc[0];
             if (isset ($desc[1]) && ($desc[1] == 'required'))
-                $required = true;
+                $required=true;
 
             if ($required && strlen($value) == 0) {
-                $this->errors[] = Array($this->dbTable . "." . $key => "is required");
+                $this->errors[]=Array($this->dbTable.".".$key => "is required");
                 continue;
             }
             if ($value == null)
@@ -304,29 +304,29 @@ 
 
             switch ($type) {
                 case "text";
-                    $regexp = null;
+                    $regexp=null;
                     break;
                 case "int":
-                    $regexp = "/^[0-9]*$/";
+                    $regexp="/^[0-9]*$/";
                     break;
                 case "double":
-                    $regexp = "/^[0-9\.]*$/";
+                    $regexp="/^[0-9\.]*$/";
                     break;
                 case "bool":
-                    $regexp = '/^[yes|no|0|1|true|false]$/i';
+                    $regexp='/^[yes|no|0|1|true|false]$/i';
                     break;
                 case "datetime":
-                    $regexp = "/^[0-9a-zA-Z -:]*$/";
+                    $regexp="/^[0-9a-zA-Z -:]*$/";
                     break;
                 default:
-                    $regexp = $type;
+                    $regexp=$type;
                     break;
             }
             if (!$regexp)
                 continue;
 
             if (!preg_match($regexp, $value)) {
-                $this->errors[] = Array($this->dbTable . "." . $key => "$type validation failed");
+                $this->errors[]=Array($this->dbTable.".".$key => "$type validation failed");
                 continue;
             }
         }
@@ -336,7 +336,7 @@ 
     /**
      * @param array $data Optional update data to apply to the object
      */
-    public function update($data = null) {
+    public function update($data=null) {
         if (empty ($this->dbFields))
             return false;
 
@@ -345,13 +345,13 @@ 
 
         if ($data) {
             foreach ($data as $k => $v)
-                $this->$k = $v;
+                $this->$k=$v;
         }
 
         if (!empty ($this->timestamps) && in_array("updatedAt", $this->timestamps))
-            $this->updatedAt = date("Y-m-d H:i:s");
+            $this->updatedAt=date("Y-m-d H:i:s");
 
-        $sqlData = $this->prepareData();
+        $sqlData=$this->prepareData();
         if (!$this->validate($sqlData))
             return false;
 
@@ -384,7 +384,7 @@ 
         if (method_exists($this, $method))
             return call_user_func_array(array($this, $method), $arg);
         $this->db->table($this->dbTable);
-        return call_user_func_array(array($this->db, $method), $arg);;
+        return call_user_func_array(array($this->db, $method), $arg); ;
     }
 
     /**
@@ -411,11 +411,11 @@ 
      * @return array Converted data
      */
     public function toArray() {
-        $data = $this->data;
+        $data=$this->data;
         $this->processAllWith($data);
         foreach ($data as &$d) {
             if ($d instanceof dbObject)
-                $d = $d->data;
+                $d=$d->data;
         }
         return $data;
     }
@@ -425,40 +425,40 @@ 
      *
      * @param array $data
      */
-    private function processAllWith(&$data, $shouldReset = true) {
+    private function processAllWith(&$data, $shouldReset=true) {
         if (count($this->_with) == 0)
             return;
 
         foreach ($this->_with as $name => $opts) {
-            $relationType = strtolower($opts[0]);
-            $modelName = $opts[1];
+            $relationType=strtolower($opts[0]);
+            $modelName=$opts[1];
             if ($relationType == 'hasone') {
-                $obj = new $modelName;
-                $table = $obj->dbTable;
-                $primaryKey = $obj->primaryKey;
+                $obj=new $modelName;
+                $table=$obj->dbTable;
+                $primaryKey=$obj->primaryKey;
 
                 if (!isset ($data[$table])) {
-                    $data[$name] = $this->$name;
+                    $data[$name]=$this->$name;
                     continue;
                 }
                 if ($data[$table][$primaryKey] === null) {
-                    $data[$name] = null;
+                    $data[$name]=null;
                 } else {
                     if ($this->returnType == 'Object') {
-                        $item = new $modelName ($data[$table]);
-                        $item->returnType = $this->returnType;
-                        $item->isNew = false;
-                        $data[$name] = $item;
+                        $item=new $modelName($data[$table]);
+                        $item->returnType=$this->returnType;
+                        $item->isNew=false;
+                        $data[$name]=$item;
                     } else {
-                        $data[$name] = $data[$table];
+                        $data[$name]=$data[$table];
                     }
                 }
                 unset ($data[$table]);
             } else
-                $data[$name] = $this->$name;
+                $data[$name]=$this->$name;
         }
         if ($shouldReset)
-            $this->_with = Array();
+            $this->_with=Array();
     }
 
     /**
@@ -471,24 +471,24 @@ 
      *
      * @return array Array of dbObjects
      */
-    protected function get($limit = null, $fields = null) {
-        $objects = Array();
+    protected function get($limit=null, $fields=null) {
+        $objects=Array();
         $this->processHasOneWith();
-        $results = $this->db->ArrayBuilder()->get($this->dbTable, $limit, $fields);
+        $results=$this->db->ArrayBuilder()->get($this->dbTable, $limit, $fields);
         if ($this->db->count == 0)
             return null;
 
         foreach ($results as &$r) {
             $this->processArrays($r);
-            $this->data = $r;
+            $this->data=$r;
             $this->processAllWith($r, false);
             if ($this->returnType == 'Object') {
-                $item = new static ($r);
-                $item->isNew = false;
-                $objects[] = $item;
+                $item=new static ($r);
+                $item->isNew=false;
+                $objects[]=$item;
             }
         }
-        $this->_with = Array();
+        $this->_with=Array();
         if ($this->returnType == 'Object')
             return $objects;
 
@@ -502,11 +502,11 @@ 
         if (count($this->_with) == 0)
             return;
         foreach ($this->_with as $name => $opts) {
-            $relationType = strtolower($opts[0]);
-            $modelName = $opts[1];
-            $key = null;
+            $relationType=strtolower($opts[0]);
+            $modelName=$opts[1];
+            $key=null;
             if (isset ($opts[2]))
-                $key = $opts[2];
+                $key=$opts[2];
             if ($relationType == 'hasone') {
                 $this->db->setQueryOption("MYSQLI_NESTJOIN");
                 $this->join($modelName, $key);
@@ -525,18 +525,18 @@ 
      *
      * @return dbObject
      */
-    private function join($objectName, $key = null, $joinType = 'LEFT', $primaryKey = null) {
-        $joinObj = new $objectName;
+    private function join($objectName, $key=null, $joinType='LEFT', $primaryKey=null) {
+        $joinObj=new $objectName;
         if (!$key)
-            $key = $objectName . "id";
+            $key=$objectName."id";
 
         if (!$primaryKey)
-            $primaryKey = $this->db->getPrefix() . $joinObj->dbTable . "." . $joinObj->primaryKey;
+            $primaryKey=$this->db->getPrefix().$joinObj->dbTable.".".$joinObj->primaryKey;
 
         if (!strchr($key, '.'))
-            $joinStr = $this->db->getPrefix() . $this->dbTable . ".{$key} = " . $primaryKey;
+            $joinStr=$this->db->getPrefix().$this->dbTable.".{$key} = ".$primaryKey;
         else
-            $joinStr = $this->db->getPrefix() . "{$key} = " . $primaryKey;
+            $joinStr=$this->db->getPrefix()."{$key} = ".$primaryKey;
 
         $this->db->join($joinObj->dbTable, $joinStr, $joinType);
         return $this;
@@ -548,12 +548,12 @@ 
     private function processArrays(&$data) {
         if (isset ($this->jsonFields) && is_array($this->jsonFields)) {
             foreach ($this->jsonFields as $key)
-                $data[$key] = json_decode($data[$key]);
+                $data[$key]=json_decode($data[$key]);
         }
 
         if (isset ($this->arrayFields) && is_array($this->arrayFields)) {
             foreach ($this->arrayFields as $key)
-                $data[$key] = explode("|", $data[$key]);
+                $data[$key]=explode("|", $data[$key]);
         }
     }
 
@@ -563,7 +563,7 @@ 
      * @return int
      */
     protected function count() {
-        $res = $this->db->ArrayBuilder()->getValue($this->dbTable, "count(*)");
+        $res=$this->db->ArrayBuilder()->getValue($this->dbTable, "count(*)");
         if (!$res)
             return 0;
         return $res;
@@ -575,7 +575,7 @@ 
      * @return dbObject
      */
     private function JsonBuilder() {
-        $this->returnType = 'Json';
+        $this->returnType='Json';
         return $this;
     }
 
@@ -589,7 +589,7 @@ 
      * @return dbObject
      */
     private function ArrayBuilder() {
-        $this->returnType = 'Array';
+        $this->returnType='Array';
         return $this;
     }
 
@@ -600,7 +600,7 @@ 
      * @return dbObject
      */
     private function ObjectBuilder() {
-        $this->returnType = 'Object';
+        $this->returnType='Object';
         return $this;
     }
 
@@ -613,8 +613,8 @@ 
      *
      * @return dbObject|array
      */
-    private function byId($id, $fields = null) {
-        $this->db->where($this->db->getPrefix() . $this->dbTable . '.' . $this->primaryKey, $id);
+    private function byId($id, $fields=null) {
+        $this->db->where($this->db->getPrefix().$this->dbTable.'.'.$this->primaryKey, $id);
         return $this->getOne($fields);
     }
 
@@ -626,22 +626,22 @@ 
      *
      * @return dbObject
      */
-    protected function getOne($fields = null) {
+    protected function getOne($fields=null) {
         $this->processHasOneWith();
-        $results = $this->db->ArrayBuilder()->getOne($this->dbTable, $fields);
+        $results=$this->db->ArrayBuilder()->getOne($this->dbTable, $fields);
         if ($this->db->count == 0)
             return null;
 
         $this->processArrays($results);
-        $this->data = $results;
+        $this->data=$results;
         $this->processAllWith($results);
         if ($this->returnType == 'Json')
             return json_encode($results);
         if ($this->returnType == 'Array')
             return $results;
 
-        $item = new static ($results);
-        $item->isNew = false;
+        $item=new static ($results);
+        $item->isNew=false;
 
         return $item;
     }
@@ -658,7 +658,7 @@ 
         if (!property_exists($this, 'relations') && !isset ($this->relations[$name]))
             die ("No relation with name $objectName found");
 
-        $this->_with[$objectName] = $this->relations[$objectName];
+        $this->_with[$objectName]=$this->relations[$objectName];
 
         return $this;
     }
@@ -679,23 +679,23 @@ 
      * @param array|string $fields Array or coma separated list of fields to fetch
      * @return array
      */
-    private function paginate($page, $fields = null) {
-        $this->db->pageLimit = self::$pageLimit;
-        $res = $this->db->paginate($this->dbTable, $page, $fields);
-        self::$totalPages = $this->db->totalPages;
+    private function paginate($page, $fields=null) {
+        $this->db->pageLimit=self::$pageLimit;
+        $res=$this->db->paginate($this->dbTable, $page, $fields);
+        self::$totalPages=$this->db->totalPages;
         if ($this->db->count == 0) return null;
 
         foreach ($res as &$r) {
             $this->processArrays($r);
-            $this->data = $r;
+            $this->data=$r;
             $this->processAllWith($r, false);
             if ($this->returnType == 'Object') {
-                $item = new static ($r);
-                $item->isNew = false;
-                $objects[] = $item;
+                $item=new static ($r);
+                $item->isNew=false;
+                $objects[]=$item;
             }
         }
-        $this->_with = Array();
+        $this->_with=Array();
         if ($this->returnType == 'Object')
             return $objects;
 

Braces +183 added lines, -125 removed lines

@@ -101,8 +101,9 @@ 
      */
     public static function table($tableName) {
         $tableName = preg_replace("/[^-a-z0-9_]+/i", '', $tableName);
-        if (!class_exists($tableName))
-            eval ("class $tableName extends dbObject {}");
+        if (!class_exists($tableName)) {
+                    eval ("class $tableName extends dbObject {}");
+        }
         return new $tableName ();
     }
 
@@ -119,23 +120,26 @@ 
     public static function __callStatic($method, $arg) {
         $obj = new static;
         $result = call_user_func_array(array($obj, $method), $arg);
-        if (method_exists($obj, $method))
-            return $result;
+        if (method_exists($obj, $method)) {
+                    return $result;
+        }
         return $obj;
     }
 
     public static function autoload($path = null) {
-        if ($path)
-            static::$modelPath = $path . "/";
-        else
-            static::$modelPath = __DIR__ . "/models/";
+        if ($path) {
+                    static::$modelPath = $path . "/";
+        } else {
+                    static::$modelPath = __DIR__ . "/models/";
+        }
         spl_autoload_register("dbObject::dbObjectAutoload");
     }
 
     private static function dbObjectAutoload($classname) {
         $filename = static::$modelPath . $classname . ".php";
-        if (file_exists($filename))
-            include($filename);
+        if (file_exists($filename)) {
+                    include($filename);
+        }
     }
 
     /**
@@ -146,11 +150,13 @@ 
      * @return mixed
      */
     public function __get($name) {
-        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false)
-            return null;
+        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false) {
+                    return null;
+        }
 
-        if (isset ($this->data[$name]) && $this->data[$name] instanceof dbObject)
-            return $this->data[$name];
+        if (isset ($this->data[$name]) && $this->data[$name] instanceof dbObject) {
+                    return $this->data[$name];
+        }
 
         if (property_exists($this, 'relations') && isset ($this->relations[$name])) {
             $relationType = strtolower($this->relations[$name][0]);
@@ -173,11 +179,13 @@ 
             }
         }
 
-        if (isset ($this->data[$name]))
-            return $this->data[$name];
+        if (isset ($this->data[$name])) {
+                    return $this->data[$name];
+        }
 
-        if (property_exists($this->db, $name))
-            return $this->db->$name;
+        if (property_exists($this->db, $name)) {
+                    return $this->db->$name;
+        }
     }
 
     /**
@@ -186,18 +194,21 @@ 
      * @return mixed
      */
     public function __set($name, $value) {
-        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false)
-            return;
+        if (property_exists($this, 'hidden') && array_search($name, $this->hidden) !== false) {
+                    return;
+        }
 
         $this->data[$name] = $value;
     }
 
     public function __isset($name) {
-        if (isset ($this->data[$name]))
-            return isset ($this->data[$name]);
+        if (isset ($this->data[$name])) {
+                    return isset ($this->data[$name]);
+        }
 
-        if (property_exists($this->db, $name))
-            return isset ($this->db->$name);
+        if (property_exists($this->db, $name)) {
+                    return isset ($this->db->$name);
+        }
     }
 
     public function __unset($name) {
@@ -210,8 +221,9 @@ 
      * @return mixed insert id or false in case of failure
      */
     public function save($data = null) {
-        if ($this->isNew)
-            return $this->insert();
+        if ($this->isNew) {
+                    return $this->insert();
+        }
         return $this->update($data);
     }
 
@@ -219,15 +231,18 @@ 
      * @return mixed insert id or false in case of failure
      */
     public function insert() {
-        if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps))
-            $this->createdAt = date("Y-m-d H:i:s");
+        if (!empty ($this->timestamps) && in_array("createdAt", $this->timestamps)) {
+                    $this->createdAt = date("Y-m-d H:i:s");
+        }
         $sqlData = $this->prepareData();
-        if (!$this->validate($sqlData))
-            return false;
+        if (!$this->validate($sqlData)) {
+                    return false;
+        }
 
         $id = $this->db->insert($this->dbTable, $sqlData);
-        if (!empty ($this->primaryKey) && empty ($this->data[$this->primaryKey]))
-            $this->data[$this->primaryKey] = $id;
+        if (!empty ($this->primaryKey) && empty ($this->data[$this->primaryKey])) {
+                    $this->data[$this->primaryKey] = $id;
+        }
         $this->isNew = false;
 
         return $id;
@@ -236,38 +251,44 @@ 
     private function prepareData() {
         $this->errors = Array();
         $sqlData = Array();
-        if (count($this->data) == 0)
-            return Array();
+        if (count($this->data) == 0) {
+                    return Array();
+        }
 
-        if (method_exists($this, "preLoad"))
-            $this->preLoad($this->data);
+        if (method_exists($this, "preLoad")) {
+                    $this->preLoad($this->data);
+        }
 
-        if (!$this->dbFields)
-            return $this->data;
+        if (!$this->dbFields) {
+                    return $this->data;
+        }
 
         foreach ($this->data as $key => &$value) {
             if ($value instanceof dbObject && $value->isNew == true) {
                 $id = $value->save();
-                if ($id)
-                    $value = $id;
-                else
-                    $this->errors = array_merge($this->errors, $value->errors);
+                if ($id) {
+                                    $value = $id;
+                } else {
+                                    $this->errors = array_merge($this->errors, $value->errors);
+                }
             }
 
-            if (!in_array($key, array_keys($this->dbFields)))
-                continue;
+            if (!in_array($key, array_keys($this->dbFields))) {
+                            continue;
+            }
 
             if (!is_array($value)) {
                 $sqlData[$key] = $value;
                 continue;
             }
 
-            if (isset ($this->jsonFields) && in_array($key, $this->jsonFields))
-                $sqlData[$key] = json_encode($value);
-            else if (isset ($this->arrayFields) && in_array($key, $this->arrayFields))
-                $sqlData[$key] = implode("|", $value);
-            else
-                $sqlData[$key] = $value;
+            if (isset ($this->jsonFields) && in_array($key, $this->jsonFields)) {
+                            $sqlData[$key] = json_encode($value);
+            } else if (isset ($this->arrayFields) && in_array($key, $this->arrayFields)) {
+                            $sqlData[$key] = implode("|", $value);
+            } else {
+                            $sqlData[$key] = $value;
+            }
         }
         return $sqlData;
     }
@@ -276,31 +297,37 @@ 
      * @param array $data
      */
     private function validate($data) {
-        if (!$this->dbFields)
-            return true;
+        if (!$this->dbFields) {
+                    return true;
+        }
 
         foreach ($this->dbFields as $key => $desc) {
             $type = null;
             $required = false;
-            if (isset ($data[$key]))
-                $value = $data[$key];
-            else
-                $value = null;
+            if (isset ($data[$key])) {
+                            $value = $data[$key];
+            } else {
+                            $value = null;
+            }
 
-            if (is_array($value))
-                continue;
+            if (is_array($value)) {
+                            continue;
+            }
 
-            if (isset ($desc[0]))
-                $type = $desc[0];
-            if (isset ($desc[1]) && ($desc[1] == 'required'))
-                $required = true;
+            if (isset ($desc[0])) {
+                            $type = $desc[0];
+            }
+            if (isset ($desc[1]) && ($desc[1] == 'required')) {
+                            $required = true;
+            }
 
             if ($required && strlen($value) == 0) {
                 $this->errors[] = Array($this->dbTable . "." . $key => "is required");
                 continue;
             }
-            if ($value == null)
-                continue;
+            if ($value == null) {
+                            continue;
+            }
 
             switch ($type) {
                 case "text";
@@ -322,8 +349,9 @@ 
                     $regexp = $type;
                     break;
             }
-            if (!$regexp)
-                continue;
+            if (!$regexp) {
+                            continue;
+            }
 
             if (!preg_match($regexp, $value)) {
                 $this->errors[] = Array($this->dbTable . "." . $key => "$type validation failed");
@@ -337,23 +365,28 @@ 
      * @param array $data Optional update data to apply to the object
      */
     public function update($data = null) {
-        if (empty ($this->dbFields))
-            return false;
+        if (empty ($this->dbFields)) {
+                    return false;
+        }
 
-        if (empty ($this->data[$this->primaryKey]))
-            return false;
+        if (empty ($this->data[$this->primaryKey])) {
+                    return false;
+        }
 
         if ($data) {
-            foreach ($data as $k => $v)
-                $this->$k = $v;
+            foreach ($data as $k => $v) {
+                            $this->$k = $v;
+            }
         }
 
-        if (!empty ($this->timestamps) && in_array("updatedAt", $this->timestamps))
-            $this->updatedAt = date("Y-m-d H:i:s");
+        if (!empty ($this->timestamps) && in_array("updatedAt", $this->timestamps)) {
+                    $this->updatedAt = date("Y-m-d H:i:s");
+        }
 
         $sqlData = $this->prepareData();
-        if (!$this->validate($sqlData))
-            return false;
+        if (!$this->validate($sqlData)) {
+                    return false;
+        }
 
         $this->db->where($this->primaryKey, $this->data[$this->primaryKey]);
         return $this->db->update($this->dbTable, $sqlData);
@@ -365,8 +398,9 @@ 
      * @return boolean Indicates success. 0 or 1.
      */
     public function delete() {
-        if (empty ($this->data[$this->primaryKey]))
-            return false;
+        if (empty ($this->data[$this->primaryKey])) {
+                    return false;
+        }
 
         $this->db->where($this->primaryKey, $this->data[$this->primaryKey]);
         return $this->db->delete($this->dbTable);
@@ -381,8 +415,9 @@ 
      * @return mixed
      */
     public function __call($method, $arg) {
-        if (method_exists($this, $method))
-            return call_user_func_array(array($this, $method), $arg);
+        if (method_exists($this, $method)) {
+                    return call_user_func_array(array($this, $method), $arg);
+        }
         $this->db->table($this->dbTable);
         return call_user_func_array(array($this->db, $method), $arg);;
     }
@@ -414,8 +449,9 @@ 
         $data = $this->data;
         $this->processAllWith($data);
         foreach ($data as &$d) {
-            if ($d instanceof dbObject)
-                $d = $d->data;
+            if ($d instanceof dbObject) {
+                            $d = $d->data;
+            }
         }
         return $data;
     }
@@ -426,8 +462,9 @@ 
      * @param array $data
      */
     private function processAllWith(&$data, $shouldReset = true) {
-        if (count($this->_with) == 0)
-            return;
+        if (count($this->_with) == 0) {
+                    return;
+        }
 
         foreach ($this->_with as $name => $opts) {
             $relationType = strtolower($opts[0]);
@@ -454,11 +491,13 @@ 
                     }
                 }
                 unset ($data[$table]);
-            } else
-                $data[$name] = $this->$name;
+            } else {
+                            $data[$name] = $this->$name;
+            }
+        }
+        if ($shouldReset) {
+                    $this->_with = Array();
         }
-        if ($shouldReset)
-            $this->_with = Array();
     }
 
     /**
@@ -475,8 +514,9 @@ 
         $objects = Array();
         $this->processHasOneWith();
         $results = $this->db->ArrayBuilder()->get($this->dbTable, $limit, $fields);
-        if ($this->db->count == 0)
-            return null;
+        if ($this->db->count == 0) {
+                    return null;
+        }
 
         foreach ($results as &$r) {
             $this->processArrays($r);
@@ -489,24 +529,28 @@ 
             }
         }
         $this->_with = Array();
-        if ($this->returnType == 'Object')
-            return $objects;
+        if ($this->returnType == 'Object') {
+                    return $objects;
+        }
 
-        if ($this->returnType == 'Json')
-            return json_encode($results);
+        if ($this->returnType == 'Json') {
+                    return json_encode($results);
+        }
 
         return $results;
     }
 
     private function processHasOneWith() {
-        if (count($this->_with) == 0)
-            return;
+        if (count($this->_with) == 0) {
+                    return;
+        }
         foreach ($this->_with as $name => $opts) {
             $relationType = strtolower($opts[0]);
             $modelName = $opts[1];
             $key = null;
-            if (isset ($opts[2]))
-                $key = $opts[2];
+            if (isset ($opts[2])) {
+                            $key = $opts[2];
+            }
             if ($relationType == 'hasone') {
                 $this->db->setQueryOption("MYSQLI_NESTJOIN");
                 $this->join($modelName, $key);
@@ -527,16 +571,19 @@ 
      */
     private function join($objectName, $key = null, $joinType = 'LEFT', $primaryKey = null) {
         $joinObj = new $objectName;
-        if (!$key)
-            $key = $objectName . "id";
+        if (!$key) {
+                    $key = $objectName . "id";
+        }
 
-        if (!$primaryKey)
-            $primaryKey = $this->db->getPrefix() . $joinObj->dbTable . "." . $joinObj->primaryKey;
+        if (!$primaryKey) {
+                    $primaryKey = $this->db->getPrefix() . $joinObj->dbTable . "." . $joinObj->primaryKey;
+        }
 
-        if (!strchr($key, '.'))
-            $joinStr = $this->db->getPrefix() . $this->dbTable . ".{$key} = " . $primaryKey;
-        else
-            $joinStr = $this->db->getPrefix() . "{$key} = " . $primaryKey;
+        if (!strchr($key, '.')) {
+                    $joinStr = $this->db->getPrefix() . $this->dbTable . ".{$key} = " . $primaryKey;
+        } else {
+                    $joinStr = $this->db->getPrefix() . "{$key} = " . $primaryKey;
+        }
 
         $this->db->join($joinObj->dbTable, $joinStr, $joinType);
         return $this;
@@ -547,13 +594,15 @@ 
      */
     private function processArrays(&$data) {
         if (isset ($this->jsonFields) && is_array($this->jsonFields)) {
-            foreach ($this->jsonFields as $key)
-                $data[$key] = json_decode($data[$key]);
+            foreach ($this->jsonFields as $key) {
+                            $data[$key] = json_decode($data[$key]);
+            }
         }
 
         if (isset ($this->arrayFields) && is_array($this->arrayFields)) {
-            foreach ($this->arrayFields as $key)
-                $data[$key] = explode("|", $data[$key]);
+            foreach ($this->arrayFields as $key) {
+                            $data[$key] = explode("|", $data[$key]);
+            }
         }
     }
 
@@ -564,8 +613,9 @@ 
      */
     protected function count() {
         $res = $this->db->ArrayBuilder()->getValue($this->dbTable, "count(*)");
-        if (!$res)
-            return 0;
+        if (!$res) {
+                    return 0;
+        }
         return $res;
     }
 
@@ -629,16 +679,19 @@ 
     protected function getOne($fields = null) {
         $this->processHasOneWith();
         $results = $this->db->ArrayBuilder()->getOne($this->dbTable, $fields);
-        if ($this->db->count == 0)
-            return null;
+        if ($this->db->count == 0) {
+                    return null;
+        }
 
         $this->processArrays($results);
         $this->data = $results;
         $this->processAllWith($results);
-        if ($this->returnType == 'Json')
-            return json_encode($results);
-        if ($this->returnType == 'Array')
-            return $results;
+        if ($this->returnType == 'Json') {
+                    return json_encode($results);
+        }
+        if ($this->returnType == 'Array') {
+                    return $results;
+        }
 
         $item = new static ($results);
         $item->isNew = false;
@@ -655,8 +708,9 @@ 
      * @return dbObject
      */
     private function with($objectName) {
-        if (!property_exists($this, 'relations') && !isset ($this->relations[$name]))
-            die ("No relation with name $objectName found");
+        if (!property_exists($this, 'relations') && !isset ($this->relations[$name])) {
+                    die ("No relation with name $objectName found");
+        }
 
         $this->_with[$objectName] = $this->relations[$objectName];
 
@@ -683,7 +737,9 @@ 
         $this->db->pageLimit = self::$pageLimit;
         $res = $this->db->paginate($this->dbTable, $page, $fields);
         self::$totalPages = $this->db->totalPages;
-        if ($this->db->count == 0) return null;
+        if ($this->db->count == 0) {
+            return null;
+        }
 
         foreach ($res as &$r) {
             $this->processArrays($r);
@@ -696,11 +752,13 @@ 
             }
         }
         $this->_with = Array();
-        if ($this->returnType == 'Object')
-            return $objects;
+        if ($this->returnType == 'Object') {
+                    return $objects;
+        }
 
-        if ($this->returnType == 'Json')
-            return json_encode($res);
+        if ($this->returnType == 'Json') {
+                    return json_encode($res);
+        }
 
         return $res;
     }