dxkite / suda

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.'/?/';

nebula/request/attribute/AttributeAbstract.php

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
      *
      * @return array|null
      */
-    public function json():?array;
+    public function json(): ?array;
    
     /**
      * 获取GET参数
@@ -53,7 +53,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function get(?string $name=null, $default =null);
+    public function get(?string $name = null, $default = null);
 
     /**
      * 获取POST请求的值
@@ -62,7 +62,7 @@ 
      * @param mixed $default
      * @return mixed 获取的值
      */
-    public static function post(?string $name=null, $default=null);
+    public static function post(?string $name = null, $default = null);
 
     /**
      * 获取HTTP输入
@@ -85,7 +85,7 @@ 
      * @param string|null $name
      * @return boolean
      */
-    public function hasGet(?string $name=null);
+    public function hasGet(?string $name = null);
 
     /**
      * 判断是否有JSON数据请求
@@ -99,7 +99,7 @@ 
      *
      * @return boolean
      */
-    public function hasPost(?string $name=null);
+    public function hasPost(?string $name = null);
     
     /**
      * 获取参数
@@ -115,7 +115,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getHeader(string $name, $default =null);
+    public function getHeader(string $name, $default = null);
 
     // Uri
     /**

nebula/request/Request.php

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getHeader(string $name, $default =null)
+    public function getHeader(string $name, $default = null)
     {
         if (array_key_exists(strtolower($name), $this->headers)) {
             return $this->headers[$name];
@@ -92,7 +92,7 @@ 
      */
     public function ip()
     {
-        static $ipFrom = ['HTTP_CLIENT_IP','HTTP_X_FORWARDED_FOR','HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP','HTTP_FORWARDED_FOR','HTTP_FORWARDED','REMOTE_ADDR'];
+        static $ipFrom = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP', 'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR'];
         foreach ($ipFrom as $key) {
             if (array_key_exists($key, $_SERVER)) {
                 foreach (explode(',', $_SERVER[$key]) as $ip) {
@@ -121,8 +121,8 @@ 
         }
         $method = strtoupper($server['REQUEST_METHOD'] ?? 'GET');
         $Uri = $server['REQUEST_Uri']??'/';
-        $headers  = HeaderItem::buildFromServer($server ?: $_SERVER);
-        $request =  new Request($method, $Uri, $headers);
+        $headers = HeaderItem::buildFromServer($server ?: $_SERVER);
+        $request = new Request($method, $Uri, $headers);
         $request->setDocumentRoot($server['DOCUMENT_ROOT']);
         if ($simulate && $server !== null) {
             $request->setServer($server);