dxkite / suda

nebula/src/component/database/connector/Connector.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
         if (is_null($this->pdo)) {
             try {
                 $this->pdo = new PDO($this->getDsn(), $this->config['database-user'], $this->config['database-password']);
-                static::$connetionCount ++;
+                static::$connetionCount++;
             } catch (PDOException $e) {
                 throw new ConnectionException($e->getMessage(), $e->getCode());
             }

nebula/src/component/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/src/component/loader/Path.php

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@
      * @param string $path 目标路径 
      * @return string|null 返回格式化结果，如果路径不存在则返回NULL
      */
-    public static function format(string $path):?string
+    public static function format(string $path): ?string
     {
-        return static::existCharset($path, ['GBK','GB2312','BIG5']);
+        return static::existCharset($path, ['GBK', 'GB2312', 'BIG5']);
     }
  
-    public static function existCharset(string $path, array $charset):?string
+    public static function existCharset(string $path, array $charset): ?string
     {
         $abspath = static::toAbsolutePath($path);
         if (static::existCase($abspath)) {

nebula/src/application/filesystem/FileSystemInterface.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $name
      * @return string|null
      */
-    public static function get(string $filename):?string;
+    public static function get(string $filename): ?string;
 
 
     /**
@@ -77,7 +77,7 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function readFiles(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator;
+    public static function readFiles(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator;
     
     /**
      * 读目录下文件夹
@@ -88,7 +88,7 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function readDirs(string $path, bool $recursive=false, ?string $regex=null, bool $full=false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator;
+    public static function readDirs(string $path, bool $recursive = false, ?string $regex = null, bool $full = false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator;
     
     /**
      * 读目录，包括文件，文件夹
@@ -99,7 +99,7 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function read(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator;
+    public static function read(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator;
 
     /**
      * 截断部分目录
@@ -119,7 +119,7 @@ 
      * @param boolean $move
      * @return boolean
      */
-    public static function copyDir(string $path, string $toPath, ?string $regex=null, bool $move = false):bool;
+    public static function copyDir(string $path, string $toPath, ?string $regex = null, bool $move = false):bool;
     
     /**
      * 移动文件夹
@@ -129,5 +129,5 @@ 
      * @param string|null $regex
      * @return boolean
      */
-    public static function moveDir(string $path, string $toPath, ?string $regex=null):bool;
+    public static function moveDir(string $path, string $toPath, ?string $regex = null):bool;
 }

nebula/src/application/filesystem/FileHelper.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
      */
     public static function delete(string $filename):bool
     {
-        if (($path=Path::format($filename)) !== null) {
+        if (($path = Path::format($filename)) !== null) {
             if (!is_writable($path)) {
                 return false;
             }
@@ -43,7 +43,7 @@ 
      */    
     public static function move(string $src, string $dest):bool
     {
-        if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) {
+        if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) {
             return rename($path, $dest);
         }
         return false;
@@ -58,7 +58,7 @@ 
      */
     public static function copy(string $src, string $dest):bool
     {
-        if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) {
+        if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) {
             return copy($path, $dest);
         }
         return false;
@@ -86,9 +86,9 @@ 
      * @param string $name
      * @return string|null
      */
-    public static function get(string $filename):?string
+    public static function get(string $filename): ?string
     {
-        if (is_readable($filename) && ($path=Path::format($filename)) !== null) {
+        if (is_readable($filename) && ($path = Path::format($filename)) !== null) {
             return file_get_contents($path);
         }
         return null;

nebula/src/application/filesystem/DirectoryHelper.php

Spacing +9 added lines, -9 removed lines

@@ -94,11 +94,11 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function readFiles(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator
+    public static function readFiles(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator
     {
         $parent = Path::format($path);
         foreach (static::read($path, $recursive, $regex, false, $mode) as $subpath) {
-            $path = $full?$subpath:$parent.DIRECTORY_SEPARATOR.$subpath;
+            $path = $full ? $subpath : $parent.DIRECTORY_SEPARATOR.$subpath;
             if (is_file($path)) {
                 yield $subpath;
             }
@@ -114,11 +114,11 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function readDirs(string $path, bool $recursive=false, ?string $regex=null, bool $full=false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
+    public static function readDirs(string $path, bool $recursive = false, ?string $regex = null, bool $full = false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
     {
         $parent = Path::format($path);
         foreach (static::read($path, $recursive, $regex, false, $mode) as $subpath) {
-            $path = $full?$subpath:$parent.DIRECTORY_SEPARATOR.$subpath;
+            $path = $full ? $subpath : $parent.DIRECTORY_SEPARATOR.$subpath;
             if (is_dir($path)) {
                 yield $subpath;
             }
@@ -134,7 +134,7 @@ 
      * @param boolean $full
      * @return \Iterator
      */
-    public static function read(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
+    public static function read(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator
     {
         $directory = Path::format($path);
         if ($directory && \is_dir($directory)) {
@@ -150,7 +150,7 @@ 
     }
     
 
-    protected static function buildIterator(string $directory, bool $recursive=false, ?string $regex = null, int $mode): \Iterator
+    protected static function buildIterator(string $directory, bool $recursive = false, ?string $regex = null, int $mode): \Iterator
     {
         $it = new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS);
         if ($regex !== null) {
@@ -171,7 +171,7 @@ 
      */
     public static function cut(string $path, string $basepath):string
     {
-        $path =  PathTrait::toAbsolutePath($path);
+        $path = PathTrait::toAbsolutePath($path);
         $basepath = PathTrait::toAbsolutePath($basepath);
         if (strpos($path, $basepath.DIRECTORY_SEPARATOR) === 0) {
             return substr($path, \strlen($basepath) + 1);
@@ -188,7 +188,7 @@ 
      * @param boolean $move
      * @return boolean
      */
-    public static function copy(string $path, string $toPath, ?string $regex=null, bool $move = false):bool
+    public static function copy(string $path, string $toPath, ?string $regex = null, bool $move = false):bool
     {
         $directory = Path::format($path);
         static::makes($toPath);
@@ -227,7 +227,7 @@ 
      * @param string|null $regex
      * @return boolean
      */
-    public static function move(string $path, string $toPath, ?string $regex=null):bool
+    public static function move(string $path, string $toPath, ?string $regex = null):bool
     {
         return static::copy($path, $toPath, $regex, true);
     }

nebula/src/application/filesystem/FileSystem.php

Indentation +3 added lines, -3 removed lines

@@ -19,9 +19,9 @@
     }
 
     use FileHelper  {
-       delete as protected deleteFile;
-       FileHelper::copy insteadof DirectoryHelper;
-       FileHelper::move insteadof DirectoryHelper;
+        delete as protected deleteFile;
+        FileHelper::copy insteadof DirectoryHelper;
+        FileHelper::move insteadof DirectoryHelper;
     }
 
 

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public static function delete(string $path):bool
     {
-        if (($path=Path::format($path)) !== null) {
+        if (($path = Path::format($path)) !== null) {
             if (is_file($path)) {
                 return static::deleteFile($path);
             }

nebula/src/component/loader/IncludeManager.php

Spacing +9 added lines, -9 removed lines

@@ -15,14 +15,14 @@ 
      *
      * @var array
      */
-    protected $namespace=[ __NAMESPACE__ ];
+    protected $namespace = [__NAMESPACE__];
 
     /**
      * 包含路径
      *
      * @var array
      */
-    protected $includePath=[];
+    protected $includePath = [];
 
     /**
      * 将JAVA，路径分割转换为PHP分割符
@@ -32,7 +32,7 @@ 
      */
     public static function realName(string $name):string
     {
-        return str_replace(['.','/'], '\\', $name);
+        return str_replace(['.', '/'], '\\', $name);
     }
 
     /**
@@ -41,7 +41,7 @@ 
      * @param string $name
      * @return string|null
      */
-    public static function realPath(string $name):?string
+    public static function realPath(string $name): ?string
     {
         return Path::format($name);
     }
@@ -52,7 +52,7 @@ 
      * @param string $filename
      * @return string|null
      */
-    public function import(string $filename):?string
+    public function import(string $filename): ?string
     {
         if ($filename = static::realPath($filename)) {
             @require_once $filename;
@@ -68,16 +68,16 @@ 
         return null;
     }
 
-    public function addIncludePath(string $path, string $namespace=null)
+    public function addIncludePath(string $path, string $namespace = null)
     {
         if ($path = static::realPath($path)) {
             $namespace = $namespace ?? 0;
             if (array_key_exists($namespace, $this->includePath)) {
                 if (!\in_array($path, $this->includePath[$namespace])) {
-                    $this->includePath[$namespace][]=$path;
+                    $this->includePath[$namespace][] = $path;
                 }
             } else {
-                $this->includePath[$namespace][]=$path;
+                $this->includePath[$namespace][] = $path;
             }
         }
     }
@@ -95,7 +95,7 @@ 
     public function setNamespace(string $namespace)
     {
         if (!in_array($namespace, $this->namespace)) {
-            $this->namespace[]=$namespace;
+            $this->namespace[] = $namespace;
         }
     }
 }

nebula/src/application/Resource.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
     {
         $path = $source;
         if (Path::isRelativePath($source)) {
-            $path =  $relative.'/'.$path;
+            $path = $relative.'/'.$path;
         }
         return Path::toAbsolutePath($path);
     }
@@ -53,7 +53,7 @@ 
      * @param string $path
      * @return string|null
      */
-    public function getResourcePath(string $path):?string
+    public function getResourcePath(string $path): ?string
     {
         foreach ($this->resource as $root) {
             $target = $root.'/'.$path;
@@ -70,10 +70,10 @@ 
      * @param string $path
      * @return string|null
      */
-    public function getConfigResourcePath(string $path):?string
+    public function getConfigResourcePath(string $path): ?string
     {
         foreach ($this->resource as $root) {
-            if ( $target = Config::resolve($root.'/'.$path)) {
+            if ($target = Config::resolve($root.'/'.$path)) {
                 return $target;
             }
         }