caoym / phpboot

src/Console.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 
     /**
-     * @param $className
+     * @param string $className
      * @throws \Exception
      */
     public function loadCommandsFromClass($className)

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use PhpBoot\Console\ConsoleContainer;
 use PhpBoot\Console\ConsoleContainerBuilder;
 use PhpBoot\DI\Traits\EnableDIAnnotations;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
         $container = $this->consoleContainerBuilder->build($className);
         /**@var ConsoleContainer $container*/
         foreach ($container->getCommands() as $name => $command) {
-            $command->setCode(function (InputInterface $input, OutputInterface $output)use ($container, $command){
+            $command->setCode(function(InputInterface $input, OutputInterface $output)use ($container, $command){
                 return $command->invoke($container, $input, $output);
             });
             $this->add($command);
@@ -54,7 +54,7 @@ 
     {
         $dir = @dir($fromPath) or abort("dir $fromPath not exist");
 
-        $getEach = function () use ($dir) {
+        $getEach = function() use ($dir) {
             $name = $dir->read();
             if (!$name) {
                 return $name;
@@ -66,11 +66,11 @@ 
             if ($entry == '.' || $entry == '..') {
                 continue;
             }
-            $path = $fromPath . '/' . str_replace('\\', '/', $entry);
+            $path = $fromPath.'/'.str_replace('\\', '/', $entry);
             if (is_file($path) && substr_compare($entry, '.php', strlen($entry) - 4, 4, true) == 0) {
-                $class_name = $namespace . '\\' . substr($entry, 0, strlen($entry) - 4);
+                $class_name = $namespace.'\\'.substr($entry, 0, strlen($entry) - 4);
                 $this->loadCommandsFromClass($class_name);
-            } else {
+            }else {
                 //\Log::debug($path.' ignored');
             }
         }

src/Console/Annotations/CommandAnnotationHandler.php

Unused Use Statements -7 removed lines

@@ -2,17 +2,10 @@
 
 namespace PhpBoot\Console\Annotations;
 
-use DI\InvokerInterface;
-use FastRoute\RouteParser\Std;
 use PhpBoot\Console\Command;
 use PhpBoot\Console\ConsoleContainer;
 use PhpBoot\Entity\ContainerFactory;
 use PhpBoot\Entity\EntityContainerBuilder;
-use PhpBoot\Metas\ReturnMeta;
-use PhpBoot\Annotation\AnnotationBlock;
-use PhpBoot\Annotation\AnnotationTag;
-use PhpBoot\Entity\MixedTypeContainer;
-use PhpBoot\Exceptions\AnnotationSyntaxException;
 use PhpBoot\Metas\ParamMeta;
 use PhpBoot\Utils\AnnotationParams;
 

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
         $name = $params->getParam(0, $target);
 
         //获取方法参数信息
-        $rfl =  new \ReflectionClass($container->getClassName());
+        $rfl = new \ReflectionClass($container->getClassName());
         $method = $rfl->getMethod($target);
         $methodParams = $method->getParameters();
 
@@ -35,19 +35,19 @@ 
 
         //设置参数列表
         $paramsMeta = [];
-        foreach ($methodParams as $param){
+        foreach ($methodParams as $param) {
             $paramName = $param->getName();
             $source = "argv.$paramName";
             $paramClass = $param->getClass();
-            if($paramClass){
+            if ($paramClass) {
                 $paramClass = $paramClass->getName();
             }
             $entityContainer = ContainerFactory::create($entityBuilder, $paramClass);
             $meta = new ParamMeta($paramName,
                 $source,
-                $paramClass?:'mixed',
+                $paramClass ?: 'mixed',
                 $param->isOptional(),
-                $param->isOptional()?$param->getDefaultValue():null,
+                $param->isOptional() ? $param->getDefaultValue() : null,
                 $param->isPassedByReference(),
                 null,
                 '',

src/Console/Command.php

Doc Comments +3 added lines

@@ -64,6 +64,9 @@
         }
     }
 
+    /**
+     * @param string|null $name
+     */
     public function getParamMeta($name)
     {
         foreach ($this->paramMetas as $meta){

Spacing +21 added lines, -21 removed lines

@@ -34,7 +34,7 @@ 
 
     public function __construct($actionName, $name)
     {
-        parent::__construct($name?:$actionName);
+        parent::__construct($name ?: $actionName);
         $this->actionName = $actionName;
     }
     /**
@@ -47,14 +47,14 @@ 
 
     public function postCreate(ConsoleContainer $container)
     {
-        if($container->getModuleName()){
+        if ($container->getModuleName()) {
             $this->setName($container->getModuleName().'.'.$this->getName());
         }
 
-        foreach ($this->paramMetas as $paramMeta){
-            $mode = $paramMeta->isOptional?InputArgument::OPTIONAL:InputArgument::REQUIRED;
-            if($paramMeta->container instanceof ArrayContainer || $paramMeta->container instanceof EntityContainer){
-                $mode = $mode|InputArgument::IS_ARRAY;
+        foreach ($this->paramMetas as $paramMeta) {
+            $mode = $paramMeta->isOptional ?InputArgument::OPTIONAL : InputArgument::REQUIRED;
+            if ($paramMeta->container instanceof ArrayContainer || $paramMeta->container instanceof EntityContainer) {
+                $mode = $mode | InputArgument::IS_ARRAY;
             }
             $this->addArgument($paramMeta->name,
                 $mode,
@@ -66,8 +66,8 @@ 
 
     public function getParamMeta($name)
     {
-        foreach ($this->paramMetas as $meta){
-            if($meta->name == $name){
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->name == $name) {
                 return $meta;
             }
         }
@@ -78,7 +78,7 @@ 
     {
         $params = [];
         $reference = [];
-        $this->bindInput($input, $params,$reference);
+        $this->bindInput($input, $params, $reference);
         ob_start();
         $code = call_user_func_array([$container->getInstance(), $this->actionName], $params);
         $out = ob_get_contents();
@@ -87,31 +87,31 @@ 
         return $code;
     }
 
-    public function bindInput(InputInterface $input, array &$params, array &$reference){
+    public function bindInput(InputInterface $input, array &$params, array &$reference) {
         $vld = new Validator();
         $req = ['argv'=>$input->getArguments()];
         $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 \InvalidArgumentException("the parameter \"{$meta->source}\" is missing"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -127,10 +127,10 @@ 
         );
 
         $pos = 0;
-        foreach ($this->paramMetas as $meta){
-            if($meta->isPassedByReference){
+        foreach ($this->paramMetas as $meta) {
+            if ($meta->isPassedByReference) {
                 $params[$pos] = null;
-            }else{
+            }else {
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;

Braces +3 added lines, -3 removed lines

@@ -105,13 +105,13 @@ 
                 }
                 if($meta->container){
                     $inputs[$meta->name] = $meta->container->make($source);
-                }else{
+                } else{
                     $inputs[$meta->name] = $source;
                 }
                 if($meta->validation){
                     $vld->rule($meta->validation, $meta->name);
                 }
-            }else{
+            } else{
                 $meta->isOptional or \PhpBoot\abort(new \InvalidArgumentException("the parameter \"{$meta->source}\" is missing"));
                 $inputs[$meta->name] = $meta->default;
             }
@@ -130,7 +130,7 @@ 
         foreach ($this->paramMetas as $meta){
             if($meta->isPassedByReference){
                 $params[$pos] = null;
-            }else{
+            } else{
                 $params[$pos] = $inputs[$meta->name];
             }
             $pos++;

src/Annotation/ContainerBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -41,22 +41,22 @@ 
         //TODO【重要】 使用全局的缓存版本号, 而不是针对每个文件判断缓存过期与否
         $rfl = new \ReflectionClass($className) or \PhpBoot\abort("load class $className failed");
         $fileName = $rfl->getFileName();
-        $key = str_replace('\\','.',get_class($this)).md5(serialize($this->annotations).$fileName.$className);
+        $key = str_replace('\\', '.', get_class($this)).md5(serialize($this->annotations).$fileName.$className);
         $cache = new CheckableCache($this->cache);
         $res = $cache->get($key, $this);
-        if($res === $this){
-            try{
+        if ($res === $this) {
+            try {
                 $meta = $this->buildWithoutCache($className);
-                $cache->set($key, $meta, 0, $fileName?new ClassModifiedChecker($className):null);
+                $cache->set($key, $meta, 0, $fileName ? new ClassModifiedChecker($className) : null);
                 return $meta;
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
                 Logger::warning(__METHOD__.' failed with '.$e->getMessage());
-                $cache->set($key, $e->getMessage(), 0, $fileName?new ClassModifiedChecker($className):null);
+                $cache->set($key, $e->getMessage(), 0, $fileName ? new ClassModifiedChecker($className) : null);
                 throw $e;
             }
-        }elseif(is_string($res)){
+        }elseif (is_string($res)) {
             \PhpBoot\abort($res);
-        }else{
+        }else {
             return $res;
         }
     }
@@ -71,7 +71,7 @@ 
     {
 
     }
-    protected function handleAnnotation($handlerName, $container, $ann){
+    protected function handleAnnotation($handlerName, $container, $ann) {
         $handler = new $handlerName();
         return $handler($container, $ann);
     }
@@ -83,15 +83,15 @@ 
     {
         $container = $this->createContainer($className);
         $anns = AnnotationReader::read($className, $this->cache);
-        foreach ($this->annotations as $i){
+        foreach ($this->annotations as $i) {
             list($class, $target) = $i;
 
             $found = \JmesPath\search($target, $anns);
-            if(is_array($found)){
-                foreach ($found as $f){
-                    $this->handleAnnotation($class, $container,$f); //TODO 支持
+            if (is_array($found)) {
+                foreach ($found as $f) {
+                    $this->handleAnnotation($class, $container, $f); //TODO 支持
                 }
-            }else{
+            }else {
                 $this->handleAnnotation($class, $container, $found);
             }
         }
@@ -102,7 +102,7 @@ 
     /**
      * @var array
      */
-    private $annotations=[];
+    private $annotations = [];
     /**
      * @var Cache
      */

src/Console/ConsoleContainerBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 class ConsoleContainerBuilder extends ContainerBuilder
 {
-    static $DEFAULT_ANNOTATIONS=[
+    static $DEFAULT_ANNOTATIONS = [
         [ClassAnnotationHandler::class, 'class'],
         [CommandNameAnnotationHandler::class, "class.children[?name=='command']"],
         [CommandAnnotationHandler::class, "methods.*.children[?name=='command'][]"],
@@ -43,9 +43,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/Console/ConsoleContainer.php

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
 
     public function getCommand($target)
     {
-        return isset($this->commands[$target])?$this->commands[$target]:null;
+        return isset($this->commands[$target]) ? $this->commands[$target] : null;
     }
     /**
      * @return string
@@ -102,7 +102,7 @@ 
     }
     public function postCreate()
     {
-        foreach ($this->commands as $command){
+        foreach ($this->commands as $command) {
             $command->postCreate($this);
         }
     }
@@ -118,8 +118,8 @@ 
      */
     public function getInstance()
     {
-        if(!$this->instance ){
-            $this->instance  = $this->factory->make($this->getClassName());
+        if (!$this->instance) {
+            $this->instance = $this->factory->make($this->getClassName());
         }
         return $this->instance;
     }

src/Console/Annotations/ParamAnnotationHandler.php

Spacing +9 added lines, -9 removed lines

@@ -22,17 +22,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"));
             }
         }
@@ -45,15 +45,15 @@ 
      */
     public function __invoke(ConsoleContainer $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;
         $command = $container->getCommand($target);
-        if(!$command){
+        if (!$command) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
         $className = $container->getClassName();
 
@@ -62,8 +62,8 @@ 
         $paramMeta = $command->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;
         }

Braces +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
             $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) == '$'){
                 $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"));
             }
         }

src/Console/Annotations/ValidateAnnotationHandler.php

Spacing +7 added lines, -7 removed lines

@@ -18,29 +18,29 @@
      */
     public function __invoke(ConsoleContainer $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;
         $command = $container->getCommand($target);
-        if(!$command){
+        if (!$command) {
             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 = $command->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 = $command->getParamMeta($paramName);
             if($params->count()>1){
                 $paramMeta->validation = [$params[0], $params[1]];
-            }else{
+            } else{
                 $paramMeta->validation = $params[0];
                 if($paramMeta->validation) {
                     $v = new Validator();