caoym / phpboot

src/DB/rules/update.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 
 class UpdateSetRule extends WhereRule
 {
+    /**
+     * @param \PhpBoot\DB\Context $context
+     */
     public function __construct($context){
         parent::__construct($context);
         $this->impl = new UpdateSetImpl();

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
 class UpdateSetRule extends WhereRule
 {
-    public function __construct($context){
+    public function __construct($context) {
         parent::__construct($context);
         $this->impl = new UpdateSetImpl();
     }
@@ -55,7 +55,7 @@ 
      * @param mixed $_
      * @return \PhpBoot\DB\rules\update\UpdateSetRule
      */
-    public function setExpr($expr, $_=null) {
+    public function setExpr($expr, $_ = null) {
         $this->impl->setExpr($this->context, $expr, array_slice(func_get_args(), 1));
         return $this;
     }

src/Docgen/Swagger/Swagger.php

Doc Comments +6 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
     }
 
     /**
-     * @param $object
+     * @param Swagger $object
      * @return array
      */
     static public function objectToArray($object)
@@ -113,7 +113,7 @@ 
     /**
      * @param Application $app
      * @param ControllerContainer $controller
-     * @param $action
+     * @param integer $action
      * @param Route $route
      * @return array
      */
@@ -162,7 +162,7 @@ 
     /**
      * @param Application $app
      * @param ControllerContainer $controller
-     * @param $action
+     * @param integer $action
      * @param Route $route
      * @return null|ResponseObject
      */
@@ -299,6 +299,9 @@ 
         return new RefSchemaObject("#/definitions/$name");
     }
 
+    /**
+     * @param integer $action
+     */
     public function getParamsSchema(Application $app,
                                     ControllerContainer $controller,
                                     $action,

Unused Use Statements -2 removed lines

@@ -8,7 +8,6 @@ 
 use PhpBoot\Docgen\Swagger\Schemas\ArraySchemaObject;
 use PhpBoot\Docgen\Swagger\Schemas\BodyParameterObject;
 use PhpBoot\Docgen\Swagger\Schemas\OperationObject;
-use PhpBoot\Docgen\Swagger\Schemas\OtherParameterObject;
 use PhpBoot\Docgen\Swagger\Schemas\PrimitiveSchemaObject;
 use PhpBoot\Docgen\Swagger\Schemas\RefSchemaObject;
 use PhpBoot\Docgen\Swagger\Schemas\ResponseObject;
@@ -22,7 +21,6 @@ 
 use PhpBoot\Metas\ParamMeta;
 use PhpBoot\Metas\ReturnMeta;
 use PhpBoot\Utils\ArrayHelper;
-use PhpBoot\Validator\Validator;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Swagger extends SwaggerObject

Indentation +12 added lines, -12 removed lines

@@ -234,10 +234,10 @@ 
      * @return RefSchemaObject
      */
     public function makeTempSchema(Application $app,
-                                   ControllerContainer $controller,
-                                   $action,
-                                   Route $route,
-                                   array $arr, $suffix)
+                                    ControllerContainer $controller,
+                                    $action,
+                                    Route $route,
+                                    array $arr, $suffix)
     {
         $className = self::getShortClassName($controller->getClassName());
         $name = $className . ucfirst($action) . $suffix;
@@ -293,10 +293,10 @@ 
      * @return RefSchemaObject
      */
     public function getRefSchema(Application $app,
-                                 ControllerContainer $controller,
-                                 $action,
-                                 Route $route,
-                                 EntityContainer $container)
+                                    ControllerContainer $controller,
+                                    $action,
+                                    Route $route,
+                                    EntityContainer $container)
     {
         $name = $container->getClassName();
         if (!isset($this->definitions[$name])) {
@@ -444,10 +444,10 @@ 
      * @return ArraySchemaObject
      */
     public function getArraySchema(Application $app,
-                                   ControllerContainer $controller,
-                                   $action,
-                                   Route $route,
-                                   ArrayContainer $container)
+                                    ControllerContainer $controller,
+                                    $action,
+                                    Route $route,
+                                    ArrayContainer $container)
     {
         $schema = new ArraySchemaObject();
         $itemContainer = $container->getContainer();

Spacing +30 added lines, -30 removed lines

@@ -58,7 +58,7 @@ 
             $op->description = $route->getDescription();
 
             $op->parameters = $this->getParamsSchema($app, $controller, $action, $route);
-            if($this->hasFileParam($route)){
+            if ($this->hasFileParam($route)) {
                 $op->consumes = ['multipart/form-data'];
             }
 
@@ -108,7 +108,7 @@ 
             }
             if (is_array($v) || is_object($v)) {
                 $res[$k] = self::objectToArray($v);
-            } else {
+            }else {
                 $res[$k] = $v;
             }
         }
@@ -140,21 +140,21 @@ 
             //TODO status 重复怎么办
             if ($ins instanceof HttpException) {
                 $status = $ins->getStatusCode();
-            } else {
+            }else {
 
                 $status = 500;
             }
             if (isset($res[$status])) {
                 //$this->warnings[] = "status response $status has been used for $name, $desc";
                 $res = $res[$status];
-            } else {
+            }else {
                 $res = new ResponseObject();
             }
             $shortName = self::getShortClassName($name);
             $desc = "$shortName: $desc";
             $res->description = implode("\n", [$res->description, $desc]);
             $error = $app->get(ExceptionRenderer::class)->render($ins)->getContent();
-            if($error){
+            if ($error) {
                 $res->examples = [$shortName => $error];
             }
             //$res->schema = new RefSchemaObject("#/definitions/$name");
@@ -213,9 +213,9 @@ 
     {
         if ($content instanceof ReturnMeta || $content instanceof ParamMeta) {
             return $this->makeExample($content->container);
-        }elseif ($content instanceof TypeContainerInterface){
+        }elseif ($content instanceof TypeContainerInterface) {
             return $content->makeExample();
-        }elseif(is_array($content)) {
+        }elseif (is_array($content)) {
             $res = [];
             foreach ($content as $k => $v) {
                 $res[$k] = $this->makeExample($v);
@@ -240,7 +240,7 @@ 
                                    array $arr, $suffix)
     {
         $className = self::getShortClassName($controller->getClassName());
-        $name = $className . ucfirst($action) . $suffix;
+        $name = $className.ucfirst($action).$suffix;
 
         $schema = new SimpleModelSchemaObject();
 
@@ -258,7 +258,7 @@ 
                 } elseif ($v->container instanceof EntityContainer) {
                     $sub = $this->getRefSchema($app, $controller, $action, $route, $v->container);
                     //TODO array for validation
-                } else {
+                }else {
                     $sub = new PrimitiveSchemaObject();
                     $sub->type = self::mapType($v->type);
                     self::mapValidation($v->validation, $sub);
@@ -270,14 +270,14 @@ 
                     $schema->required[] = $k;
                 }
                 $schema->properties[$k] = $sub;
-            } else {
+            }else {
                 //TODO how to do?
             }
         }
         $unused = $name;
         $tempId = 0;
         while (isset($this->definitions[$unused])) {
-            $unused = $name . $tempId;
+            $unused = $name.$tempId;
             $tempId++;
         }
         $this->definitions[$unused] = $schema;
@@ -316,7 +316,7 @@ 
         $in = 'query';
 
         $bodyType = 'body'; // 当有文件上传时, 必须是formData方式
-        if($this->hasFileParam($route)){
+        if ($this->hasFileParam($route)) {
             $bodyType = 'formData';
         }
 
@@ -355,7 +355,7 @@ 
                     || $route->getMethod() == 'PATCH'
                 ) {
                     $in = $bodyType;
-                } else {
+                }else {
                     $in = 'query';
                 }
             }
@@ -366,11 +366,11 @@ 
                 } elseif ($param->container instanceof EntityContainer) {
                     $paramSchema = $this->getRefSchema($app, $controller, $action, $route, $param->container);
                     //TODO array for validation
-                } else {
+                }else {
                     $paramSchema = new PrimitiveSchemaObject();
-                    if($isFile){
+                    if ($isFile) {
                         $paramSchema->type = 'file';
-                    }else{
+                    }else {
                         $paramSchema->type = self::mapType($param->type);
                         self::mapValidation($param->validation, $paramSchema);
                     }
@@ -382,10 +382,10 @@ 
                 $paramSchema->default = $param->default;
                 $paramSchema->required = !$param->isOptional;
                 $parameters[] = $paramSchema;
-            } else {
+            }else {
                 if (!$name) {
                     $body = $param;
-                } else {
+                }else {
                     ArrayHelper::set($body, $name, $param);
                 }
 
@@ -398,7 +398,7 @@ 
             $paramSchema->in = 'body';
             if (is_array($body)) {
                 $paramSchema->schema = $this->makeTempSchema($app, $controller, $action, $route, $body, 'Req');
-            } else {
+            }else {
                 $paramSchema->schema = $this->getAnySchema($app, $controller, $action, $route, $body->container);
             }
 
@@ -425,8 +425,8 @@ 
         } elseif ($container instanceof ScalarTypeContainer) {
             $schema = new PrimitiveSchemaObject();
             $schema->type = self::mapType($container->getType());
-        } elseif($container == null){
-            $schema = null ;//new PrimitiveSchemaObject();
+        } elseif ($container == null) {
+            $schema = null; //new PrimitiveSchemaObject();
             //$schema->type = null;
         }else {
             $schema = new PrimitiveSchemaObject();
@@ -458,7 +458,7 @@ 
         } elseif ($itemContainer instanceof ScalarTypeContainer) {
             $itemSchema = new PrimitiveSchemaObject();
             $itemSchema->type = self::mapType($itemContainer->getType());
-        } else {
+        }else {
             $itemSchema = new PrimitiveSchemaObject();
             //$itemSchema->type = 'mixed';
         }
@@ -484,7 +484,7 @@ 
                 $propertySchema = $this->getRefSchema($app, $controller, $action, $route, $property->container);
             } elseif ($property->container instanceof ArrayContainer) {
                 $propertySchema = $this->getArraySchema($app, $controller, $action, $route, $property->container);
-            } else {
+            }else {
                 $propertySchema = new PrimitiveSchemaObject();
                 $propertySchema->type = self::mapType($property->type);
                 $propertySchema->description = implode("\n", [$property->summary, $property->description]);
@@ -501,7 +501,7 @@ 
     {
         $params = $route->getRequestHandler()->getParamMetas();
         foreach ($params as $name => $param) {
-            if(strpos($param->source, 'request.files.')===0){
+            if (strpos($param->source, 'request.files.') === 0) {
                 return true;
             }
         }
@@ -514,7 +514,7 @@ 
      */
     static public function mapValidation($v, PrimitiveSchemaObject $schemaObject)
     {
-        if(!$v){
+        if (!$v) {
             return $schemaObject;
         }
         $rules = explode('|', $v);
@@ -530,15 +530,15 @@ 
             } elseif ($rule == 'lengthBetween' && isset($params[0]) && isset($params[1])) {
                 $schemaObject->minLength = intval($params[0]);
                 $schemaObject->maxLength = intval($params[1]);
-            } elseif ($rule == 'lengthMin'&& isset($params[0])) {
+            } elseif ($rule == 'lengthMin' && isset($params[0])) {
                 $schemaObject->minLength = intval($params[0]);
-            } elseif ($rule == 'lengthMax'&& isset($params[0])) {
+            } elseif ($rule == 'lengthMax' && isset($params[0])) {
                 $schemaObject->maxLength = intval($params[0]);
-            } elseif ($rule == 'min'&& isset($params[0])) {
+            } elseif ($rule == 'min' && isset($params[0])) {
                 $schemaObject->minimum = floatval($params[0]);
-            } elseif ($rule == 'max'&& isset($params[0])) {
+            } elseif ($rule == 'max' && isset($params[0])) {
                 $schemaObject->maximum = floatval($params[0]);
-            } elseif ($rule == 'regex'&& isset($params[0])) {
+            } elseif ($rule == 'regex' && isset($params[0])) {
                 $schemaObject->pattern = $params[0];
             } elseif ($rule == 'optional') {
                 $schemaObject->required = false;

Braces +4 added lines, -4 removed lines

@@ -213,9 +213,9 @@ 
     {
         if ($content instanceof ReturnMeta || $content instanceof ParamMeta) {
             return $this->makeExample($content->container);
-        }elseif ($content instanceof TypeContainerInterface){
+        } elseif ($content instanceof TypeContainerInterface){
             return $content->makeExample();
-        }elseif(is_array($content)) {
+        } elseif(is_array($content)) {
             $res = [];
             foreach ($content as $k => $v) {
                 $res[$k] = $this->makeExample($v);
@@ -370,7 +370,7 @@ 
                     $paramSchema = new PrimitiveSchemaObject();
                     if($isFile){
                         $paramSchema->type = 'file';
-                    }else{
+                    } else{
                         $paramSchema->type = self::mapType($param->type);
                         self::mapValidation($param->validation, $paramSchema);
                     }
@@ -428,7 +428,7 @@ 
         } elseif($container == null){
             $schema = null ;//new PrimitiveSchemaObject();
             //$schema->type = null;
-        }else {
+        } else {
             $schema = new PrimitiveSchemaObject();
             //$schema->type = 'mixed';
         }

src/ORM/ModelContainerBuilder.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace PhpBoot\ORM;
 
-use DI\Container;
 use DI\FactoryInterface;
 use Doctrine\Common\Cache\Cache;
 use PhpBoot\DI\DIContainerBuilder;

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 class ModelContainerBuilder extends EntityContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [PKAnnotationHandler::class, "class.children[?name=='pk']"],
         [TableAnnotationHandler::class, "class.children[?name=='table']"],

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