caoym / phpboot

src/Utils/AnnotationParams.php

Doc Comments +12 added lines

@@ -5,6 +5,9 @@ 
  */
 class AnnotationParams implements \Countable, \ArrayAccess
 {
+    /**
+     * @param integer $limit
+     */
     public function __construct($text, $limit)
     {
         if($limit == 1){
@@ -142,6 +145,12 @@ 
         }
     }
 
+    /**
+     * @param integer $pos
+     * @param string $default
+     *
+     * @return string
+     */
     public function getRawParam($pos, $default = null)
     {
         if(isset($this->rawParams[$pos])){
@@ -151,6 +160,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $ignoreError
+     */
     private function stripSlashes($text, $ignoreError)
     {
         if(strlen($text)>=2 && substr($text,0,1) == '"'){

Spacing +36 added lines, -36 removed lines

@@ -7,31 +7,31 @@ 
 {
     public function __construct($text, $limit)
     {
-        if($limit == 1){
+        if ($limit == 1) {
             $this->rawParams[] = $text;
             return;
         }
-        if($limit <= 0){
+        if ($limit<=0) {
             return;
         }
         $text = ltrim($text);
         $pos = 0;
         $state = 'stateNormal';
         $len = strlen($text);
-        if($len == 0){
+        if ($len == 0) {
             return;
         }
-        while (true){
-            if($state == 'stateNormal' && count($this->rawParams)+1 == $limit){
+        while (true) {
+            if ($state == 'stateNormal' && count($this->rawParams) + 1 == $limit) {
                 break;
             }
             $pos = $this->$state($text, $pos, $state);
-            if($pos === false || $pos>= $len){
+            if ($pos === false || $pos>=$len) {
                 break;
             }
         };
-        if($this->prePos != strlen($text)){
-            $this->rawParams[] = substr($text,$this->prePos);
+        if ($this->prePos != strlen($text)) {
+            $this->rawParams[] = substr($text, $this->prePos);
         }
     }
 
@@ -42,16 +42,16 @@ 
     {
         //查找引号或者空格
         $found = [];
-        $todo = substr($text,$pos);
-        if(!preg_match('/[\s"\']/', $todo, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
-            $this->rawParams[] = substr($text,$this->prePos);
+        $todo = substr($text, $pos);
+        if (!preg_match('/[\s"\']/', $todo, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
+            $this->rawParams[] = substr($text, $this->prePos);
             $this->prePos = strlen($text);
             return false;
         }
         list($chars, $offset) = $found[0];
 
-        if($chars == '"'){
+        if ($chars == '"') {
             $next = 'stateDoubleQ';
             return $pos + $offset + 1;
         }
@@ -59,8 +59,8 @@ 
 //            $next = 'stateSingleQ';
 //            return $pos + $offset + 1;
 //        }
-        else{
-            $this->rawParams[] = substr($text,$this->prePos, $pos-$this->prePos+$offset);
+        else {
+            $this->rawParams[] = substr($text, $this->prePos, $pos - $this->prePos + $offset);
             $next = 'stateSpace';
             $this->prePos = $pos + $offset + 1;
             return $this->prePos;
@@ -73,9 +73,9 @@ 
     private function stateSpace($text, $pos, &$next)
     {
         $found = [];
-        $todo = substr($text,$pos);
-        if(!preg_match('/\S/', $todo, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        $todo = substr($text, $pos);
+        if (!preg_match('/\S/', $todo, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             return false;
         }
         list($chars, $offset) = $found[0];
@@ -105,20 +105,20 @@ 
     /**
      * 进入双引号状态
      */
-    private function stateDoubleQ($text, $pos, &$next){
+    private function stateDoubleQ($text, $pos, &$next) {
 
         $found = [];
-        $todo = substr($text,$pos);
-        if(!preg_match('/[\\\\"]/', $todo, $found, PREG_OFFSET_CAPTURE) ||
-            count($found)==0){
+        $todo = substr($text, $pos);
+        if (!preg_match('/[\\\\"]/', $todo, $found, PREG_OFFSET_CAPTURE) ||
+            count($found) == 0) {
             return false;
         }
         list($chars, $offset) = $found[0];
-        if($chars == '\\'){
-            return $pos+$offset+2;
-        }else{
+        if ($chars == '\\') {
+            return $pos + $offset + 2;
+        }else {
             $next = 'stateNormal';
-            return $pos+$offset+1;
+            return $pos + $offset + 1;
         }
     }
 
@@ -127,38 +127,38 @@ 
         return count($this->rawParams);
     }
 
-    public function getParam($pos, $default = null, $ignoreError=false)
+    public function getParam($pos, $default = null, $ignoreError = false)
     {
-        if(isset($this->cachedParams[$pos])){
+        if (isset($this->cachedParams[$pos])) {
             return $this->cachedParams[$pos];
         }
-        if(isset($this->rawParams[$pos])){
+        if (isset($this->rawParams[$pos])) {
             $param = $this->rawParams[$pos];
             $param = $this->stripSlashes($param, $ignoreError);
             $this->cachedParams[$pos] = $param;
             return $param;
-        }else{
+        }else {
             return $default;
         }
     }
 
     public function getRawParam($pos, $default = null)
     {
-        if(isset($this->rawParams[$pos])){
+        if (isset($this->rawParams[$pos])) {
             return $this->rawParams[$pos];
-        }else{
+        }else {
             return $default;
         }
     }
 
     private function stripSlashes($text, $ignoreError)
     {
-        if(strlen($text)>=2 && substr($text,0,1) == '"'){
+        if (strlen($text)>=2 && substr($text, 0, 1) == '"') {
             $decoded = json_decode($text);
-            if(json_last_error()){
-                if($ignoreError){
+            if (json_last_error()) {
+                if ($ignoreError) {
                     return $text;
-                }else{
+                }else {
                     \PhpBoot\abort('json_decode failed with '.json_last_error_msg(), [$text]);
                 }
             }

Braces +4 added lines, -4 removed lines

@@ -116,7 +116,7 @@ 
         list($chars, $offset) = $found[0];
         if($chars == '\\'){
             return $pos+$offset+2;
-        }else{
+        } else{
             $next = 'stateNormal';
             return $pos+$offset+1;
         }
@@ -137,7 +137,7 @@ 
             $param = $this->stripSlashes($param, $ignoreError);
             $this->cachedParams[$pos] = $param;
             return $param;
-        }else{
+        } else{
             return $default;
         }
     }
@@ -146,7 +146,7 @@ 
     {
         if(isset($this->rawParams[$pos])){
             return $this->rawParams[$pos];
-        }else{
+        } else{
             return $default;
         }
     }
@@ -158,7 +158,7 @@ 
             if(json_last_error()){
                 if($ignoreError){
                     return $text;
-                }else{
+                } else{
                     \PhpBoot\abort('json_decode failed with '.json_last_error_msg(), [$text]);
                 }
             }

src/Utils/SafeFileWriter.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     /**
      * 写入文件
      * @param string $path 路径
-     * @param mixed $data 写入的值
+     * @param string $data 写入的值
      * @param boolean $overwrite 是否覆盖已有文件
      * @return boolean
      */

Spacing +3 added lines, -3 removed lines

@@ -16,15 +16,15 @@
      * @param boolean $overwrite 是否覆盖已有文件
      * @return boolean
      */
-    static public function write($path, $data, $overwrite = true){
+    static public function write($path, $data, $overwrite = true) {
         $path = str_replace('\\', '/', $path);
         $fileDir = dirname($path);
         $tmpFile = tempnam($fileDir);
         false !== @file_put_contents($tmpFile, $data) or \PhpBoot\abort("write to file: $tmpFile failed");
-        if($overwrite){
+        if ($overwrite) {
             @unlink($path); //删除原始文件
         }
-        if(!@rename($tmpFile, $path)){
+        if (!@rename($tmpFile, $path)) {
             @unlink($tmpFile); //删除原始文件
             \PhpBoot\abort("write to file: $tmpFile failed");
             return false;

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