caoym / phpboot

src/Utils/TypeHint.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
     /**
      * 获取数组的类型
-     * @param $type
+     * @param string|null $type
      * @return string|null
      */
     static function getArrayType($type){

Spacing +8 added lines, -8 removed lines

@@ -14,10 +14,10 @@ 
      * @param string $type 需要标准化的字符串
      * @param  string $contextClass 当前上下文所在的类,一般传__CLASS__, 用于扫描当前文件的use信息, 以便拼上namespace
      */
-    static function normalize($type, $contextClass=null){
+    static function normalize($type, $contextClass = null) {
         $resolver = new TypeResolver();
         $context = null;
-        if($contextClass){
+        if ($contextClass) {
             //TODO 优化性能
             $contextFactory = new ContextFactory();
             $context = $contextFactory->createFromReflector(new \ReflectionClass($contextClass));
@@ -30,7 +30,7 @@ 
      * 是否是基本类型
      * @param string $type
      */
-    static function isScalarType($type){
+    static function isScalarType($type) {
         return in_array($type, [
             'bool',
             'int',
@@ -43,7 +43,7 @@ 
      * @param $type
      * @return bool
      */
-    static function isArray($type){
+    static function isArray($type) {
         return ($type == 'array' || substr($type, -2) == '[]');
     }
 
@@ -52,12 +52,12 @@ 
      * @param $type
      * @return string|null
      */
-    static function getArrayType($type){
+    static function getArrayType($type) {
         self::isArray($type) or \PhpBoot\abort(new \InvalidArgumentException("$type is not array"));
-        if($type == 'array') {
+        if ($type == 'array') {
             return 'mixed';
-        }else{
-            return substr($type,0,-2);
+        }else {
+            return substr($type, 0, -2);
         }
     }
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         self::isArray($type) or \PhpBoot\abort(new \InvalidArgumentException("$type is not array"));
         if($type == 'array') {
             return 'mixed';
-        }else{
+        } else{
             return substr($type,0,-2);
         }
     }

src/Lock/FileLock.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
     {
         $path = sys_get_temp_dir().'/lock_252a8fdc9b944af99a9bc53d2aea08f1/'.$key;
         $tmpFile = tempnam($path, 'lock');
-        if(SafeFileWriter::write($tmpFile, json_encode(['time'=>time(), 'ttl'=>$ttl]), false)){
+        if (SafeFileWriter::write($tmpFile, json_encode(['time'=>time(), 'ttl'=>$ttl]), false)) {
             $this->locked = true;
             return true;
-        }else{
+        }else {
             return false;
         }
     }

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         if(SafeFileWriter::write($tmpFile, json_encode(['time'=>time(), 'ttl'=>$ttl]), false)){
             $this->locked = true;
             return true;
-        }else{
+        } else{
             return false;
         }
     }

src/Lock/LocalAutoLock.php

Spacing +19 added lines, -19 removed lines

@@ -8,20 +8,20 @@ 
  */
 class LocalAutoLock
 {
-    static function lock($key, $seconds, callable $success, callable $error=null){
+    static function lock($key, $seconds, callable $success, callable $error = null) {
         $key = 'lock:'.$key;
-        if(function_exists('apc_add')){
+        if (function_exists('apc_add')) {
             $lock = new ApcLock();
-        }else{
+        }else {
             $lock = new FileLock();
         }
-        try{
-            if(!isset(self::$currentLock[$key])){
+        try {
+            if (!isset(self::$currentLock[$key])) {
                 self::$currentLock[$key] = 0;
             }
-            if(self::$currentLock[$key] == 0){  //未加锁
-                if(!$lock->lock($key, $seconds)){ //加锁失败
-                    if($error){
+            if (self::$currentLock[$key] == 0) {  //未加锁
+                if (!$lock->lock($key, $seconds)) { //加锁失败
+                    if ($error) {
                         return $error();
                     }
                     return;
@@ -29,34 +29,34 @@ 
             }
             //嵌套加锁
             self::$currentLock[$key]++;
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             return $error($e);
         }
         $res = null;
-        try{
+        try {
             $res = $success();
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             self::$currentLock[$key]--;
-            if(self::$currentLock[$key] == 0){
-                try{
+            if (self::$currentLock[$key] == 0) {
+                try {
                     $lock->unlock($key);
-                }catch (\Exception $e){
+                }catch (\Exception $e) {
 
                 }
             }
             throw $e;
         }
         self::$currentLock[$key]--;
-        if(self::$currentLock[$key] == 0){
-            try{
+        if (self::$currentLock[$key] == 0) {
+            try {
                 $lock->unlock($key);
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
 
             }
         }
         return $res;
     }
 
-    private $cache=[];
-    static private $currentLock=[];
+    private $cache = [];
+    static private $currentLock = [];
 }
\ No newline at end of file

Braces +5 added lines, -5 removed lines

@@ -12,7 +12,7 @@ 
         $key = 'lock:'.$key;
         if(function_exists('apc_add')){
             $lock = new ApcLock();
-        }else{
+        } else{
             $lock = new FileLock();
         }
         try{
@@ -29,18 +29,18 @@ 
             }
             //嵌套加锁
             self::$currentLock[$key]++;
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             return $error($e);
         }
         $res = null;
         try{
             $res = $success();
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             self::$currentLock[$key]--;
             if(self::$currentLock[$key] == 0){
                 try{
                     $lock->unlock($key);
-                }catch (\Exception $e){
+                } catch (\Exception $e){
 
                 }
             }
@@ -50,7 +50,7 @@ 
         if(self::$currentLock[$key] == 0){
             try{
                 $lock->unlock($key);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
 
             }
         }

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