dxkite / suda

nebula/route/uri/MatchBuilder.php

Spacing +5 added lines, -5 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];

nebula/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/request/attribute/UriAttribute.php

Spacing +9 added lines, -9 removed lines

@@ -152,7 +152,7 @@ 
         } else {
             $indexFile = substr($this->getEntranceFile(), strlen($this->getDocumentRoot()));
         }
-        return $this->indexFile = str_replace('\\', '/' ,$indexFile);
+        return $this->indexFile = str_replace('\\', '/', $indexFile);
     }
 
     /**
@@ -165,26 +165,26 @@ 
     {
         $Url = $this->Uri;
 
-        $queryString='';
+        $queryString = '';
         // for /?/xx
         if (\strpos($Url, '/?/') === 0) {
             $Url = substr($Url, 2);
         }
         $indexFile = $this->getIndexFile();
-        if (\strpos($Url, $indexFile) ===0) {
+        if (\strpos($Url, $indexFile) === 0) {
             // for /index.php/
-            $Url = \substr($Url, strlen($indexFile));// for /index.php?/
+            $Url = \substr($Url, strlen($indexFile)); // for /index.php?/
             if (\strpos($Url, '?/') === 0) {
                 $Url = ltrim($Url, '?');
             }
             // for /index.php
-            elseif (\strpos($Url, '/')!== 0) {
+            elseif (\strpos($Url, '/') !== 0) {
                 $Url = '/'.$Url;
             }
         }
         $queryStart = \strpos($Url, '?');
         if ($queryStart !== false) {
-            $queryString = \substr($Url, $queryStart+1);
+            $queryString = \substr($Url, $queryStart + 1);
             $Url = \substr($Url, 0, $queryStart);
         }
         $this->Url = $Url;
@@ -192,7 +192,7 @@ 
             parse_str($queryString, $this->queryParameter);
         }
         if ($applyServer) {
-            $_SERVER['PATH_INFO'] =  $this->Url;
+            $_SERVER['PATH_INFO'] = $this->Url;
             $_SERVER['SCRIPT_NAME'] = $this->getIndexFile();
             $_SERVER['PHP_SELF'] = $this->getIndexFile();
             $_GET = $this->queryParameter;
@@ -210,8 +210,8 @@ 
         }
         $serverBasicUri = $this->getServerUri();
         $indexFile = $this->getIndexFile();
-        $isWindows = DIRECTORY_SEPARATOR ===  '\\';
-        $isRoot= in_array(substr($indexFile, 1), static::getDefaultIndexs());
+        $isWindows = DIRECTORY_SEPARATOR === '\\';
+        $isRoot = in_array(substr($indexFile, 1), static::getDefaultIndexs());
         if ($this->enabledRewrite && $isRoot) {
             if ($isWindows && !$this->enabledBeautifyUrl) {
                 return $this->basicUri = $serverBasicUri.'/?/';