dxkite / suda

nebula/request/file/UploadedFile.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 /**
  * HTTP请求文件
  */
-class UploadedFile  extends File  {
+class UploadedFile  extends File {
 
     private $originalName;
     private $mimeType;

nebula/request/file/File.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /**
  * HTTP请求文件
  */
-class File  extends \SplFileInfo  {
+class File  extends \SplFileInfo {
     /**
      * 创建文件
      *

nebula/request/attribute/FormDataAttribute.php

Spacing +8 added lines, -8 removed lines

@@ -48,12 +48,12 @@ 
      *
      * @return array|null
      */
-    public function json():?array {
+    public function json(): ?array {
         if (isset($this->json)) {
             return $this->json;
         }
-        $data =json_decode($this->input(), true, 512, JSON_BIGINT_AS_STRING);
-        if (json_last_error()!==JSON_ERROR_NONE) {
+        $data = json_decode($this->input(), true, 512, JSON_BIGINT_AS_STRING);
+        if (json_last_error() !== JSON_ERROR_NONE) {
             $this->json = null;
         }
         return $this->json = $data;
@@ -66,7 +66,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function get(?string $name=null, $default =null)
+    public function get(?string $name = null, $default = null)
     {
         return $this->getParameter($name, $default);
     }
@@ -78,7 +78,7 @@ 
      * @param mixed $default
      * @return mixed 获取的值
      */
-    public static function post(?string $name=null, $default=null)
+    public static function post(?string $name = null, $default = null)
     {
         if (is_null($name)) {
             return $_POST;
@@ -128,7 +128,7 @@ 
      * @param string|null $name
      * @return boolean
      */
-    public function hasGet(?string $name=null)
+    public function hasGet(?string $name = null)
     {
         $get = $this->getParameter();
         if (is_null($name)) {
@@ -157,7 +157,7 @@ 
      *
      * @return boolean
      */
-    public function hasPost(?string $name=null)
+    public function hasPost(?string $name = null)
     {
         $post = $this->post();
         if ($name) {
@@ -180,7 +180,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    abstract public function getHeader(string $name, $default =null);
+    abstract public function getHeader(string $name, $default = null);
     /**
      * 获取请求参数
      *

nebula/request/attribute/AttributeAbstract.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @return array|null
      */
-    public function json():?array;
+    public function json(): ?array;
    
     /**
      * 获取GET参数
@@ -44,7 +44,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function get(?string $name=null, $default =null);
+    public function get(?string $name = null, $default = null);
 
     /**
      * 获取POST请求的值
@@ -53,7 +53,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输入
@@ -76,7 +76,7 @@ 
      * @param string|null $name
      * @return boolean
      */
-    public function hasGet(?string $name=null);
+    public function hasGet(?string $name = null);
 
     /**
      * 判断是否有JSON数据请求
@@ -90,7 +90,7 @@ 
      *
      * @return boolean
      */
-    public function hasPost(?string $name=null);
+    public function hasPost(?string $name = null);
     
     /**
      * 获取参数
@@ -106,7 +106,7 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getHeader(string $name, $default =null);
+    public function getHeader(string $name, $default = null);
 
     // URI
     /**

public/dev.php

Spacing +6 added lines, -6 removed lines

@@ -4,7 +4,7 @@ 
 
 use nebula\request\Request;
 
-require_once __DIR__ .'/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 $request = Request::buildFromServer();
 $request->apply(true);
@@ -12,13 +12,13 @@ 
 var_dump($request);
 var_dump($request->getBasicURI());
 
-function formatBytes(int $bytes, int $precision=0)
+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];
 }
 

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];
         }
@@ -90,7 +90,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) {
@@ -117,8 +117,8 @@ 
         }
         $method = strtoupper($server['REQUEST_METHOD'] ?? 'GET');
         $uri = $server['REQUEST_URI']??'/';
-        $headers  = HeaderItem::buildFromServer($server);
-        $request =  new Request($method, $uri, $headers);
+        $headers = HeaderItem::buildFromServer($server);
+        $request = new Request($method, $uri, $headers);
         $request->setDocumentRoot($server['DOCUMENT_ROOT']);
         if ($simulate) {
             $request->setServer($server);

nebula/request/attribute/SchemeAttribute.php

Indentation +41 added lines, -41 removed lines

@@ -7,52 +7,52 @@
  */
 trait SchemeAttribute
 {
-   protected $host;
-   protected $port;
-   protected $scheme;
+    protected $host;
+    protected $port;
+    protected $scheme;
 
-   public  function getScheme()
-   {
-      $server = $this->getServer();
-       if (!isset($this->scheme)) {
-           if (array_key_exists('HTTPS',  $server) && strcasecmp($server['HTTPS'], 'off') != 0) {
-               $scheme = 'https';
-           } elseif (array_key_exists('REQUEST_SCHEME', $server)) {
-               $scheme = $server['REQUEST_SCHEME'];
-           } else {
-               $scheme = 'http';
-           }
-       }
-       return  $this->scheme = $scheme;
-   }
+    public  function getScheme()
+    {
+        $server = $this->getServer();
+        if (!isset($this->scheme)) {
+            if (array_key_exists('HTTPS',  $server) && strcasecmp($server['HTTPS'], 'off') != 0) {
+                $scheme = 'https';
+            } elseif (array_key_exists('REQUEST_SCHEME', $server)) {
+                $scheme = $server['REQUEST_SCHEME'];
+            } else {
+                $scheme = 'http';
+            }
+        }
+        return  $this->scheme = $scheme;
+    }
    
-   public  function getHost()
-   {
-      if (isset($this->host)) {
-         return $this->host;
-      }
-      return $this->host = $this->getServer()['HTTP_HOST'] ?? 'localhost';
-   }
+    public  function getHost()
+    {
+        if (isset($this->host)) {
+            return $this->host;
+        }
+        return $this->host = $this->getServer()['HTTP_HOST'] ?? 'localhost';
+    }
 
-   public  function getPort()
-   {
-      if (isset($this->port)) {
-         return $this->port;
-      }
-      return $this->port = $this->getServer()['SERVER_PORT'] ?? 80;
-   }
+    public  function getPort()
+    {
+        if (isset($this->port)) {
+            return $this->port;
+        }
+        return $this->port = $this->getServer()['SERVER_PORT'] ?? 80;
+    }
 
-   /**
-    * 获取服务器基础URI
-    *
-    * @return string
-    */
-   public  function getServerURI()
-   {
-       return $this->getScheme().'://'.$this->getHost();
-   }
+    /**
+     * 获取服务器基础URI
+     *
+     * @return string
+     */
+    public  function getServerURI()
+    {
+        return $this->getScheme().'://'.$this->getHost();
+    }
 
-   /**
+    /**
      * Get 服务器属性
      *
      * @return  array

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
    {
       $server = $this->getServer();
        if (!isset($this->scheme)) {
-           if (array_key_exists('HTTPS',  $server) && strcasecmp($server['HTTPS'], 'off') != 0) {
+           if (array_key_exists('HTTPS', $server) && strcasecmp($server['HTTPS'], 'off') != 0) {
                $scheme = 'https';
            } elseif (array_key_exists('REQUEST_SCHEME', $server)) {
                $scheme = $server['REQUEST_SCHEME'];

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