caoym / phpboot

src/ORM/ModelWithClass.php

Doc Comments +1 added lines, -2 removed lines

@@ -49,7 +49,6 @@ 
 
     /**
      * where 语法见 @see WhereRule
-     * @param array|string $expr
      * @param mixed|null $_
      * @return \PhpBoot\DB\rules\basic\OrderByRule
      */
@@ -91,7 +90,7 @@ 
     /**
      * @param int|string $id
      * @param array $values
-     * @return int updated row count
+     * @return \PhpBoot\DB\impls\ExecResult updated row count
      */
     public function update($id, $values)
     {

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\OrderByRule
      */
-    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\GroupByRule
      */
-    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\OrderByRule
      */
-    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;

src/DB/DB.php

Spacing +18 added lines, -18 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->getConnection()->beginTransaction() or \PhpBoot\abort('beginTransaction failed');
         $this->inTransaction = true;
-        try{
+        try {
             $res = $callback();
             $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,7 +191,7 @@ 
      * @param string $str
      * @return Raw
      */
-    static public function raw($str){
+    static public function raw($str) {
         return new Raw($str);
     }
     static public function wrap($value)
@@ -199,7 +199,7 @@ 
         if ($value === '*') {
             return $value;
         }
-        if($value instanceof Raw){
+        if ($value instanceof Raw) {
             return $value->get();
         }
         return '`'.str_replace('`', '``', $value).'`';
@@ -212,8 +212,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

Braces +3 added lines, -3 removed lines

@@ -101,9 +101,9 @@ 
         $obj = new SelectRule(new Context($this->connection));
         if($column0 == null){
             $args = ['*'];
-        }elseif(is_array($column0)){
+        } elseif(is_array($column0)){
             $args = $column0;
-        }else{
+        } else{
             $args = func_get_args();
         }
         foreach ($args as &$arg){
@@ -170,7 +170,7 @@ 
             $res = $callback();
             $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;