caoym / phpboot

src/Lock/ApcLock.php

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@ 
 
     public function lock($key, $ttl)
     {
-        if(apc_add($key, 1, $ttl)){
+        if (apc_add($key, 1, $ttl)) {
             $this->locked = true;
             return true;
-        }else{
+        }else {
             return false;
         }
     }
@@ -21,5 +21,5 @@ 
         $this->locked = false;
         return $res;
     }
-    private $locked=false;
+    private $locked = false;
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
         if(apc_add($key, 1, $ttl)){
             $this->locked = true;
             return true;
-        }else{
+        } else{
             return false;
         }
     }

src/Entity/EntityContainer.php

Spacing +25 added lines, -25 removed lines

@@ -14,21 +14,21 @@ 
 
     public function make($data, $validate = true)
     {
-        if($data === null){
+        if ($data === null) {
             return null;
         }
         $data instanceof \ArrayAccess || is_array($data) or \PhpBoot\abort(new \InvalidArgumentException("array is required by make {$this->className}, $data given"));
         $className = $this->getClassName();
         $obj = new $className();
         $vld = new Validator();
-        foreach ($this->properties as $p){
-            if($p->container && isset($data[$p->name])){
+        foreach ($this->properties as $p) {
+            if ($p->container && isset($data[$p->name])) {
                 $var = $data[$p->name];
-                if($p->container instanceof EntityContainer
-                    || $p->container instanceof ArrayContainer){
-                    if(!$var){
+                if ($p->container instanceof EntityContainer
+                    || $p->container instanceof ArrayContainer) {
+                    if (!$var) {
                         $var = [];
-                    }elseif(is_string($var)){
+                    }elseif (is_string($var)) {
                         $var = json_decode($var, true);
                         !json_last_error() or \PhpBoot\abort(new \InvalidArgumentException(__METHOD__.' failed while json_decode with '.json_last_error_msg()));
                     }
@@ -36,18 +36,18 @@ 
                 $data[$p->name] = $p->container->make($var, $validate);
             }
 
-            if($p->validation){
-                if(is_array($p->validation)){
+            if ($p->validation) {
+                if (is_array($p->validation)) {
                     $vld->rule($p->validation[0], $p->name.'.'.$p->validation[1]);
-                }else{
+                }else {
                     $vld->rule($p->validation, $p->name);
                 }
             }
-            if(!$p->isOptional && !$vld->hasRule('optional', $p->name)){
+            if (!$p->isOptional && !$vld->hasRule('optional', $p->name)) {
                 $vld->rule('required', $p->name);
             }
         }
-        if($validate){
+        if ($validate) {
             $vld = $vld->withData($data);
             $vld->validate() or \PhpBoot\abort(
                 new \InvalidArgumentException(
@@ -59,8 +59,8 @@ 
             );
         }
 
-        foreach ($this->properties as $p){
-            if(isset($data[$p->name])){
+        foreach ($this->properties as $p) {
+            if (isset($data[$p->name])) {
                 $obj->{$p->name} = $data[$p->name];
             }
         }
@@ -72,32 +72,32 @@ 
     {
         $className = $this->getClassName();
         $obj = new $className();
-        foreach ($this->properties as $p){
-            if($p->isOptional){
+        foreach ($this->properties as $p) {
+            if ($p->isOptional) {
                 $obj->{$p->name} = $p->default;
-            }elseif($p->container){
+            }elseif ($p->container) {
                 $var = $p->container->makeExample();
                 $obj->{$p->name} = $var;
-            }else{
+            }else {
                 $obj->{$p->name} = null;
             }
 
         }
         return $obj;
     }
-    public function getProperty($target){
-        if(array_key_exists($target, $this->properties)){
+    public function getProperty($target) {
+        if (array_key_exists($target, $this->properties)) {
             return $this->properties[$target];
         }
         return null;
     }
-    public function setProperty($target, PropertyMeta $meta){
+    public function setProperty($target, PropertyMeta $meta) {
         $this->properties[$target] = $meta;
     }
     /**
      * @return PropertyMeta[]
      */
-    public function getProperties(){
+    public function getProperties() {
         return $this->properties;
     }
 
@@ -157,7 +157,7 @@ 
     /**
      * @var PropertyMeta[]
      */
-    private $properties=[];
+    private $properties = [];
 
     /**
      * @var string
@@ -167,11 +167,11 @@ 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
     /**
      * @var string
      */
-    private $summary='';
+    private $summary = '';
 
     /**
      * @var string

Braces +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
                     || $p->container instanceof ArrayContainer){
                     if(!$var){
                         $var = [];
-                    }elseif(is_string($var)){
+                    } elseif(is_string($var)){
                         $var = json_decode($var, true);
                         !json_last_error() or \PhpBoot\abort(new \InvalidArgumentException(__METHOD__.' failed while json_decode with '.json_last_error_msg()));
                     }
@@ -39,7 +39,7 @@ 
             if($p->validation){
                 if(is_array($p->validation)){
                     $vld->rule($p->validation[0], $p->name.'.'.$p->validation[1]);
-                }else{
+                } else{
                     $vld->rule($p->validation, $p->name);
                 }
             }
@@ -75,10 +75,10 @@ 
         foreach ($this->properties as $p){
             if($p->isOptional){
                 $obj->{$p->name} = $p->default;
-            }elseif($p->container){
+            } elseif($p->container){
                 $var = $p->container->makeExample();
                 $obj->{$p->name} = $var;
-            }else{
+            } else{
                 $obj->{$p->name} = null;
             }
 

src/Entity/EntityContainerBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 
 class EntityContainerBuilder extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [PropertyAnnotationHandler::class, 'properties'],
         [VarAnnotationHandler::class, "properties.*.children[?name=='var'][]"],
@@ -34,9 +34,9 @@ 
                                 array $annotations = null
                                 )
     {
-        if($annotations){
+        if ($annotations) {
             parent::__construct($annotations, $cache);
-        }else{
+        }else {
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
         $this->factory = $factory;

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     {
         if($annotations){
             parent::__construct($annotations, $cache);
-        }else{
+        } else{
             parent::__construct(self::$DEFAULT_ANNOTATIONS, $cache);
         }
         $this->factory = $factory;

src/Entity/ScalarTypeContainer.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
     public function __construct($type)
     {
         $this->type = $type;
-        !$type || TypeHint::isScalarType($type)  or \PhpBoot\abort(new \InvalidArgumentException("$type is not scalar type"));
+        !$type || TypeHint::isScalarType($type) or \PhpBoot\abort(new \InvalidArgumentException("$type is not scalar type"));
     }
 
-    public function make($data, $validate = true){
+    public function make($data, $validate = true) {
         return TypeCast::cast($data, $this->type, $validate);
     }
 

src/Entity/ContainerFactory.php

Spacing +5 added lines, -5 removed lines

@@ -11,17 +11,17 @@
         //TODO 支持|分隔的多类型
 
         $getter = function($type)use($builder){
-            if(!$type || $type == 'mixed'){
+            if (!$type || $type == 'mixed') {
                 return new MixedTypeContainer();
-            }elseif (TypeHint::isScalarType($type)){
+            }elseif (TypeHint::isScalarType($type)) {
                 return new ScalarTypeContainer($type);
-            }else{
+            }else {
                 return $builder->build($type);
             }
         };
-        if(TypeHint::isArray($type)){
+        if (TypeHint::isArray($type)) {
             $container = ArrayContainer::create($type, $getter);
-        }else{
+        }else {
             $container = $getter($type);
         }
         return $container;

Braces +3 added lines, -3 removed lines

@@ -13,15 +13,15 @@
         $getter = function($type)use($builder){
             if(!$type || $type == 'mixed'){
                 return new MixedTypeContainer();
-            }elseif (TypeHint::isScalarType($type)){
+            } elseif (TypeHint::isScalarType($type)){
                 return new ScalarTypeContainer($type);
-            }else{
+            } else{
                 return $builder->build($type);
             }
         };
         if(TypeHint::isArray($type)){
             $container = ArrayContainer::create($type, $getter);
-        }else{
+        } else{
             $container = $getter($type);
         }
         return $container;

src/Entity/Annotations/ClassAnnotationHandler.php

Spacing +3 added lines, -3 removed lines

@@ -25,13 +25,13 @@
         $container->setDescription($ann->description);
         $container->setSummary($ann->summary);
 
-        foreach ($properties as $i){
-            $isOption = array_key_exists($i->getName(), $default) && $default[$i->getName()] !==null;
+        foreach ($properties as $i) {
+            $isOption = array_key_exists($i->getName(), $default) && $default[$i->getName()] !== null;
             $container->setProperty($i->getName(), new PropertyMeta(
                 $i->getName(),
                 null,
                 $isOption,
-                $isOption?$default[$i->getName()]:null
+                $isOption ? $default[$i->getName()] : null
                 ));
         }
     }

src/Entity/Annotations/PropertyAnnotationHandler.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     public function __invoke(EntityContainer $container, $ann)
     {
         $meta = $container->getProperty($ann->name);
-        if(!$meta){
+        if (!$meta) {
             $meta = new PropertyMeta($ann->name);
             $container->setProperty($ann->name, $meta);
         }

src/Entity/Annotations/ValidateAnnotationHandler.php

Spacing +6 added lines, -6 removed lines

@@ -19,25 +19,25 @@
     public function __invoke(EntityContainer $container, $ann)
     {
         $params = new AnnotationParams($ann->description, 3);
-        if($params->count()){
+        if ($params->count()) {
 
             $target = $ann->parent->name;
             $property = $container->getProperty($target);
             $property or \PhpBoot\abort($container->getClassName()." property $target not exist ");
-            if($params->count()>1){
+            if ($params->count()>1) {
                 $property->validation = [$params->getParam(0), $params->getParam(1)];
-            }else{
+            }else {
                 $property->validation = $params->getParam(0);
-                if($property->validation){
+                if ($property->validation) {
                     $v = new Validator();
                     $v->rule($property->validation, $property->name);
-                    if($v->hasRule('optional', $property->name)){
+                    if ($v->hasRule('optional', $property->name)) {
                         $property->isOptional = true;
                     }
                 }
             }
 
-        }else{
+        }else {
             \PhpBoot\abort(new AnnotationSyntaxException(
                 "The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::{$ann->parent->name} require 1 param, 0 given"
             ));

Braces +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
             $property or \PhpBoot\abort($container->getClassName()." property $target not exist ");
             if($params->count()>1){
                 $property->validation = [$params->getParam(0), $params->getParam(1)];
-            }else{
+            } else{
                 $property->validation = $params->getParam(0);
                 if($property->validation){
                     $v = new Validator();
@@ -37,7 +37,7 @@ 
                 }
             }
 
-        }else{
+        } else{
             \PhpBoot\abort(new AnnotationSyntaxException(
                 "The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::{$ann->parent->name} require 1 param, 0 given"
             ));

src/Entity/Annotations/VarAnnotationHandler.php

Spacing +4 added lines, -4 removed lines

@@ -23,21 +23,21 @@
     public function __invoke(EntityContainer $container, $ann, EntityContainerBuilder $builder)
     {
         $params = new AnnotationParams($ann->description, 3);
-        if($params->count()){
+        if ($params->count()) {
             $type = $params->getParam(0);
             //TODO 校验type类型
             $target = $ann->parent->name;
             $property = $container->getProperty($target);
             $property or \PhpBoot\abort($container->getClassName()." property $target not exist ");
-            if($type == null || $type == 'mixed'){
+            if ($type == null || $type == 'mixed') {
                 $property->container = new MixedTypeContainer();
-            } else{
+            }else {
                 // TODO 判断$type是否匹配
                 $property->type = TypeHint::normalize($type, $container->getClassName());
                 // TODO 防止递归死循环
                 $property->container = ContainerFactory::create($builder, $property->type);
             }
-        }else{
+        }else {
             \PhpBoot\abort(new AnnotationSyntaxException(
                 "The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::{$ann->parent->name} require 1 param, 0 given"
             ));

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
                 // TODO 防止递归死循环
                 $property->container = ContainerFactory::create($builder, $property->type);
             }
-        }else{
+        } else{
             \PhpBoot\abort(new AnnotationSyntaxException(
                 "The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::{$ann->parent->name} require 1 param, 0 given"
             ));