caoym / phpboot

src/Controller/RequestHandler.php

Spacing +19 added lines, -19 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @param ParamMeta[] $paramMates
      */
-    public function __construct(array $paramMates=[]){
+    public function __construct(array $paramMates = []) {
         $this->paramMetas = $paramMates;
     }
 
@@ -26,32 +26,32 @@ 
      * @param array $reference
      * @return void
      */
-    public function handle(Application $app, Request $request, array &$params, array &$reference){
+    public function handle(Application $app, Request $request, array &$params, array &$reference) {
 
         $vld = new Validator();
         $req = ['request'=>$request];
         $requestArray = new ArrayAdaptor($req);
         $inputs = [];
-        foreach ($this->paramMetas as $k=>$meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $k=>$meta) {
+            if ($meta->isPassedByReference) {
                 // param PassedByReference is used to output
                 continue;
             }
             $source = \JmesPath\search($meta->source, $requestArray);
-            if ($source !== null){
+            if ($source !== null) {
                 $source = ArrayAdaptor::strip($source);
-                if($source instanceof ParameterBag){
+                if ($source instanceof ParameterBag) {
                     $source = $source->all();
                 }
-                if($meta->container){
+                if ($meta->container) {
                     $inputs[$meta->name] = $meta->container->make($source);
-                }else{
+                }else {
                     $inputs[$meta->name] = $source;
                 }
-                if($meta->validation){
+                if ($meta->validation) {
                     $vld->rule($meta->validation, $meta->name);
                 }
-            }else{
+            }else {
                 $meta->isOptional or \PhpBoot\abort(new BadRequestHttpException("param $source is required"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -66,10 +66,10 @@ 
         );
 
         $pos = 0;
-        foreach ($this->paramMetas as $meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->isPassedByReference) {
                 $params[$pos] = &$reference[$meta->name];
-            }else{
+            }else {
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;
@@ -77,15 +77,15 @@ 
         }
     }
 
-    public function getParamNames(){
-        return array_map(function($meta){return $meta->name;}, $this->paramMetas);
+    public function getParamNames() {
+        return array_map(function($meta) {return $meta->name; }, $this->paramMetas);
     }
 
     /**
      * 获取参数列表
      * @return ParamMeta[]
      */
-    public function getParamMetas(){
+    public function getParamMetas() {
         return $this->paramMetas;
     }
 
@@ -94,9 +94,9 @@ 
      * @param $name
      * @return ParamMeta|null
      */
-    public function getParamMeta($name){
-        foreach ($this->paramMetas as $meta){
-            if($meta->name == $name){
+    public function getParamMeta($name) {
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->name == $name) {
                 return $meta;
             }
         }

src/Controller/Annotations/ParamAnnotationHandler.php

Spacing +12 added lines, -12 removed lines

@@ -21,17 +21,17 @@ 
         $paramType = null;
         $paramName = null;
         $paramDoc = '';
-        if(substr($text, 0, 1) == '$'){ //带$前缀的是变量
+        if (substr($text, 0, 1) == '$') { //带$前缀的是变量
             $params = new AnnotationParams($text, 2);
             $paramName = substr($params->getParam(0), 1);
             $paramDoc = $params->getRawParam(1, '');
-        }else{
+        }else {
             $params = new AnnotationParams($text, 3);
-            if ($params->count() >=2 && substr($params->getParam(1), 0, 1) == '$'){
+            if ($params->count()>=2 && substr($params->getParam(1), 0, 1) == '$') {
                 $paramType = $params->getParam(0); //TODO 检测类型是否合法
                 $paramName = substr($params->getParam(1), 1);
                 $paramDoc = $params->getRawParam(2, '');
-            }else{
+            }else {
                 \PhpBoot\abort(new AnnotationSyntaxException("@param $text syntax error"));
             }
         }
@@ -44,15 +44,15 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        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;
         }
         $className = $container->getClassName();
 
@@ -61,18 +61,18 @@ 
         $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
         $paramMeta or \PhpBoot\abort(new AnnotationSyntaxException("$className::$target param $paramName not exist "));
         //TODO 检测声明的类型和注释的类型是否匹配
-        if($paramType){
-            $paramMeta->type = TypeHint::normalize($paramType, $className);//or \PhpBoot\abort(new AnnotationSyntaxException("{$container->getClassName()}::{$ann->parent->name} @{$ann->name} syntax error, param $paramName unknown type:$paramType "));
+        if ($paramType) {
+            $paramMeta->type = TypeHint::normalize($paramType, $className); //or \PhpBoot\abort(new AnnotationSyntaxException("{$container->getClassName()}::{$ann->parent->name} @{$ann->name} syntax error, param $paramName unknown type:$paramType "));
             $container = ContainerFactory::create($entityBuilder, $paramMeta->type);
             $paramMeta->container = $container;
         }
         $paramMeta->description = $paramDoc;
 
         $responseHandler = $route->getResponseHandler();
-        if($paramMeta->isPassedByReference && $responseHandler){
+        if ($paramMeta->isPassedByReference && $responseHandler) {
             $mappings = $responseHandler->getMappings();
-            foreach ($mappings as $k => $v){
-                if($v->source == 'params.'.$paramMeta->name){
+            foreach ($mappings as $k => $v) {
+                if ($v->source == 'params.'.$paramMeta->name) {
                     $v->description = $paramMeta->description;
                     $v->type = $paramMeta->type;
                     $v->container = $paramMeta->container;

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)) {

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()

src/Cache/ClassModifiedChecker.php

Spacing +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@ 
 
 class ClassModifiedChecker extends FileModifiedChecker
 {
-    function __construct($className){
+    function __construct($className) {
         $class = new \ReflectionClass($className);
         $files = [];
 
-        if($class->getFileName()){
+        if ($class->getFileName()) {
             $files[] = $class->getFileName();
             self::getParentFileName($class, $files);
         }
@@ -18,15 +18,15 @@ 
     static public function getParentFileName(\ReflectionClass $class, array &$files)
     {
         $parent = $class->getParentClass();
-        if(!$parent){
+        if (!$parent) {
             return;
         }
-        if($parent->getFileName()){
+        if ($parent->getFileName()) {
             $files[] = $parent->getParentClass();
             self::getParentFileName($parent, $files);
         }
-        foreach ($class->getInterfaces() as $interface){
-            if($interface->getFileName()){
+        foreach ($class->getInterfaces() as $interface) {
+            if ($interface->getFileName()) {
                 $files[] = $interface->getFileName();
                 self::getParentFileName($interface, $files);
             }