caoym / phpboot

src/ORM/ModelWithClass.php

Braces +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             ->getFirst();
         if($row){
             return $this->entity->make($row, false);
-        }else{
+        } else{
             return null;
         }
     }

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/Metas/ParamMeta.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
  * @package Once\route
  * 函数参数元信息
  */
-class ParamMeta{
+class ParamMeta {
 
     /**
      * ParamMeta constructor.
@@ -26,7 +26,7 @@ 
      * @param string $description
      * @param TypeContainerInterface|null $container
      */
-    public function __construct($name, $source, $type, $isOptional ,$default, $isPassedByReference,$validation, $description="", $container=null){
+    public function __construct($name, $source, $type, $isOptional, $default, $isPassedByReference, $validation, $description = "", $container = null) {
         $this->name = $name;
         $this->source = $source;
         $this->type = $type;

src/Metas/PropertyMeta.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
      * @param string $description
      * @param TypeContainerInterface|null $container
      */
-    public function __construct($name, $type=null, $isOptional=false,$default=null, $validation=null, $summary='', $description='', $container = null){
+    public function __construct($name, $type = null, $isOptional = false, $default = null, $validation = null, $summary = '', $description = '', $container = null) {
         $this->name = $name;
         $this->type = $type;
         $this->default = $default;
@@ -54,5 +54,5 @@ 
     /**
      * @var string
      */
-    public $description='';
+    public $description = '';
 }
\ No newline at end of file

src/Utils/SerializableFunc.php

Spacing +8 added lines, -8 removed lines

@@ -7,17 +7,17 @@ 
  * @author caoym
  *
  */
-class SerializableFunc{
+class SerializableFunc {
     /**
      * 方法,绑定参数
      * 如
      * func,arg1,arg2
      * array('a','method1'), arg1,arg2
      */
-    public  function __construct(callable $func){
+    public  function __construct(callable $func) {
         $args = func_get_args();
         $this->func = $func;
-        $this->bind = array_slice($args,1);
+        $this->bind = array_slice($args, 1);
     }
     
     /**
@@ -25,15 +25,15 @@ 
      * 调用时,将bind参数加在方法的最前面
      * @return mixed
      */
-    public function __invoke(){
+    public function __invoke() {
         $args = func_get_args();
         $params = $this->bind;
-        foreach ($args as $arg){
+        foreach ($args as $arg) {
             array_push($params, $arg);
         }
         $res = call_user_func_array($this->func, $params);
-        foreach ($this->next as $next){
-            call_user_func_array($next,$args);
+        foreach ($this->next as $next) {
+            call_user_func_array($next, $args);
         }
         return $res;
     }
@@ -41,7 +41,7 @@ 
      * 串行调用
      * @var callable[]
      */
-    public $next=array();
+    public $next = array();
     private $bind;
     private $func;
 }

src/Utils/ArrayHelper.php

Spacing +6 added lines, -6 removed lines

@@ -15,16 +15,16 @@
         $keys = explode('.', $key);
         $keys = array_reverse($keys);
         $cur = &$arr;
-        while($p = array_pop($keys)){
+        while ($p = array_pop($keys)) {
             $cur instanceof \ArrayAccess || is_array($cur) or \PhpBoot\abort(new \InvalidArgumentException('array or object of ArrayAccess required'));
-            if(!isset($cur[$p])){
-                if(count($keys) == 0){
+            if (!isset($cur[$p])) {
+                if (count($keys) == 0) {
                     $cur[$p] = $val;
-                }else{
+                }else {
                     $cur[$p] = [];
                 }
-            }else{
-                if(count($keys) == 0){
+            }else {
+                if (count($keys) == 0) {
                     $cur[$p] = $val;
                 }
             }

Braces +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
             if(!isset($cur[$p])){
                 if(count($keys) == 0){
                     $cur[$p] = $val;
-                }else{
+                } else{
                     $cur[$p] = [];
                 }
-            }else{
+            } else{
                 if(count($keys) == 0){
                     $cur[$p] = $val;
                 }

src/Utils/Logger.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
      */
     static public function getDefaultLogger()
     {
-        if(!self::$defaultLogger){
+        if (!self::$defaultLogger) {
             self::$defaultLogger = new \Monolog\Logger('default');
         }
         return self::$defaultLogger;

src/Utils/TypeCast.php

Spacing +13 added lines, -13 removed lines

@@ -14,46 +14,46 @@
     {
         TypeHint::isScalarType($type) or \PhpBoot\abort(new \InvalidArgumentException("$type is not scalar type"));
 
-        if(is_bool($val)){
+        if (is_bool($val)) {
             $val = intval($val);
-        }else if($val === null){
+        }else if ($val === null) {
             $map = [
                 'string'=>'',
                 'bool'=>false,
                 'int'=>0,
                 'float'=>0,
             ];
-            if(isset($map[$type])){
+            if (isset($map[$type])) {
                 $val = $map[$type];
             }
         }
-        if(is_object($val)){
-            try{
+        if (is_object($val)) {
+            try {
                 $val = (string)$val;
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
                 $className = get_class($val);
                 \PhpBoot\abort(new \InvalidArgumentException("could not cast value from class $className to {$type}"));
             }
 
         }
-        if(is_array($val)){
-            $type == 'array' ||  $type =='mixed' || !$type or \PhpBoot\abort(new \InvalidArgumentException("could not cast value from resource to {$type}"));
+        if (is_array($val)) {
+            $type == 'array' || $type == 'mixed' || !$type or \PhpBoot\abort(new \InvalidArgumentException("could not cast value from resource to {$type}"));
         }
-        if(is_resource($val)) {
+        if (is_resource($val)) {
             \PhpBoot\abort(new \InvalidArgumentException("could not cast value from resource to {$type}"));
         }
-        if(!$validate){
+        if (!$validate) {
             settype($val, $type) or \PhpBoot\abort(new \InvalidArgumentException("cast value($val) to {$type} failed"));
-        }else{
+        }else {
             $ori = $val;
             $oriType = gettype($val);
             settype($val, $type) or \PhpBoot\abort(new \InvalidArgumentException("cast value($ori) to type {$type} failed"));
             $newData = $val;
-            if(is_bool($newData)){
+            if (is_bool($newData)) {
                 $newData = intval($newData);
             }
             settype($newData, $oriType) or \PhpBoot\abort(new \InvalidArgumentException("cast value($ori) to type {$type} failed"));
-            if($ori != $newData){
+            if ($ori != $newData) {
                 \PhpBoot\abort(new \InvalidArgumentException("could not cast value($ori) to type {$type}"));
             }
         }

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
         if(is_bool($val)){
             $val = intval($val);
-        }else if($val === null){
+        } else if($val === null){
             $map = [
                 'string'=>'',
                 'bool'=>false,
@@ -30,7 +30,7 @@ 
         if(is_object($val)){
             try{
                 $val = (string)$val;
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 $className = get_class($val);
                 \PhpBoot\abort(new \InvalidArgumentException("could not cast value from class $className to {$type}"));
             }
@@ -44,7 +44,7 @@ 
         }
         if(!$validate){
             settype($val, $type) or \PhpBoot\abort(new \InvalidArgumentException("cast value($val) to {$type} failed"));
-        }else{
+        } else{
             $ori = $val;
             $oriType = gettype($val);
             settype($val, $type) or \PhpBoot\abort(new \InvalidArgumentException("cast value($ori) to type {$type} failed"));

src/Utils/ArrayAdaptor.php

Spacing +28 added lines, -28 removed lines

@@ -26,19 +26,19 @@ 
      */
     public function offsetExists($offset)
     {
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             return array_key_exists($offset, $this->obj);
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             return true;
-        }elseif(method_exists($this->obj, 'has')){
+        }elseif (method_exists($this->obj, 'has')) {
             return $this->obj->has($offset);
-        }elseif(method_exists($this->obj, $method = 'has'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'has'.ucfirst($offset))) {
             return $this->obj->{$method}($offset);
-        }elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'get'.ucfirst($offset))) {
             return $this->obj->{$method}() !== null;
-        }elseif(method_exists($this->obj, 'get')){
+        }elseif (method_exists($this->obj, 'get')) {
             return $this->obj->get($offset) !== null;
-        }else{
+        }else {
             return false;
         }
     }
@@ -55,18 +55,18 @@ 
     public function offsetGet($offset)
     {
         $res = null;
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             $res = &$this->obj[$offset];
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             $res = &$this->obj->{$offset};
-        }elseif(method_exists($this->obj, 'get')){
+        }elseif (method_exists($this->obj, 'get')) {
             $res = $this->obj->get($offset);
-        }elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'get'.ucfirst($offset))) {
             $res = $this->obj->{$method}();
-        }else{
+        }else {
             throw new \InvalidArgumentException("offsetGet($offset) failed");
         }
-        if(is_array($res) || is_object($res)){
+        if (is_array($res) || is_object($res)) {
             return new self($res);
         }
         return $res;
@@ -86,15 +86,15 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             $this->obj[$offset] = $value;
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             $this->obj->{$offset} = $value;
-        }elseif(method_exists($this->obj, 'set')){
+        }elseif (method_exists($this->obj, 'set')) {
             $this->obj->set($offset, $value);
-        }elseif(method_exists($this->obj, $method = 'set'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'set'.ucfirst($offset))) {
             $this->obj->{$method}($value);
-        }else{
+        }else {
             throw new \BadMethodCallException("can not set $offset");
         }
     }
@@ -110,35 +110,35 @@ 
      */
     public function offsetUnset($offset)
     {
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             unset($this->obj[$offset]);
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             unset($this->obj->{$offset});
-        }elseif(method_exists($this->obj, 'remove')){
+        }elseif (method_exists($this->obj, 'remove')) {
             $this->obj->remove($offset);
-        }elseif(method_exists($this->obj, $method = 'remove'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'remove'.ucfirst($offset))) {
             $this->obj->$method();
-        }else{
+        }else {
             throw new \InvalidArgumentException("offsetUnset($offset) failed");
         }
     }
-    static public function strip($obj){
-        if($obj instanceof self){
+    static public function strip($obj) {
+        if ($obj instanceof self) {
             return $obj->obj;
         }
         return $obj;
     }
     static function hasProperty($object, $name)
     {
-        if(!is_object($object)){
+        if (!is_object($object)) {
             return false;
         }
         $class = new \ReflectionClass($object);
-        if(!$class->hasProperty($name)){
+        if (!$class->hasProperty($name)) {
             return false;
         }
         $property = $class->getProperty($name);
-        if(!$property){
+        if (!$property) {
             return false;
         }
         return $property->isPublic();

Braces +18 added lines, -18 removed lines

@@ -28,17 +28,17 @@ 
     {
         if(is_array($this->obj)){
             return array_key_exists($offset, $this->obj);
-        }elseif(self::hasProperty($this->obj, $offset)){
+        } elseif(self::hasProperty($this->obj, $offset)){
             return true;
-        }elseif(method_exists($this->obj, 'has')){
+        } elseif(method_exists($this->obj, 'has')){
             return $this->obj->has($offset);
-        }elseif(method_exists($this->obj, $method = 'has'.ucfirst($offset))){
+        } elseif(method_exists($this->obj, $method = 'has'.ucfirst($offset))){
             return $this->obj->{$method}($offset);
-        }elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
+        } elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
             return $this->obj->{$method}() !== null;
-        }elseif(method_exists($this->obj, 'get')){
+        } elseif(method_exists($this->obj, 'get')){
             return $this->obj->get($offset) !== null;
-        }else{
+        } else{
             return false;
         }
     }
@@ -57,13 +57,13 @@ 
         $res = null;
         if(is_array($this->obj)){
             $res = &$this->obj[$offset];
-        }elseif(self::hasProperty($this->obj, $offset)){
+        } elseif(self::hasProperty($this->obj, $offset)){
             $res = &$this->obj->{$offset};
-        }elseif(method_exists($this->obj, 'get')){
+        } elseif(method_exists($this->obj, 'get')){
             $res = $this->obj->get($offset);
-        }elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
+        } elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
             $res = $this->obj->{$method}();
-        }else{
+        } else{
             throw new \InvalidArgumentException("offsetGet($offset) failed");
         }
         if(is_array($res) || is_object($res)){
@@ -88,13 +88,13 @@ 
     {
         if(is_array($this->obj)){
             $this->obj[$offset] = $value;
-        }elseif(self::hasProperty($this->obj, $offset)){
+        } elseif(self::hasProperty($this->obj, $offset)){
             $this->obj->{$offset} = $value;
-        }elseif(method_exists($this->obj, 'set')){
+        } elseif(method_exists($this->obj, 'set')){
             $this->obj->set($offset, $value);
-        }elseif(method_exists($this->obj, $method = 'set'.ucfirst($offset))){
+        } elseif(method_exists($this->obj, $method = 'set'.ucfirst($offset))){
             $this->obj->{$method}($value);
-        }else{
+        } else{
             throw new \BadMethodCallException("can not set $offset");
         }
     }
@@ -112,13 +112,13 @@ 
     {
         if(is_array($this->obj)){
             unset($this->obj[$offset]);
-        }elseif(self::hasProperty($this->obj, $offset)){
+        } elseif(self::hasProperty($this->obj, $offset)){
             unset($this->obj->{$offset});
-        }elseif(method_exists($this->obj, 'remove')){
+        } elseif(method_exists($this->obj, 'remove')){
             $this->obj->remove($offset);
-        }elseif(method_exists($this->obj, $method = 'remove'.ucfirst($offset))){
+        } elseif(method_exists($this->obj, $method = 'remove'.ucfirst($offset))){
             $this->obj->$method();
-        }else{
+        } else{
             throw new \InvalidArgumentException("offsetUnset($offset) failed");
         }
     }

src/Annotation/ContainerBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -41,22 +41,22 @@ 
         //TODO【重要】 使用全局的缓存版本号, 而不是针对每个文件判断缓存过期与否
         $rfl = new \ReflectionClass($className) or \PhpBoot\abort("load class $className failed");
         $fileName = $rfl->getFileName();
-        $key = str_replace('\\','.',get_class($this)).md5(serialize($this->annotations).$fileName.$className);
+        $key = str_replace('\\', '.', get_class($this)).md5(serialize($this->annotations).$fileName.$className);
         $cache = new CheckableCache($this->cache);
         $res = $cache->get($key, $this);
-        if($res === $this){
-            try{
+        if ($res === $this) {
+            try {
                 $meta = $this->buildWithoutCache($className);
-                $cache->set($key, $meta, 0, $fileName?new ClassModifiedChecker($className):null);
+                $cache->set($key, $meta, 0, $fileName ? new ClassModifiedChecker($className) : null);
                 return $meta;
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
                 Logger::warning(__METHOD__.' failed with '.$e->getMessage());
-                $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
+                $cache->set($key, $e->getMessage(), 0, $fileName ? new ClassModifiedChecker($className) : null);
                 throw $e;
             }
-        }elseif(is_string($res)){
+        }elseif (is_string($res)) {
             \PhpBoot\abort($res);
-        }else{
+        }else {
             return $res;
         }
     }
@@ -68,7 +68,7 @@ 
     abstract protected function createContainer($className);
 
 
-    protected function handleAnnotation($handlerName, $container, $ann){
+    protected function handleAnnotation($handlerName, $container, $ann) {
         $handler = new $handlerName();
         return $handler($container, $ann);
     }
@@ -80,15 +80,15 @@ 
     {
         $container = $this->createContainer($className);
         $anns = AnnotationReader::read($className, $this->cache);
-        foreach ($this->annotations as $i){
+        foreach ($this->annotations as $i) {
             list($class, $target) = $i;
 
             $found = \JmesPath\search($target, $anns);
-            if(is_array($found)){
-                foreach ($found as $f){
-                    $this->handleAnnotation($class, $container,$f); //TODO 支持
+            if (is_array($found)) {
+                foreach ($found as $f) {
+                    $this->handleAnnotation($class, $container, $f); //TODO 支持
                 }
-            }else{
+            }else {
                 $this->handleAnnotation($class, $container, $found);
             }
         }
@@ -98,7 +98,7 @@ 
     /**
      * @var array
      */
-    private $annotations=[];
+    private $annotations = [];
     /**
      * @var Cache
      */

Braces +4 added lines, -4 removed lines

@@ -49,14 +49,14 @@ 
                 $meta = $this->buildWithoutCache($className);
                 $cache->set($key, $meta, 0, $fileName?new ClassModifiedChecker($className):null);
                 return $meta;
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 Logger::warning(__METHOD__.' failed with '.$e->getMessage());
                 $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
                 throw $e;
             }
-        }elseif(is_string($res)){
+        } elseif(is_string($res)){
             \PhpBoot\abort($res);
-        }else{
+        } else{
             return $res;
         }
     }
@@ -88,7 +88,7 @@ 
                 foreach ($found as $f){
                     $this->handleAnnotation($class, $container,$f); //TODO 支持
                 }
-            }else{
+            } else{
                 $this->handleAnnotation($class, $container, $found);
             }
         }