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/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);

nebula/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/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/autoload/Loader.php

Spacing +13 added lines, -13 removed lines

@@ -15,14 +15,14 @@ 
      *
      * @var array
      */
-    protected static $namespace=[ __NAMESPACE__ ];
+    protected static $namespace = [__NAMESPACE__];
 
     /**
      * 包含路径
      *
      * @var array
      */
-    protected static $includePath=[];
+    protected static $includePath = [];
 
     /**
      * 将JAVA，路径分割转换为PHP分割符
@@ -32,7 +32,7 @@ 
      */
     public static function realName(string $name):string
     {
-        return str_replace(['.','/'], '\\', $name);
+        return str_replace(['.', '/'], '\\', $name);
     }
 
     /**
@@ -41,10 +41,10 @@ 
      * @param string $name
      * @return string|null
      */
-    public static function realPath(string $name):?string
+    public static function realPath(string $name): ?string
     {
         $absulotePath = static::toAbsolutePath($name);
-        return file_exists($absulotePath)?$absulotePath:null;
+        return file_exists($absulotePath) ? $absulotePath : null;
     }
 
     public static function register()
@@ -96,8 +96,8 @@ 
 
     protected static function getClassPathByAlias(string $includePath, string $className):string
     {
-        $namepath=static::formatSeparator($className);
-        $className=static::realName($className);
+        $namepath = static::formatSeparator($className);
+        $className = static::realName($className);
         foreach (static::$namespace as $namespace) {
             $path = $includePath.DIRECTORY_SEPARATOR.$namespace.DIRECTORY_SEPARATOR.$namepath.'.php';
             if ($path = static::realPath($path)) {
@@ -118,9 +118,9 @@ 
         } 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)) {
@@ -129,16 +129,16 @@ 
         return nulll;
     }
 
-    public static function addIncludePath(string $path, string $namespace=null)
+    public static function addIncludePath(string $path, string $namespace = null)
     {
         if ($path = static::realPath($path)) {
             $namespace = $namespace ?? 0;
             if (array_key_exists($namespace, static::$includePath)) {
                 if (!\in_array($path, static::$includePath[$namespace])) {
-                    static::$includePath[$namespace][]=$path;
+                    static::$includePath[$namespace][] = $path;
                 }
             } else {
-                static::$includePath[$namespace][]=$path;
+                static::$includePath[$namespace][] = $path;
             }
         }
     }
@@ -156,7 +156,7 @@ 
     public static function setNamespace(string $namespace)
     {
         if (!in_array($namespace, static::$namespace)) {
-            static::$namespace[]=$namespace;
+            static::$namespace[] = $namespace;
         }
     }
 }

nebula/autoload/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/autoload/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;
@@ -47,7 +47,7 @@ 
             } elseif ($name === '.') {
                 continue;
             } elseif (strlen($name)) {
-                $absulotePaths[]=$name;
+                $absulotePaths[] = $name;
             }
         }
         return implode($separator, $absulotePaths);
@@ -56,20 +56,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 {
         return null;
     }
 }