dxkite / suda

nebula/route/uri/MatcherHelper.php

Spacing +13 added lines, -13 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,7 +56,7 @@ 
 
     public static function buildUri(UriMatcher $matcher, array $parameter, bool $allowQuery = true):string
     {
-        $uri =  $matcher->getUri();
+        $uri = $matcher->getUri();
         $query = [];
         $mapper = [];
 
@@ -70,13 +70,13 @@ 
         }
 
         // 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);
-                if ($count > 0 ){
+                $subUrl = static::replaceParameter($match[1], $matcher, $parameter, $mapper, $count);
+                if ($count > 0) {
                     return $subUrl;
                 }
                 throw new Exception(sprintf('unknown parameter %s in %s', $key, $matcher->getUri()), 1);
@@ -85,7 +85,7 @@ 
             }
         }, $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);
@@ -94,8 +94,8 @@ 
     }
 
 
-    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) {
+    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) {
             if (\array_key_exists($match[1], $mapper)) {
                 return $mapper[$match[1]]->packValue($parameter[$match[1]]);
             }

nebula/route/uri/UriMatcher.php

Spacing +4 added lines, -4 removed lines

@@ -45,9 +45,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' : '');
         if (preg_match($match, $url, $parameter)) {
             array_shift($parameter);
             return $parameter;
@@ -70,12 +70,12 @@ 
             } else {
                 $value = $parameter->getDefaultValue();
             }
-            $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) {
                 return $parameter;