caoym / phpboot

src/DB/impls.php

Spacing +146 added lines, -146 removed lines

@@ -7,14 +7,14 @@ 
 use PhpBoot\DB\rules\basic\BasicRule;
 use PhpBoot\DB\Context;
 
-class ExecResult{
-    public function __construct($success, $pdo, $st){
+class ExecResult {
+    public function __construct($success, $pdo, $st) {
         $this->pdo = $pdo;
         $this->st = $st;
         $this->success = $success;
         $this->rows = $this->st->rowCount();
     }
-    public function lastInsertId($name=null){
+    public function lastInsertId($name = null) {
         return $this->pdo->lastInsertId($name);
     }
     /**
@@ -41,21 +41,21 @@ 
 
 class SelectImpl
 {
-    static  public function select($context, $columns){
+    static  public function select($context, $columns) {
         $context->appendSql("SELECT $columns");
     }
 }
 
 class FromImpl
 {
-    static public function from($context, $tables,$as=null){
-        if($tables instanceof BasicRule){
+    static public function from($context, $tables, $as = null) {
+        if ($tables instanceof BasicRule) {
             $context->appendSql("FROM (".$tables->context->sql.')');
-            $context->params = array_merge($context->params,$tables->context->params);
+            $context->params = array_merge($context->params, $tables->context->params);
         }else {
             $context->appendSql("FROM ".DB::wrap($tables));
         }
-        if($as){
+        if ($as) {
             $context->appendSql("as ".DB::wrap($as));
         }
     }
@@ -73,9 +73,9 @@ 
 {
     static public function join($context, $type, $table) {
         $table = DB::wrap($table);
-        if($type){
+        if ($type) {
             $context->appendSql("$type JOIN $table");
-        }else{
+        }else {
             $context->appendSql("JOIN $table");
         }
     }
@@ -90,14 +90,14 @@ 
 
 class ForUpdateImpl
 {
-    static public function forUpdate($context){
+    static public function forUpdate($context) {
         $context->appendSql("FOR UPDATE");
     }
 }
 
 class ForUpdateOfImpl
 {
-    static public function of($context, $column){
+    static public function of($context, $column) {
         $column = DB::wrap($column);
         $context->appendSql("OF $column");
     }
@@ -119,27 +119,27 @@ 
 }
 class ValuesImpl
 {
-    static public function values($context, $values){
+    static public function values($context, $values) {
         $params = [];
         $stubs = [];
-        foreach ($values as $v){
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $stubs[]=$v->get();
-            }else{
-                $stubs[]='?';
+        foreach ($values as $v) {
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $stubs[] = $v->get();
+            }else {
+                $stubs[] = '?';
                 $params[] = $v;
             }
         }
         $stubs = implode(',', $stubs);
 
-        if(array_keys($values) === range(0, count($values) - 1)){
+        if (array_keys($values) === range(0, count($values) - 1)) {
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        }else {
             //(col0, col1, col2) VALUES(val0, val1, val2)
-            $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values)));
-            $context->appendSql("($columns) VALUES($stubs)",false);
+            $columns = implode(',', array_map(function($k) {return DB::wrap($k); }, array_keys($values)));
+            $context->appendSql("($columns) VALUES($stubs)", false);
         }
         $context->appendParams($params);
     }
@@ -148,7 +148,7 @@ 
 
 class UpdateImpl
 {
-    static public function update($context, $table){
+    static public function update($context, $table) {
         $table = DB::wrap($table);
         $context->appendSql("UPDATE $table");
     }
@@ -156,81 +156,81 @@ 
 
 class UpdateSetImpl
 {
-    public function set(Context $context, $expr, $args){
-        if(is_string($expr)){
+    public function set(Context $context, $expr, $args) {
+        if (is_string($expr)) {
             return $this->setExpr($context, $expr, $args);
-        }else{
+        }else {
             return $this->setArgs($context, $expr);
         }
     }
 
-    public function setExpr(Context $context, $expr, $args){
-        if($this->first){
+    public function setExpr(Context $context, $expr, $args) {
+        if ($this->first) {
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        }else {
             $prefix = ',';
         }
 
-        $context->appendSql("$prefix$expr",$prefix == 'SET ');
+        $context->appendSql("$prefix$expr", $prefix == 'SET ');
         $context->appendParams($args);
 
     }
-    public function setArgs(Context $context, $values){
+    public function setArgs(Context $context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
+        foreach ($values as $k=>$v) {
             $k = DB::wrap($k);
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $set[] = "$k=".$v->get();
+            }else {
+                $set[] = "$k=?";
+                $params[] = $v;
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
-            $context->appendSql(','.implode(',', $set),false);
+        }else {
+            $context->appendSql(','.implode(',', $set), false);
             $context->appendParams($params);
         }
     }
-    private $first=true;
+    private $first = true;
 }
 class OrderByImpl
 {
-    public function orderByArgs(Context $context, $orders){
-        if(empty($orders)){
+    public function orderByArgs(Context $context, $orders) {
+        if (empty($orders)) {
             return $this;
         }
         $params = array();
-        foreach ($orders as $k=>$v){
-            if(is_integer($k)){
+        foreach ($orders as $k=>$v) {
+            if (is_integer($k)) {
                 $params[] = DB::wrap($v);
-            }else{
+            }else {
                 $k = DB::wrap($k);
 
                 $v = strtoupper($v);
-                ($v =='DESC' || $v =='ASC') or \PhpBoot\abort( new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
+                ($v == 'DESC' || $v == 'ASC') or \PhpBoot\abort(new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
 
                 $params[] = "$k $v";
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
-            $context->appendSql(','.implode(',', $params),false);
+        }else {
+            $context->appendSql(','.implode(',', $params), false);
         }
         return $this;
     }
-    public function orderBy(Context $context, $column, $order=null){
-        if(is_string($column)){
-            if($order === null){
+    public function orderBy(Context $context, $column, $order = null) {
+        if (is_string($column)) {
+            if ($order === null) {
                 $column = [$column];
-            }else{
+            }else {
                 $column = [$column=>$order];
             }
         }
@@ -238,18 +238,18 @@ 
 
 
     }
-    private $first=true;
+    private $first = true;
 }
 
 class LimitImpl
 {
-    static public function limit(Context $context, $size){
+    static public function limit(Context $context, $size) {
         $intSize = intval($size);
         strval($intSize) == $size or \PhpBoot\abort(
             new \InvalidArgumentException("invalid params for limit($size)"));
         $context->appendSql("LIMIT $size");
     }
-    static public function limitWithOffset(Context $context, $start, $size){
+    static public function limitWithOffset(Context $context, $start, $size) {
         $intStart = intval($start);
         $intSize = intval($size);
         strval($intStart) == $start && strval($intSize) == $size or \PhpBoot\abort(
@@ -258,31 +258,31 @@ 
     }
 }
 
-class WhereImpl{
+class WhereImpl {
 
-    static private function findQ($str,$offset = 0,$no=0){
+    static private function findQ($str, $offset = 0, $no = 0) {
         $found = strpos($str, '?', $offset);
-        if($no == 0 || $found === false){
+        if ($no == 0 || $found === false) {
             return $found;
         }
-        return self::findQ($str, $found+1, $no-1);
+        return self::findQ($str, $found + 1, $no - 1);
     }
 
-    static public function where(Context $context, $prefix, $expr, $args){
-        if(empty($expr)){
+    static public function where(Context $context, $prefix, $expr, $args) {
+        if (empty($expr)) {
             return;
         }
-        if(is_callable($expr)){
-            self::conditionClosure($context,$prefix, $expr);
-        }elseif (is_string($expr)){
+        if (is_callable($expr)) {
+            self::conditionClosure($context, $prefix, $expr);
+        }elseif (is_string($expr)) {
             self::condition($context, $prefix, $expr, $args);
-        }else{
+        }else {
             self::conditionArgs($context, $prefix, $expr);
         }
 
     }
 
-    static public function conditionClosure(Context $context, $prefix, callable $callback){
+    static public function conditionClosure(Context $context, $prefix, callable $callback) {
         $context->appendSql($prefix.' (');
         $callback($context);
         $context->appendSql(')');
@@ -308,15 +308,15 @@ 
      * NOT IN   'id'=>['NOT IN' => [1,2,3]]
      * @return void
      */
-    static public function conditionArgs(Context $context, $prefix, $args=[]){
-        if($args ===null){
-            return ;
+    static public function conditionArgs(Context $context, $prefix, $args = []) {
+        if ($args === null) {
+            return;
         }
         $exprs = array();
         $params = array();
-        foreach ($args as $k => $v){
+        foreach ($args as $k => $v) {
             $k = DB::wrap($k);
-            if(is_array($v)){
+            if (is_array($v)) {
                 $ops = ['=', '>', '<', '<>', '>=', '<=', 'IN', 'NOT IN', 'BETWEEN', 'LIKE'];
                 $op = array_keys($v)[0];
                 $op = strtoupper($op);
@@ -325,46 +325,46 @@ 
                     new \InvalidArgumentException("invalid param $op for whereArgs"));
 
                 $var = array_values($v)[0];
-                if($op == 'IN' || $op == 'NOT IN'){
+                if ($op == 'IN' || $op == 'NOT IN') {
                     $stubs = [];
-                    foreach ($var as $i){
-                        if(is_a($i, Raw::class)){
-                            $stubs[]=strval($i);
-                        }else{
-                            $stubs[]='?';
+                    foreach ($var as $i) {
+                        if (is_a($i, Raw::class)) {
+                            $stubs[] = strval($i);
+                        }else {
+                            $stubs[] = '?';
                             $params[] = $i;
                         }
                     }
                     $stubs = implode(',', $stubs);
                     $exprs[] = "$k $op ($stubs)";
-                }else if($op == 'BETWEEN'){
+                }else if ($op == 'BETWEEN') {
                     $cond = "$k BETWEEN";
-                    if(is_a($var[0], Raw::class)){
+                    if (is_a($var[0], Raw::class)) {
                         $cond = "$cond ".strval($var[0]);
-                    }else{
+                    }else {
                         $cond = "$cond ?";
                         $params[] = $var[0];
                     }
-                    if(is_a($var[1], Raw::class)){
+                    if (is_a($var[1], Raw::class)) {
                         $cond = "$cond AND ".strval($var[1]);
-                    }else{
+                    }else {
                         $cond = "$cond AND ?";
                         $params[] = $var[1];
                     }
                     $exprs[] = $cond;
-                }else{
-                    if(is_a($var, Raw::class)){
+                }else {
+                    if (is_a($var, Raw::class)) {
                         $exprs[] = "$k $op ".strval($var);
-                    }else{
+                    }else {
                         $exprs[] = "$k $op ?";
                         $params[] = $var;
                     }
                 }
-            }else{
-                if(is_a($v, Raw::class)){
+            }else {
+                if (is_a($v, Raw::class)) {
                     $exprs[] = "$k = ".strval($v);
 
-                }else{
+                }else {
                     $exprs[] = "$k = ?";
                     $params[] = $v;
                 }
@@ -373,21 +373,21 @@ 
 
         self::condition($context, $prefix, implode(' AND ', $exprs), $params);
     }
-    static public function condition(Context $context, $prefix, $expr, $args){
-        if(!empty($expr)){
+    static public function condition(Context $context, $prefix, $expr, $args) {
+        if (!empty($expr)) {
             $expr = "($expr)";
-            if($args){
+            if ($args) {
                 //因为PDO不支持绑定数组变量, 这里需要手动展开数组
                 //也就是说把 where("id IN(?)", [1,2])  展开成 where("id IN(?,?)", 1,2)
                 $cutted = null;
                 $cut = null;
                 $toReplace = array();
 
-                $newArgs=array();
+                $newArgs = array();
                 //找到所有数组对应的?符位置
-                foreach ($args as $k =>$arg){
-                    if(is_array($arg) || is_a($arg, Raw::class)){
-                        if(!$cutted){
+                foreach ($args as $k =>$arg) {
+                    if (is_array($arg) || is_a($arg, Raw::class)) {
+                        if (!$cutted) {
                             $cut = new NestedStringCut($expr);
                             $cutted = $cut->getText();
                         }
@@ -397,51 +397,51 @@ 
                         $pos !== false or \PhpBoot\abort(
                             new \InvalidArgumentException("unmatched params and ? @ $expr"));
 
-                        if(is_array($arg)){
+                        if (is_array($arg)) {
                             $stubs = [];
-                            foreach ($arg as $i){
-                                if(is_a($i, Raw::class)){
+                            foreach ($arg as $i) {
+                                if (is_a($i, Raw::class)) {
                                     $stubs[] = strval($i);
-                                }else{
+                                }else {
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }else{
+                        }else {
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
-                        $newArgs[]=$arg;
+                    }else {
+                        $newArgs[] = $arg;
                     }
                 }
 
-                if(count($toReplace)){
+                if (count($toReplace)) {
                     $toReplace = array_reverse($toReplace);
-                    foreach ($toReplace as $i){
+                    foreach ($toReplace as $i) {
                         list($pos, $v) = $i;
-                        $expr = substr($expr, 0, $pos).$v. substr($expr, $pos+1);
+                        $expr = substr($expr, 0, $pos).$v.substr($expr, $pos + 1);
                     }
                     $args = $newArgs;
                 }
             }
-            if($prefix){
+            if ($prefix) {
                 $context->appendSql($prefix.' '.$expr);
-            }else{
+            }else {
                 $context->appendSql($expr);
             }
 
-            if($args){
+            if ($args) {
                 $context->appendParams($args);
             }
         }
     }
 }
 
-class GroupByImpl{
-    static public function groupBy(Context $context, $column){
+class GroupByImpl {
+    static public function groupBy(Context $context, $column) {
         $column = DB::wrap($column);
         $context->appendSql("GROUP BY $column");
     }
@@ -466,20 +466,20 @@ 
      * @param string|false $asDict return  as dict or array
      * @return false|array
      */
-    static public function get($context, $dictAs=false){
+    static public function get($context, $dictAs = false) {
 
         $st = $context->connection->prepare($context->sql);
-        if($st->execute($context->params)){
+        if ($st->execute($context->params)) {
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
-            if ($dictAs){
-                $dict= [];
-                foreach ($res as $i){
-                    $dict[$i[$dictAs]]=$i;
+            if ($dictAs) {
+                $dict = [];
+                foreach ($res as $i) {
+                    $dict[$i[$dictAs]] = $i;
                 }
                 return $context->handleResult($dict);
             }
             return $context->handleResult($res);
-        }else{
+        }else {
             return false;
         }
     }
@@ -488,22 +488,22 @@ 
      * @param Context $context
      * @return int|false
      */
-    static public function count($context){
+    static public function count($context) {
 
         $found = [];
-        if(!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        if (!preg_match('/\bselect\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             \PhpBoot\abort(new \PDOException("can not use count(*) without select"));
         }
         list($chars, $columnBegin) = $found[0];
-        $columnBegin = $columnBegin + strlen('select')+1;
+        $columnBegin = $columnBegin + strlen('select') + 1;
 
         $columnEnd = 0;
         $found = [];
-        if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        if (!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             $columnEnd = strlen($context->sql);
-        }else{
+        }else {
             list($chars, $columnEnd) = $found[0];
         }
         $sql = substr($context->sql, 0, $columnBegin);
@@ -511,10 +511,10 @@ 
         $sql .= substr($context->sql, $columnEnd);
 
         $st = $context->connection->prepare($sql);
-        if($st->execute($context->params)){
+        if ($st->execute($context->params)) {
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
             return $res[0]['count'];
-        }else{
+        }else {
             return false;
         }
 
@@ -522,47 +522,47 @@ 
 }
 class OnDuplicateKeyUpdateImpl
 {
-    public function set($context, $column, $value){
-        if(is_string($column)){
+    public function set($context, $column, $value) {
+        if (is_string($column)) {
             $this->setExpr($context, $column, $value);
-        }else{
+        }else {
             $this->setArgs($context, $column);
         }
     }
 
-    public function setExpr($context, $expr, $args){
+    public function setExpr($context, $expr, $args) {
         $prefix = '';
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        }else {
             $prefix = ',';
         }
 
-        $context->appendSql("$prefix$expr",$prefix == 'ON DUPLICATE KEY UPDATE ');
+        $context->appendSql("$prefix$expr", $prefix == 'ON DUPLICATE KEY UPDATE ');
         $context->appendParams($args);
 
     }
-    public function setArgs($context, $values){
+    public function setArgs($context, $values) {
         $set = [];
         $params = [];
-        foreach ($values as $k=>$v){
+        foreach ($values as $k=>$v) {
             $k = DB::wrap($k);
-            if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
-                $set[]= "$k=".$v->get();
-            }else{
-                $set[]= "$k=?";
-                $params[]=$v;
+            if (is_a($v, Raw::class)) {//直接拼接sql，不需要转义
+                $set[] = "$k=".$v->get();
+            }else {
+                $set[] = "$k=?";
+                $params[] = $v;
             }
         }
-        if($this->first){
+        if ($this->first) {
             $this->first = false;
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
             $context->appendParams($params);
-        }else{
-            $context->appendSql(','.implode(',', $set),false);
+        }else {
+            $context->appendSql(','.implode(',', $set), false);
             $context->appendParams($params);
         }
     }
-    private $first=true;
+    private $first = true;
 }

src/Controller/Annotations/ReturnAnnotationHandler.php

Spacing +6 added lines, -6 removed lines

@@ -21,20 +21,20 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
         $type = $doc = null;
-        if(count($params)>0){
+        if (count($params)>0) {
             $type = TypeHint::normalize($params[0], $container->getClassName());
         }
         $doc = $params->getRawParam(1, '');
@@ -42,10 +42,10 @@ 
         list($_, $meta) = $route
             ->getResponseHandler()
             ->getMappingBySource('return');
-        if($meta){
+        if ($meta) {
             $meta->description = $doc;
             $meta->type = $type;
-            $meta->container = $type == 'void'?null:ContainerFactory::create($entityBuilder, $type);
+            $meta->container = $type == 'void' ?null:ContainerFactory::create($entityBuilder, $type);
         }
     }
 }
\ No newline at end of file

src/Validator/Validator.php

Spacing +3 added lines, -3 removed lines

@@ -55,12 +55,12 @@
      */
     public function rule($rule, $fields)
     {
-        if(is_string($rule)){
+        if (is_string($rule)) {
             $rules = explode('|', $rule);
-            foreach ($rules as $r){
+            foreach ($rules as $r) {
                 $params = explode(':', trim($r));
                 $rule = $params[0];
-                $params = isset($params[1])?explode(',', $params[1]):[];
+                $params = isset($params[1]) ?explode(',', $params[1]) : [];
 
                 call_user_func_array([$this, 'parent::rule'], array_merge([$rule, $fields], $params));
 

src/DB/DB.php

Spacing +19 added lines, -19 removed lines

@@ -56,7 +56,7 @@ 
  *      
  * @author caoym <caoyangmin@gmail.com>
  */
-class DB{
+class DB {
 
     /**
      * DB constructor.
@@ -97,18 +97,18 @@ 
      * @param string $column0
      * @return \PhpBoot\DB\rules\select\FromRule
      */
-    function select($column0=null, $_=null){
+    function select($column0 = null, $_ = null) {
         $obj = new SelectRule(new Context($this->connection));
-        if($column0 == null){
+        if ($column0 == null) {
             $args = ['*'];
-        }elseif(is_array($column0)){
+        }elseif (is_array($column0)) {
             $args = $column0;
-        }else{
+        }else {
             $args = func_get_args();
         }
-        foreach ($args as &$arg){
+        foreach ($args as &$arg) {
             $arg = DB::wrap($arg);
-            if($arg == '*'){
+            if ($arg == '*') {
                 continue;
             }
 
@@ -140,8 +140,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function deleteFrom($table){
-        $obj  =  new DeleteRule(new Context($this->connection));
+    public function deleteFrom($table) {
+        $obj = new DeleteRule(new Context($this->connection));
         return $obj->deleteFrom($table);
     }
     /**
@@ -149,8 +149,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\replace\ValuesRule
      */
-    public function replaceInto($table){
-        $obj  =  new ReplaceIntoRule(new Context($this->connection));
+    public function replaceInto($table) {
+        $obj = new ReplaceIntoRule(new Context($this->connection));
         return $obj->replaceInto($table);
     }
 
@@ -161,16 +161,16 @@ 
      */
     public function transaction(callable $callback)
     {
-        if($this->inTransaction){
+        if ($this->inTransaction) {
             return $callback($this);
         }
         $this->getConnection()->beginTransaction() or \PhpBoot\abort('beginTransaction failed');
         $this->inTransaction = true;
-        try{
+        try {
             $res = $callback($this);
             $this->getConnection()->commit() or \PhpBoot\abort('commit failed');
             return $res;
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $this->getConnection()->rollBack();
             Logger::warning('commit failed with '.get_class($e).' '.$e->getMessage());
             throw $e;
@@ -191,12 +191,12 @@ 
      * @param string $str
      * @return Raw
      */
-    static public function raw($str){
+    static public function raw($str) {
         return new Raw($str);
     }
     static public function wrap($value)
     {
-        if($value instanceof Raw){
+        if ($value instanceof Raw) {
             return $value->get();
         }
         $value = trim($value);
@@ -204,7 +204,7 @@ 
             return $value;
         }
 
-        if(strpos($value, '.') !== false && !preg_match('/\\s+/', $value)){
+        if (strpos($value, '.') !== false && !preg_match('/\\s+/', $value)) {
             return $value;
         }
         return '`'.str_replace('`', '``', $value).'`';
@@ -217,8 +217,8 @@ 
     {
         return $this->app;
     }
-    const ORDER_BY_ASC ='ASC';
-    const ORDER_BY_DESC ='DESC';
+    const ORDER_BY_ASC = 'ASC';
+    const ORDER_BY_DESC = 'DESC';
 
     /**
      * @var \PDO

src/ORM/ModelWithClass.php

Spacing +11 added lines, -11 removed lines

@@ -29,9 +29,9 @@ 
             ->from($this->entity->getTable())
             ->where("`{$this->entity->getPK()}` = ?", $id)
             ->getFirst();
-        if($row){
+        if ($row) {
             return $this->entity->make($row, false);
-        }else{
+        }else {
             return null;
         }
     }
@@ -53,7 +53,7 @@ 
      * @param mixed|null $_
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function deleteWhere($conditions, $_=null)
+    public function deleteWhere($conditions, $_ = null)
     {
         $query = $this->db->deleteFrom($this->entity->getTable());
         return call_user_func_array([$query, 'where'], func_get_args());
@@ -75,12 +75,12 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\WhereRule
      */
-    public function findWhere($conditions=null, $_=null)
+    public function findWhere($conditions = null, $_ = null)
     {
-        $query =  $this->db->select($this->getColumns())
+        $query = $this->db->select($this->getColumns())
             ->from($this->entity->getTable());
-        $query->context->resultHandler = function ($result){
-            foreach ($result as &$i){
+        $query->context->resultHandler = function($result) {
+            foreach ($result as &$i) {
                 $i = $this->entity->make($i, false);
             }
             return $result;
@@ -107,16 +107,16 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function updateWhere($values, $conditions, $_=null)
+    public function updateWhere($values, $conditions, $_ = null)
     {
-        $query =  $this->db->update($this->entity->getTable())->set($values);
-        return call_user_func_array([$query, 'where'], array_slice(func_get_args(),1));
+        $query = $this->db->update($this->entity->getTable())->set($values);
+        return call_user_func_array([$query, 'where'], array_slice(func_get_args(), 1));
     }
 
     protected function getColumns()
     {
         $columns = [];
-        foreach ($this->entity->getProperties() as $p){
+        foreach ($this->entity->getProperties() as $p) {
             $columns[] = $p->name;
         }
         return $columns;