caoym / phpboot

src/Utils/ArrayHelper.php

Spacing +6 added lines, -6 removed lines

@@ -15,16 +15,16 @@
         $keys = explode('.', $key);
         $keys = array_reverse($keys);
         $cur = &$arr;
-        while($p = array_pop($keys)){
+        while ($p = array_pop($keys)) {
             $cur instanceof \ArrayAccess || is_array($cur) or \PhpBoot\abort(new \InvalidArgumentException('array or object of ArrayAccess required'));
-            if(!isset($cur[$p])){
-                if(count($keys) == 0){
+            if (!isset($cur[$p])) {
+                if (count($keys) == 0) {
                     $cur[$p] = $val;
-                }else{
+                }else {
                     $cur[$p] = [];
                 }
-            }else{
-                if(count($keys) == 0){
+            }else {
+                if (count($keys) == 0) {
                     $cur[$p] = $val;
                 }
             }

src/Utils/Logger.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
      */
     static public function getDefaultLogger()
     {
-        if(!self::$defaultLogger){
+        if (!self::$defaultLogger) {
             self::$defaultLogger = new \Monolog\Logger('default');
         }
         return self::$defaultLogger;

src/Utils/AnnotationParams.php

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

src/Utils/TypeHint.php

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

src/Utils/TypeCast.php

Spacing +13 added lines, -13 removed lines

@@ -14,46 +14,46 @@
     {
         TypeHint::isScalarType($type) or \PhpBoot\abort(new \InvalidArgumentException("$type is not scalar type"));
 
-        if(is_bool($val)){
+        if (is_bool($val)) {
             $val = intval($val);
-        }else if($val === null){
+        }else if ($val === null) {
             $map = [
                 'string'=>'',
                 'bool'=>false,
                 'int'=>0,
                 'float'=>0,
             ];
-            if(isset($map[$type])){
+            if (isset($map[$type])) {
                 $val = $map[$type];
             }
         }
-        if(is_object($val)){
-            try{
+        if (is_object($val)) {
+            try {
                 $val = (string)$val;
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
                 $className = get_class($val);
                 \PhpBoot\abort(new \InvalidArgumentException("could not cast value from class $className to {$type}"));
             }
 
         }
-        if(is_array($val)){
-            $type == 'array' ||  $type =='mixed' || !$type or \PhpBoot\abort(new \InvalidArgumentException("could not cast value from resource to {$type}"));
+        if (is_array($val)) {
+            $type == 'array' || $type == 'mixed' || !$type or \PhpBoot\abort(new \InvalidArgumentException("could not cast value from resource to {$type}"));
         }
-        if(is_resource($val)) {
+        if (is_resource($val)) {
             \PhpBoot\abort(new \InvalidArgumentException("could not cast value from resource to {$type}"));
         }
-        if(!$validate){
+        if (!$validate) {
             settype($val, $type) or \PhpBoot\abort(new \InvalidArgumentException("cast value($val) to {$type} failed"));
-        }else{
+        }else {
             $ori = $val;
             $oriType = gettype($val);
             settype($val, $type) or \PhpBoot\abort(new \InvalidArgumentException("cast value($ori) to type {$type} failed"));
             $newData = $val;
-            if(is_bool($newData)){
+            if (is_bool($newData)) {
                 $newData = intval($newData);
             }
             settype($newData, $oriType) or \PhpBoot\abort(new \InvalidArgumentException("cast value($ori) to type {$type} failed"));
-            if($ori != $newData){
+            if ($ori != $newData) {
                 \PhpBoot\abort(new \InvalidArgumentException("could not cast value($ori) to type {$type}"));
             }
         }

src/Utils/SafeFileWriter.php

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/ArrayAdaptor.php

Spacing +28 added lines, -28 removed lines

@@ -26,19 +26,19 @@ 
      */
     public function offsetExists($offset)
     {
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             return array_key_exists($offset, $this->obj);
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             return true;
-        }elseif(method_exists($this->obj, 'has')){
+        }elseif (method_exists($this->obj, 'has')) {
             return $this->obj->has($offset);
-        }elseif(method_exists($this->obj, $method = 'has'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'has'.ucfirst($offset))) {
             return $this->obj->{$method}($offset);
-        }elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'get'.ucfirst($offset))) {
             return $this->obj->{$method}() !== null;
-        }elseif(method_exists($this->obj, 'get')){
+        }elseif (method_exists($this->obj, 'get')) {
             return $this->obj->get($offset) !== null;
-        }else{
+        }else {
             return false;
         }
     }
@@ -55,18 +55,18 @@ 
     public function offsetGet($offset)
     {
         $res = null;
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             $res = &$this->obj[$offset];
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             $res = &$this->obj->{$offset};
-        }elseif(method_exists($this->obj, 'get')){
+        }elseif (method_exists($this->obj, 'get')) {
             $res = $this->obj->get($offset);
-        }elseif(method_exists($this->obj, $method = 'get'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'get'.ucfirst($offset))) {
             $res = $this->obj->{$method}();
-        }else{
+        }else {
             throw new \InvalidArgumentException("offsetGet($offset) failed");
         }
-        if(is_array($res) || is_object($res)){
+        if (is_array($res) || is_object($res)) {
             return new self($res);
         }
         return $res;
@@ -86,15 +86,15 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             $this->obj[$offset] = $value;
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             $this->obj->{$offset} = $value;
-        }elseif(method_exists($this->obj, 'set')){
+        }elseif (method_exists($this->obj, 'set')) {
             $this->obj->set($offset, $value);
-        }elseif(method_exists($this->obj, $method = 'set'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'set'.ucfirst($offset))) {
             $this->obj->{$method}($value);
-        }else{
+        }else {
             throw new \BadMethodCallException("can not set $offset");
         }
     }
@@ -110,35 +110,35 @@ 
      */
     public function offsetUnset($offset)
     {
-        if(is_array($this->obj)){
+        if (is_array($this->obj)) {
             unset($this->obj[$offset]);
-        }elseif(self::hasProperty($this->obj, $offset)){
+        }elseif (self::hasProperty($this->obj, $offset)) {
             unset($this->obj->{$offset});
-        }elseif(method_exists($this->obj, 'remove')){
+        }elseif (method_exists($this->obj, 'remove')) {
             $this->obj->remove($offset);
-        }elseif(method_exists($this->obj, $method = 'remove'.ucfirst($offset))){
+        }elseif (method_exists($this->obj, $method = 'remove'.ucfirst($offset))) {
             $this->obj->$method();
-        }else{
+        }else {
             throw new \InvalidArgumentException("offsetUnset($offset) failed");
         }
     }
-    static public function strip($obj){
-        if($obj instanceof self){
+    static public function strip($obj) {
+        if ($obj instanceof self) {
             return $obj->obj;
         }
         return $obj;
     }
     static function hasProperty($object, $name)
     {
-        if(!is_object($object)){
+        if (!is_object($object)) {
             return false;
         }
         $class = new \ReflectionClass($object);
-        if(!$class->hasProperty($name)){
+        if (!$class->hasProperty($name)) {
             return false;
         }
         $property = $class->getProperty($name);
-        if(!$property){
+        if (!$property) {
             return false;
         }
         return $property->isPublic();

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;
         }
     }
@@ -68,7 +68,7 @@ 
     abstract protected function createContainer($className);
 
 
-    protected function handleAnnotation($handlerName, $container, $ann){
+    protected function handleAnnotation($handlerName, $container, $ann) {
         $handler = new $handlerName();
         return $handler($container, $ann);
     }
@@ -80,15 +80,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);
             }
         }
@@ -98,7 +98,7 @@ 
     /**
      * @var array
      */
-    private $annotations=[];
+    private $annotations = [];
     /**
      * @var Cache
      */

src/Annotation/AnnotationBlock.php

Spacing +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@ 
      * @param AnnotationTag[] $children
      * @param AnnotationBlock|null $parent
      */
-    public function __construct($name='',
-                                $summary='',
-                                $description='',
-                                $children=[],
-                                $parent=null)
+    public function __construct($name = '',
+                                $summary = '',
+                                $description = '',
+                                $children = [],
+                                $parent = null)
     {
         $this->name = $name;
         $this->summary = $summary;
@@ -37,11 +37,11 @@ 
     /**
      * @var string
      */
-    public $description='';
+    public $description = '';
     /**
      * @var AnnotationTag[]
      */
-    public $children=[];
+    public $children = [];
 
     /**
      * @var AnnotationTag|null