caoym / phpboot

src/DI/DIMetaLoader.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 class DIMetaLoader extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [VarAnnotationHandler::class, "properties.*.children[?name=='var'][]"],
         [InjectAnnotationHandler::class, "properties.*.children[?name=='inject'][]"]
     ];

src/DI/AnnotationReader.php

Spacing +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
         }
 
         $class = new \ReflectionClass($name);
-        if(isset($name::$__enableDIAnnotations__) && $name::$__enableDIAnnotations__){
+        if (isset($name::$__enableDIAnnotations__) && $name::$__enableDIAnnotations__) {
             $context = $this->loader->build($name);
             /**@var $context ObjectDefinitionContext */
             $definition = $context->definition;
-        }else{
+        }else {
             $definition = new ObjectDefinition($name);
         }
 

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             $context = $this->loader->build($name);
             /**@var $context ObjectDefinitionContext */
             $definition = $context->definition;
-        }else{
+        } else{
             $definition = new ObjectDefinition($name);
         }
 

src/DI/Annotations/InjectAnnotationHandler.php

Spacing +4 added lines, -4 removed lines

@@ -20,19 +20,19 @@
     public function __invoke(ObjectDefinitionContext $context, $ann)
     {
         $className = $context->definition->getClassName();
-        if(!$ann->parent){
+        if (!$ann->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of $className should be used with parent");
         }
         $target = $ann->parent->name;
         // @inject a.b.c
         $params = new AnnotationParams($ann->description, 3);
-        if(count($params) == 0){
+        if (count($params) == 0) {
             //查找@var 定义的变量
-            if(!isset($context->vars[$target])){
+            if (!isset($context->vars[$target])) {
                 Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of $className should be used with a param or @var");
             }
             $entryName = $context->vars[$target];
-        }else{
+        }else {
             $entryName = $params[0];
         }
 

Braces +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                 Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of $className should be used with a param or @var");
             }
             $entryName = $context->vars[$target];
-        }else{
+        } else{
             $entryName = $params[0];
         }
 

src/DI/Annotations/VarAnnotationHandler.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     public function __invoke(ObjectDefinitionContext $context, $ann)
     {
         $className = $context->definition->getClassName();
-        if(!$ann->parent){
+        if (!$ann->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of $className should be used with parent");
         }
         $target = $ann->parent->name;

src/ORM/ModelWithObject.php

Braces +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
             if(isset($this->object->$column)){
                 if(is_array($this->object->$column) || is_object($this->object->$column)){
                     $data[$column] = json_encode($this->object->$column);
-                }else{
+                } else{
                     $data[$column] = $this->object->$column;
                 }
 
@@ -49,7 +49,7 @@ 
             if($pk != $column && isset($this->object->$column)){
                 if(is_array($this->object->$column) || is_object($this->object->$column)){
                     $data[$column] = json_encode($this->object->$column);
-                }else{
+                } else{
                     $data[$column] = $this->object->$column;
                 }
             }

Spacing +11 added lines, -11 removed lines

@@ -28,11 +28,11 @@ 
     public function create()
     {
         $data = [];
-        foreach ($this->getColumns() as $column){
-            if(isset($this->object->$column)){
-                if(is_array($this->object->$column) || is_object($this->object->$column)){
+        foreach ($this->getColumns() as $column) {
+            if (isset($this->object->$column)) {
+                if (is_array($this->object->$column) || is_object($this->object->$column)) {
                     $data[$column] = json_encode($this->object->$column);
-                }else{
+                }else {
                     $data[$column] = $this->object->$column;
                 }
 
@@ -48,18 +48,18 @@ 
      * @param array $columns columns to update. if columns is empty array, update all of the columns
      * @return int rows updated
      */
-    public function update(array $columns=[])
+    public function update(array $columns = [])
     {
         $data = [];
         $pk = $this->entity->getPK();
-        foreach ($this->getColumns() as $column){
-            if(count($columns) && !in_array($column, $columns)){
+        foreach ($this->getColumns() as $column) {
+            if (count($columns) && !in_array($column, $columns)) {
                 continue;
             }
-            if($pk != $column && isset($this->object->$column)){
-                if(is_array($this->object->$column) || is_object($this->object->$column)){
+            if ($pk != $column && isset($this->object->$column)) {
+                if (is_array($this->object->$column) || is_object($this->object->$column)) {
                     $data[$column] = json_encode($this->object->$column);
-                }else{
+                }else {
                     $data[$column] = $this->object->$column;
                 }
             }
@@ -85,7 +85,7 @@ 
     protected function getColumns()
     {
         $columns = [];
-        foreach ($this->entity->getProperties() as $p){
+        foreach ($this->entity->getProperties() as $p) {
             $columns[] = $p->name;
         }
         return $columns;

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;
         }
     }

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;

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\WhereRule
      */
@@ -91,7 +90,7 @@ 
     /**
      * @param int|string $id
      * @param array $values
-     * @return int updated row count
+     * @return \PhpBoot\DB\impls\ExecResult|null updated row count
      */
     public function update($id, $values)
     {

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;
 }