dxkite / suda

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

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

nebula/src/component/route/uri/parameter/Parameter.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 /**
  * 匹配参数
  */
-abstract class Parameter   {
+abstract class Parameter {
 
     protected static $name;
     /**
@@ -25,7 +25,7 @@ 
     }
 
     public static function build(string $indexName, string $extra):Parameter {
-        $parameter =  new static($extra);
+        $parameter = new static($extra);
         $parameter->setIndexName($indexName);
         return $parameter;
     }

nebula/src/component/route/RouteMatcher.php

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,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;
@@ -139,7 +139,7 @@ 
      * @param RequestInterface $request
      * @return array|null
      */
-    public function match(RequestInterface $request):?array {
+    public function match(RequestInterface $request): ?array {
         if (\in_array($request->getMethod(), $this->methods)) {
             if ($parameter = $this->matcher->match($request->getUrl())) {
                 return $this->matcher->buildParamter($parameter);

nebula/src/component/loader/PathInterface.php

Spacing +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
 
     public static function toAbsolutePath(string $path, string $separator = DIRECTORY_SEPARATOR):string;
 
-    public static function getHomePath():?string;
+    public static function getHomePath(): ?string;
 }

nebula/src/component/loader/PathTrait.php

Spacing +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
 {    
     public static function formatSeparator(string $path):string
     {
-        return str_replace(['\\','/'], DIRECTORY_SEPARATOR, $path);
+        return str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $path);
     }
 
     public static function toAbsolutePath(string $path, string $separator = DIRECTORY_SEPARATOR):string{
@@ -30,7 +30,7 @@ 
             $subpath = substr($subpath, 1);
         } else {
             if (strpos($subpath, ':/') === false) {
-                $subpath=str_replace(['/', '\\'], '/', getcwd()).'/'.$subpath;
+                $subpath = str_replace(['/', '\\'], '/', getcwd()).'/'.$subpath;
             }
             list($root, $subpath) = explode(':/', $subpath, 2);
             $root .= ':'.DIRECTORY_SEPARATOR;
@@ -48,7 +48,7 @@ 
             } elseif ($name === '.') {
                 continue;
             } elseif (strlen($name)) {
-                $absulotePaths[]=$name;
+                $absulotePaths[] = $name;
             }
         }
         return implode($separator, $absulotePaths);
@@ -57,20 +57,20 @@ 
     protected static function parsePathSchemeSubpath(string $path):array
     {
         if (static::getHomePath() !== null && strpos($path, '~') === 0) {
-            $scheme ='';
-            $subpath = static::getHomePath() .DIRECTORY_SEPARATOR.substr($path, 1);
+            $scheme = '';
+            $subpath = static::getHomePath().DIRECTORY_SEPARATOR.substr($path, 1);
         } elseif (strpos($path, '://') !== false) {
             list($scheme, $subpath) = explode('://', $path, 2);
-            $scheme.='://';
+            $scheme .= '://';
         } else {
-            $scheme ='';
+            $scheme = '';
             $subpath = $path;
         }
         return [$scheme, $subpath];
     }
 
 
-    public static function getHomePath():?string {
+    public static function getHomePath(): ?string {
         if (defined('USER_HOME_PATH')) {
             return constant('USER_HOME_PATH');
         }

nebula/src/component/loader/LoaderAwareTrait.php

Indentation +5 added lines, -5 removed lines

@@ -5,11 +5,11 @@
 
 trait LoaderAwareTrait
 {
-     /**
-     * 加载器
-     *
-     * @var Loader
-     */
+        /**
+         * 加载器
+         *
+         * @var Loader
+         */
     protected $loader;
 
     

nebula/src/component/loader/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $className
      * @return string|null
      */
-    public  function getClassPath(string $className):?string
+    public  function getClassPath(string $className): ?string
     {
         // 搜索路径
         foreach ($this->includePath as $includeNamespace => $includePaths) {
@@ -78,10 +78,10 @@ 
      * @param string $className
      * @return string|null
      */
-    protected  function getClassPathByAlias(string $includePath, string $className):?string
+    protected  function getClassPathByAlias(string $includePath, string $className): ?string
     {
-        $namepath=static::formatSeparator($className);
-        $className=static::realName($className);
+        $namepath = static::formatSeparator($className);
+        $className = static::realName($className);
         foreach ($this->namespace as $namespace) {
             $path = $includePath.DIRECTORY_SEPARATOR.$namespace.DIRECTORY_SEPARATOR.$namepath.'.php';
             if ($path = static::realPath($path)) {
@@ -103,16 +103,16 @@ 
      * @param string $className
      * @return string|null
      */
-    protected  function getClassPathByName(string $includeNamespace, string $includePath, string $className):?string
+    protected  function getClassPathByName(string $includeNamespace, string $includePath, string $className): ?string
     {
         if (is_numeric($includeNamespace)) {
             $path = $includePath.DIRECTORY_SEPARATOR.static::formatSeparator($className).'.php';
         } else {
             $nl = strlen($includeNamespace);
             if (substr(static::realName($className), 0, $nl) === $includeNamespace) {
-                $path=$includePath.DIRECTORY_SEPARATOR.static::formatSeparator(substr($className, $nl)).'.php';
+                $path = $includePath.DIRECTORY_SEPARATOR.static::formatSeparator(substr($className, $nl)).'.php';
             } else {
-                $path=$includePath.DIRECTORY_SEPARATOR.static::formatSeparator($className).'.php';
+                $path = $includePath.DIRECTORY_SEPARATOR.static::formatSeparator($className).'.php';
             }
         }
         if ($path = static::realPath($path)) {

nebula/src/component/runnable/Runnable.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
  * 可执行命令表达式
  *
  */
-class Runnable   {
+class Runnable {
 
     /**
      * 运行对象
@@ -21,7 +21,7 @@ 
      */
     protected $target;
 
-    public function __construct($runnable, array $parameter=[]) {
+    public function __construct($runnable, array $parameter = []) {
         $this->target = TargetBuilder::build($runnable, $parameter);
     }