caoym / phpboot

src/Controller/Annotations/BindAnnotationHandler.php

Braces +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
                 $handler->setMapping($params[0], $return);
             }
 
-        }elseif($ann->parent->name == 'param'){
+        } elseif($ann->parent->name == 'param'){
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
@@ -59,7 +59,7 @@ 
                         ContainerFactory::create($entityBuilder, $paramMeta->type)
                     )
                 );
-            }else{
+            } else{
                 $paramMeta->source = $params[0];
             }
         }

Spacing +9 added lines, -9 removed lines

@@ -21,15 +21,15 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent || !$ann->parent->parent){
+        if (!$ann->parent || !$ann->parent->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent param/return");
             return;
         }
         $target = $ann->parent->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent param/return");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
@@ -38,20 +38,20 @@ 
 
         $handler = $route->getResponseHandler();
 
-        if ($ann->parent->name == 'return'){
+        if ($ann->parent->name == 'return') {
             list($target, $return) = $handler->getMappingBySource('return');
-            if($return){
+            if ($return) {
                 $handler->eraseMapping($target);
                 $handler->setMapping($params[0], $return);
             }
 
-        }elseif($ann->parent->name == 'param'){
+        }elseif ($ann->parent->name == 'param') {
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
-            if($paramMeta->isPassedByReference){
+            if ($paramMeta->isPassedByReference) {
                 list($target, $ori) = $handler->getMappingBySource('params.'.$paramName);
-                if($ori){
+                if ($ori) {
                     $handler->eraseMapping($target);
                 }
                 //输出绑定
@@ -63,7 +63,7 @@ 
                         ContainerFactory::create($entityBuilder, $paramMeta->type)
                     )
                 );
-            }else{
+            }else {
                 $paramMeta->source = $params[0];
             }
         }

src/Controller/Annotations/ThrowsAnnotationHandler.php

Spacing +3 added lines, -3 removed lines

@@ -19,15 +19,15 @@
      */
     public function __invoke(ControllerContainer $container, $ann)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $params = new AnnotationParams($ann->description, 2);
         count($params)>0 or \PhpBoot\abort(new AnnotationSyntaxException("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require at least one param, {$params->count()} given"));

src/Controller/Annotations/ValidateAnnotationHandler.php

Spacing +7 added lines, -7 removed lines

@@ -18,29 +18,29 @@
      */
     public function __invoke(ControllerContainer $container, $ann)
     {
-        if(!$ann->parent || !$ann->parent->parent){
+        if (!$ann->parent || !$ann->parent->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent parent");
             return;
         }
         $target = $ann->parent->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent parent");
-            return ;
+            return;
         }
         $params = new AnnotationParams($ann->description, 2);
 
         count($params)>0 or \PhpBoot\abort(new AnnotationSyntaxException("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require 1 param, {$params->count()} given"));
 
-        if($ann->parent->name == 'param'){
+        if ($ann->parent->name == 'param') {
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
-            if($params->count()>1){
+            if ($params->count()>1) {
                 $paramMeta->validation = [$params[0], $params[1]];
-            }else{
+            }else {
                 $paramMeta->validation = $params[0];
-                if($paramMeta->validation) {
+                if ($paramMeta->validation) {
                     $v = new Validator();
                     $v->rule($paramMeta->validation, $paramMeta->name);
                     if ($v->hasRule('optional', $paramMeta->name)) {

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
             if($params->count()>1){
                 $paramMeta->validation = [$params[0], $params[1]];
-            }else{
+            } else{
                 $paramMeta->validation = $params[0];
                 if($paramMeta->validation) {
                     $v = new Validator();

src/Controller/Annotations/HookAnnotationHandler.php

Spacing +3 added lines, -3 removed lines

@@ -18,15 +18,15 @@
      */
     public function __invoke(ControllerContainer $container, $ann)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $params = new AnnotationParams($ann->description, 2);
         count($params)>0 or \PhpBoot\abort("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target require at least one param, 0 given");

src/Controller/ControllerContainer.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function getRoute($actionName)
     {
-        if (array_key_exists($actionName, $this->routes)){
+        if (array_key_exists($actionName, $this->routes)) {
             return $this->routes[$actionName];
         }
         return false;
@@ -170,16 +170,16 @@ 
     /**
      * @var Route[]
      */
-    private $routes=[];
+    private $routes = [];
 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
     /**
      * @var string
      */
-    private $summary='';
+    private $summary = '';
 
     /**
      * @var string

src/Controller/Route.php

Spacing +10 added lines, -10 removed lines

@@ -8,12 +8,12 @@ 
 class Route
 {
     public function __construct(
-        $method='',
-        $uri='',
-        RequestHandler $requestHandler=null,
-        ResponseHandler $responseHandler=null,
-        ExceptionHandler $exceptionHandler=null,
-        $hooks=[],
+        $method = '',
+        $uri = '',
+        RequestHandler $requestHandler = null,
+        ResponseHandler $responseHandler = null,
+        ExceptionHandler $exceptionHandler = null,
+        $hooks = [],
         $summary = '',
         $description = '')
     {
@@ -50,7 +50,7 @@ 
                     $res = call_user_func_array($function, $params);
                     return $this->responseHandler->handle($app, $res, $reference);
                 };
-                foreach (array_reverse($this->hooks) as $hookName){
+                foreach (array_reverse($this->hooks) as $hookName) {
                     $next = function($request)use($app, $hookName, $next){
                         $hook = $app->get($hookName);
                         /**@var $hook HookInterface*/
@@ -262,17 +262,17 @@ 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
 
     /**
      * hook class names
      * @var string[]
      */
-    private $hooks=[];
+    private $hooks = [];
 
     /**
      * @var string[]
      */
-    private $pathParams =[];
+    private $pathParams = [];
 
 }
\ No newline at end of file

src/Cache/CheckableCache.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  */
 class CheckableCache
 {
-    function __construct(Cache $impl){
+    function __construct(Cache $impl) {
         $this->impl = $impl;
     }
    
@@ -43,7 +43,7 @@ 
      * @param bool $deleteExpiredData
      * @return mixed
      */
-    public function get($name, $default = null, &$expiredData=null, $deleteExpiredData=true)
+    public function get($name, $default = null, &$expiredData = null, $deleteExpiredData = true)
     {
         $expiredData = null;
         $res = $this->impl->fetch($name);
@@ -52,18 +52,18 @@ 
             // 如果指定了checker, ttl代表每次检查的间隔时间, 0表示每次get都需要经过checker检查
             // 如果没有指定checker, ttl表示缓存过期时间, 为0表示永不过期
             if ($checker !== null) {
-                if ($ttl == 0 || ($createdTime + $ttl < time())) {
+                if ($ttl == 0 || ($createdTime + $ttl<time())) {
                     $valid = $checker($data, $createdTime);
-                    if(!$valid){
+                    if (!$valid) {
                         $expiredData = $data;
-                        if($deleteExpiredData){
+                        if ($deleteExpiredData) {
                             $this->impl->delete($name);
                         }
                         return $default;
                     }
                     
                 }
-            }else if ($ttl != 0 && ($createdTime + $ttl < time())) {
+            }else if ($ttl != 0 && ($createdTime + $ttl<time())) {
                 $this->impl->delete($name);
                 return $default;
             }
@@ -75,7 +75,7 @@ 
      * 删除
      * @param string $name
      */
-    public function del($name){
+    public function del($name) {
         return  $this->impl->delete($name);
     }
     public function getImpl()

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                     }
                     
                 }
-            }else if ($ttl != 0 && ($createdTime + $ttl < time())) {
+            } else if ($ttl != 0 && ($createdTime + $ttl < time())) {
                 $this->impl->delete($name);
                 return $default;
             }

src/Cache/FileModifiedChecker.php

Spacing +13 added lines, -13 removed lines

@@ -10,25 +10,25 @@ 
     /**
      * @param string|array $fileName 文件的绝对路径
      */
-    function __construct($fileName){
+    function __construct($fileName) {
         $fileNames = array();
-        if(is_string($fileName)){
-            $fileNames[]=$fileName;
-        }else{
+        if (is_string($fileName)) {
+            $fileNames[] = $fileName;
+        }else {
             is_array($fileName) or \PhpBoot\abort(new \InvalidArgumentException("string or array is required by param 0"));
             $fileNames = $fileName;
         }
-        foreach ($fileNames as $fileName){
-            if(is_file($fileName)){
+        foreach ($fileNames as $fileName) {
+            if (is_file($fileName)) {
                 $this->fileName[$fileName] = @filemtime($fileName);
             }else {
                 $this->fileName[$fileName] = @filemtime($fileName);
-                if(!is_dir($fileName)){
+                if (!is_dir($fileName)) {
                     continue;
                 }
                 $files = @dir($fileName) or \PhpBoot\abort("open dir $fileName failed");
-                while (!!($file = $files->read())){
-                    if($file == '.' || $file == '..') {
+                while (!!($file = $files->read())) {
+                    if ($file == '.' || $file == '..') {
                         continue;
                     }
                     $this->fileName[$fileName.'/'.$file] = @filemtime($fileName.'/'.$file);
@@ -43,13 +43,13 @@ 
      * @param int $createdTime
      * @return boolean
      */
-    public function __invoke($data, $createdTime){
-        foreach ($this->fileName as $name => $time){
-            if(@filemtime($name) != $time){
+    public function __invoke($data, $createdTime) {
+        foreach ($this->fileName as $name => $time) {
+            if (@filemtime($name) != $time) {
                 return false;
             }
         }
         return true;
     }
-    private $fileName=[]; //文件全路径
+    private $fileName = []; //文件全路径
 }

Braces +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
         $fileNames = array();
         if(is_string($fileName)){
             $fileNames[]=$fileName;
-        }else{
+        } else{
             is_array($fileName) or \PhpBoot\abort(new \InvalidArgumentException("string or array is required by param 0"));
             $fileNames = $fileName;
         }
         foreach ($fileNames as $fileName){
             if(is_file($fileName)){
                 $this->fileName[$fileName] = @filemtime($fileName);
-            }else {
+            } else {
                 $this->fileName[$fileName] = @filemtime($fileName);
                 if(!is_dir($fileName)){
                     continue;

src/functions.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             $line = $e->getLine();
         }
         if($level){
-           Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
+            Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
         }
         throw $e;
     }

Braces +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
         if($error instanceof \Exception){
             $e = $error;
             $message = "exception '".get_class($error)."' with message {$error->getMessage()}";
-        }else{
+        } else{
             $e = new \RuntimeException($error);
             $message = $error;
         }
@@ -30,7 +30,7 @@ 
         if($e->getFile() == __FILE__){
             $file = $trace[0]['file'];
             $line = $trace[0]['line'];
-        }else{
+        } else{
             $file = $e->getFile();
             $line = $e->getLine();
         }
@@ -53,7 +53,7 @@ 
     {
         if(is_object($entity)){
             return $db->getApp()->make(ModelWithObject::class, ['db'=>$db, 'entity'=>$entity]);
-        }else{
+        } else{
             return $db->getApp()->make(ModelWithClass::class, ['db'=>$db, 'entityName'=>$entity]);
         }
     }

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
 use PhpBoot\ORM\ModelWithObject;
 use PhpBoot\Utils\Logger;
 
-if (! function_exists('PhpBoot\abort')) {
+if (!function_exists('PhpBoot\abort')) {
     /**
      * 抛出异常, 并记录日志
      * @param string|\Exception $error
@@ -13,29 +13,29 @@ 
      * @param string $level "error"|"warning"|"info"|"debug"|null
      * @throws \Exception
      */
-    function abort($error = '', $context=[], $level='warning')
+    function abort($error = '', $context = [], $level = 'warning')
     {
-        if(is_object($context)){
+        if (is_object($context)) {
             $context = get_object_vars($context);
         }
-        if($error instanceof \Exception){
+        if ($error instanceof \Exception) {
             $e = $error;
             $message = "exception '".get_class($error)."' with message {$error->getMessage()}";
-        }else{
+        }else {
             $e = new \RuntimeException($error);
             $message = $error;
         }
         $trace = $e->getTrace();
 
-        if($e->getFile() == __FILE__){
+        if ($e->getFile() == __FILE__) {
             $file = $trace[0]['file'];
             $line = $trace[0]['line'];
-        }else{
+        }else {
             $file = $e->getFile();
             $line = $e->getLine();
         }
-        if($level){
-           Logger::$level($message, $context +['@file'=>$file, '@line'=>$line]);
+        if ($level) {
+           Logger::$level($message, $context + ['@file'=>$file, '@line'=>$line]);
         }
         throw $e;
     }
@@ -61,9 +61,9 @@ 
      */
     function models(DB $db, $entity)
     {
-        if(is_object($entity)){
+        if (is_object($entity)) {
             return $db->getApp()->make(ModelWithObject::class, ['db'=>$db, 'entity'=>$entity]);
-        }else{
+        }else {
             return $db->getApp()->make(ModelWithClass::class, ['db'=>$db, 'entityName'=>$entity]);
         }
     }