dxkite / suda

suda/src/component/route/uri/UriMatcher.php

Spacing +4 added lines, -4 removed lines

@@ -46,9 +46,9 @@ 
      * @param boolean $ignoreCase
      * @return array|null
      */
-    public function match(string $url, bool $ignoreCase = true):?array
+    public function match(string $url, bool $ignoreCase = true): ?array
     {
-        $match = '#^'. $this->match.'$#'. ($ignoreCase?'i':'');
+        $match = '#^'.$this->match.'$#'.($ignoreCase ? 'i' : '');
         $parameter = [];
         if (preg_match($match, $url, $parameter, PREG_UNMATCHED_AS_NULL) > 0) {
             return array_slice($parameter, 1);
@@ -72,12 +72,12 @@ 
             } else {
                 $value = $parameter->unpackValue($match);
             }
-            $parameters[$parameter->getIndexName()] =  $value;
+            $parameters[$parameter->getIndexName()] = $value;
         }
         return $parameters;
     }
 
-    public function getParameter(string $name):?Parameter
+    public function getParameter(string $name): ?Parameter
     {
         foreach ($this->parameter as $parameter) {
             if ($parameter->getIndexName() === $name) {

suda/src/component/route/uri/MatcherHelper.php

Spacing +12 added lines, -12 removed lines

@@ -26,18 +26,18 @@ 
         // 参数
         $parameters = [];
         // 转义正则
-        $url=preg_replace('/([\/\.\\\\\+\(\^\)\$\!\<\>\-\?\*])/', '\\\\$1', $uri);
+        $url = preg_replace('/([\/\.\\\\\+\(\^\)\$\!\<\>\-\?\*])/', '\\\\$1', $uri);
         // 添加忽略
-        $url=preg_replace('/(\[)([^\[\]]+)(?(1)\])/', '(?:$2)?', $url);
+        $url = preg_replace('/(\[)([^\[\]]+)(?(1)\])/', '(?:$2)?', $url);
         // 添加 * ? 匹配
-        $url=str_replace(['\*','\?'], ['[^/]*?','[^/]'], $url);
+        $url = str_replace(['\*', '\?'], ['[^/]*?', '[^/]'], $url);
         // 编译页面参数
-        $url=preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function ($match) use (&$parameters) {
+        $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function($match) use (&$parameters) {
             $name = $match[1];
             $type = 'string';
             $extra = '';
             if (isset($match[2])) {
-                if (strpos($match[2], '=')!==false) {
+                if (strpos($match[2], '=') !== false) {
                     list($type, $extra) = \explode('=', $match[2]);
                 } else {
                     $type = $match[2];
@@ -56,16 +56,16 @@ 
 
     public static function buildUri(UriMatcher $matcher, array $parameter, bool $allowQuery = true):string
     {
-        $uri =  $matcher->getUri();
+        $uri = $matcher->getUri();
         // 拆分参数
         list($mapper, $query) = static::analyseParameter($matcher, $parameter);
         // for * ?
-        $url=\str_replace(['*','?'], ['','-'], $uri);
+        $url = \str_replace(['*', '?'], ['', '-'], $uri);
         // for ignore value
-        $url=preg_replace_callback('/\[(.+?)\]/', function ($match) use ($matcher, $parameter, $mapper) {
+        $url = preg_replace_callback('/\[(.+?)\]/', function($match) use ($matcher, $parameter, $mapper) {
             if (preg_match('/\{(\w+).+?\}/', $match[1])) {
                 $count = 0;
-                $subUrl= static::replaceParameter($match[1], $matcher, $parameter, $mapper, $count);
+                $subUrl = static::replaceParameter($match[1], $matcher, $parameter, $mapper, $count);
                 if ($count > 0) {
                     return $subUrl;
                 }
@@ -73,7 +73,7 @@ 
             return '';
         }, $url);
  
-        $url= static::replaceParameter($url, $matcher, $parameter, $mapper);
+        $url = static::replaceParameter($url, $matcher, $parameter, $mapper);
 
         if (count($query) && $allowQuery) {
             return $url.'?'.http_build_query($query, 'v', '&', PHP_QUERY_RFC3986);
@@ -97,9 +97,9 @@ 
         return [$mapper, $query];
     }
 
-    protected static function replaceParameter(string $input, UriMatcher $matcher, array $parameter, array $mapper, ?int &$count=null)
+    protected static function replaceParameter(string $input, UriMatcher $matcher, array $parameter, array $mapper, ?int &$count = null)
     {
-        return preg_replace_callback('/\{(\w+).+?\}/', function ($match) use ($matcher, $parameter, $mapper) {
+        return preg_replace_callback('/\{(\w+).+?\}/', function($match) use ($matcher, $parameter, $mapper) {
             if (\array_key_exists($match[1], $mapper)) {
                 return $mapper[$match[1]]->packValue($parameter[$match[1]]);
             }

suda/src/component/route/RouteCollection.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
      *
      * @param RouteMatcher[] $collection
      */
-    public function __construct(array $collection=[])
+    public function __construct(array $collection = [])
     {
         $this->mergeArray($collection);
     }
@@ -34,7 +34,7 @@ 
      * @param array $collection
      * @return void
      */
-    public function mergeArray(array $collection=[])
+    public function mergeArray(array $collection = [])
     {
         $this->collection = array_merge($this->collection, $collection);
     }
@@ -68,7 +68,7 @@ 
      * @param string $name
      * @return RouteMatcher|null
      */
-    public function get(string $name):?RouteMatcher
+    public function get(string $name): ?RouteMatcher
     {
         return $this->collection[$name] ?? null;
     }

suda/src/component/route/RouteMatcher.php

Spacing +3 added lines, -3 removed lines

@@ -39,9 +39,9 @@ 
     protected $matcher;
     
 
-    public function __construct(array $methods, string $uri, array $attribute=[])
+    public function __construct(array $methods, string $uri, array $attribute = [])
     {
-        array_walk($methods, function ($value) {
+        array_walk($methods, function($value) {
             return strtoupper($value);
         });
         $this->methods = $methods;
@@ -157,7 +157,7 @@ 
      * @param RequestInterface $request
      * @return array|null
      */
-    public function match(RequestInterface $request):?array
+    public function match(RequestInterface $request): ?array
     {
         if (count($this->methods) > 0 && !\in_array($request->getMethod(), $this->methods)) {
             return null;

suda/src/component/debug/attach/DumpTrait.php

Spacing +19 added lines, -19 removed lines

@@ -15,9 +15,9 @@ 
         if ($deep > 0) {
             $vars = get_class_vars($objectName);
             foreach ($vars as $key => $value) {
-                $parameterString.=static::valueToString($key, $value, $deep);
+                $parameterString .= static::valueToString($key, $value, $deep);
             }
-            $parameterString.= static::objectGetter($objectName, $object, $deep);
+            $parameterString .= static::objectGetter($objectName, $object, $deep);
         } else {
             $parameterString = '...';
         }
@@ -27,13 +27,13 @@ 
     protected static function objectGetter(string $objectName, object $object, int $deep)
     {
         $methods = get_class_methods($objectName);
-        $parameterString ='';
+        $parameterString = '';
         foreach ($methods as $method) {
             if (strpos($method, 'get') === 0) {
                 $methodRef = new \ReflectionMethod($object, $method);
                 $ignore = \preg_match('/@ignore(-d|D)ump/i', $methodRef->getDocComment()??'') > 0;
                 if (count($methodRef->getParameters()) === 0 && !$ignore) {
-                    $parameterString.=static::valueToString($method.'()', $object->$method(), $deep);
+                    $parameterString .= static::valueToString($method.'()', $object->$method(), $deep);
                 }
             }
         }
@@ -45,7 +45,7 @@ 
         $parameterString = '';
         if ($deep > 0) {
             foreach ($array as $key => $value) {
-                $parameterString.=static::valueToString($key, $value, $deep);
+                $parameterString .= static::valueToString($key, $value, $deep);
             }
         } else {
             $parameterString = '...';
@@ -64,15 +64,15 @@ 
     protected static function valueToString(string $key, $value, int $deep):string
     {
         if (is_string($value) && strlen($value) > static::$dumpStringLength) {
-            return  $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE) .'... ,';
+            return  $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE).'... ,';
         } elseif (is_bool($value)) {
             return $key.'='.($value ? 'true' : 'false').' ,';
         } else {
-            return $key.'='.self::parameterToString($value, $deep-1) .' ,';
+            return $key.'='.self::parameterToString($value, $deep - 1).' ,';
         }
     }
 
-    public static function parameterToString($object, int $deep=2)
+    public static function parameterToString($object, int $deep = 2)
     {
         if (is_null($object)) {
             return 'NULL';
@@ -86,16 +86,16 @@ 
         return $object;
     }
 
-    public static function dumpTrace(array $backtrace, bool $str=true, string $perfix='')
+    public static function dumpTrace(array $backtrace, bool $str = true, string $perfix = '')
     {
-        $tracesConsole=[];
+        $tracesConsole = [];
         foreach ($backtrace as $trace) {
-            $tracesConsole[]=static::buildTraceLine($trace);
+            $tracesConsole[] = static::buildTraceLine($trace);
         }
         if ($str) {
-            $str='';
+            $str = '';
             foreach ($tracesConsole as $trace_info) {
-                $str.=$perfix.preg_replace('/\n/', "\n".$perfix."\t", $trace_info).PHP_EOL;
+                $str .= $perfix.preg_replace('/\n/', "\n".$perfix."\t", $trace_info).PHP_EOL;
             }
             return $str;
         }
@@ -113,22 +113,22 @@ 
         } else {
             $function = $trace['function'];
         }
-        $argsDump='';
+        $argsDump = '';
         if (!empty($trace['args'])) {
             foreach ($trace['args'] as $arg) {
-                $argsDump.= self::parameterToString($arg) .',';
+                $argsDump .= self::parameterToString($arg).',';
             }
             $argsDump = rtrim($argsDump, ',');
         }
-        $line.=' '.$function.'('.$argsDump.')';
+        $line .= ' '.$function.'('.$argsDump.')';
         return $line;
     }
 
     public static function dumpException(\Exception $e)
     {
-        $dump = get_class($e).':'. $e->getMessage() .PHP_EOL;
-        $dump.= 'At: ' . $e->getFile().':'.$e->getLine().PHP_EOL;
-        $dump.= static::dumpTrace($e->getTrace());
+        $dump = get_class($e).':'.$e->getMessage().PHP_EOL;
+        $dump .= 'At: '.$e->getFile().':'.$e->getLine().PHP_EOL;
+        $dump .= static::dumpTrace($e->getTrace());
         return $dump;
     }
 }

suda/src/component/debug/attach/DumpInterface.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@
  */
 interface DumpInterface 
 {
-    public static function parameterToString($object, int $deep=2);
+    public static function parameterToString($object, int $deep = 2);
     public static function dumpException(\Exception $e);
-    public static function dumpTrace(array $backtrace, bool $str=true, string $perfix='');
+    public static function dumpTrace(array $backtrace, bool $str = true, string $perfix = '');
 }

suda/src/component/debug/attach/AttachTrait.php

Spacing +9 added lines, -9 removed lines

@@ -11,9 +11,9 @@ 
      *
      * @var array
      */
-    protected $attribute=[];
+    protected $attribute = [];
     
-    public function addAttribute(string $name , $value)
+    public function addAttribute(string $name, $value)
     {
         $this->attribute[$name] = $value;
     }
@@ -21,10 +21,10 @@ 
     protected function analyse(array $context)
     {
         $replace = [];
-        $attach  =[] ;
+        $attach  = [];
         foreach ($context as $key => $val) {
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && ! $val instanceof \Exception) {
-                $replace['{' . $key . '}'] = $val;
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && !$val instanceof \Exception) {
+                $replace['{'.$key.'}'] = $val;
             } else {
                 $attach[$key] = $val;
             }
@@ -34,19 +34,19 @@ 
 
     public function interpolate(string $message, array $context, array $attribute)
     {
-        list($attach, $replace) =  $this->analyse($context);
+        list($attach, $replace) = $this->analyse($context);
         $attribute = array_merge($this->attribute, $attribute);
         foreach ($attribute as $key => $val) {
-            $replace['%' . $key . '%'] = $val;
+            $replace['%'.$key.'%'] = $val;
         }
         $message = strtr($message, $replace);
         $attachInfo = '';
         foreach ($attach as $name => $value) {
             $attachInfo = $name.' = ';
             if ($value instanceof AttachValueInterface) {
-                $attachInfo.= $value->getLogAttach().PHP_EOL;
+                $attachInfo .= $value->getLogAttach().PHP_EOL;
             } else {
-                $attachInfo.= DumpTrait::parameterToString($value).PHP_EOL;
+                $attachInfo .= DumpTrait::parameterToString($value).PHP_EOL;
             }
         }
         if (strlen($attachInfo) > 0) {

suda/src/component/debug/ConfigTrait.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     }
     public function getConfig(string $name) {
         $defaultConfig = $this->getDefaultConfig();
-        return $this->config[$name] ?? $defaultConfig[$name];;
+        return $this->config[$name] ?? $defaultConfig[$name]; ;
     }
 
     abstract public function getDefaultConfig():array;

suda/src/component/debug/Debug.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 
 class Debug implements LoggerInterface, LoggerAwareInterface, DumpInterface, AttachInterface, ConfigInterface
 {
-    use LoggerTrait,LoggerAwareTrait,DumpTrait,AttachTrait,ConfigTrait;
+    use LoggerTrait, LoggerAwareTrait, DumpTrait, AttachTrait, ConfigTrait;
 
     /**
      * 时间记录
@@ -51,7 +51,7 @@ 
     {
         $replace = [];
         foreach ($context as $key => $val) {
-            $replace['{' . $key . '}'] = $val;
+            $replace['{'.$key.'}'] = $val;
         }
         return strtr($message, $replace);
     }
@@ -67,26 +67,26 @@ 
         return $attribute;
     }
 
-    protected static function formatBytes(int $bytes, int $precision=0)
+    protected static function formatBytes(int $bytes, int $precision = 0)
     {
-        $human= ['B', 'KB', 'MB', 'GB', 'TB'];
+        $human = ['B', 'KB', 'MB', 'GB', 'TB'];
         $bytes = max($bytes, 0);
-        $pow = floor(($bytes?log($bytes):0)/log(1024));
-        $pos = min($pow, count($human)-1);
-        $bytes /= (1 << (10* $pos));
+        $pow = floor(($bytes ?log($bytes) : 0) / log(1024));
+        $pos = min($pow, count($human) - 1);
+        $bytes /= (1 << (10 * $pos));
         return round($bytes, $precision).' '.$human[$pos];
     }
 
-    public function time(string $name, string $type= LogLevel::INFO)
+    public function time(string $name, string $type = LogLevel::INFO)
     {
-        $this->timeRecord[$name]=['time'=>microtime(true),'level'=>$type];
+        $this->timeRecord[$name] = ['time'=>microtime(true), 'level'=>$type];
     }
 
     public function timeEnd(string $name)
     {
         if (\array_key_exists($name, $this->timeRecord)) {
-            $pass=microtime(true)-$this->timeRecord[$name]['time'];
-            $this->log($this->timeRecord[$name]['level'], 'process cost '. $name.' '. number_format($pass, 5).'s');
+            $pass = microtime(true) - $this->timeRecord[$name]['time'];
+            $this->log($this->timeRecord[$name]['level'], 'process cost '.$name.' '.number_format($pass, 5).'s');
             return $pass;
         }
         return 0;