dxkite / suda

nebula/src/component/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/src/component/request/header/HeaderItem.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
      *
      * @var array
      */
-    protected static $headers =[
+    protected static $headers = [
         'content-type' => ContentTypeItem::class,
     ];
 
@@ -69,7 +69,7 @@ 
             if ($value instanceof HeaderItem) {
                 $header = $value;
             } elseif (array_key_exists($name, static::$headers)) {
-                $class =static::$headers[$name];
+                $class = static::$headers[$name];
                 $header = new $class($name, $value);
             } else {
                 $header = new HeaderItem($name, $value);

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/application/config/Config.php

Spacing +9 added lines, -9 removed lines

@@ -9,9 +9,9 @@ 
  */
 class Config extends ConfigLoader
 {
-    public $config=[];
+    public $config = [];
 
-    public function load(string $path, array $extra =[])
+    public function load(string $path, array $extra = [])
     {
         $data = $this->loadConfig($path, $extra);
         if ($data) {
@@ -26,10 +26,10 @@ 
 
     public function assign(array $config)
     {
-        return $this->config=array_merge($this->config, $config);
+        return $this->config = array_merge($this->config, $config);
     }
 
-    public function get(string $name=null, $default=null)
+    public function get(string $name = null, $default = null)
     {
         if (is_null($name)) {
             return $this->config;
@@ -37,7 +37,7 @@ 
         return ArrayDotAccess::get($this->config, $name, $default);
     }
 
-    public function set(string $name, $value, $combine=null)
+    public function set(string $name, $value, $combine = null)
     {
         return ArrayDotAccess::set($this->config, $name, $value, $combine);
     }
@@ -47,17 +47,17 @@ 
         return ArrayDotAccess::exist($this->config, $name);
     }
 
-    public function parseValue(string $content, array $extra =[]):string
+    public function parseValue(string $content, array $extra = []):string
     {
-        return preg_replace_callback('/\$\{(.+?)\}/', function ($matchs) use ($extra) {
+        return preg_replace_callback('/\$\{(.+?)\}/', function($matchs) use ($extra) {
             $name = $matchs[1];
-            if (($value = ArrayDotAccess::get($extra, $name, null))!==null) {
+            if (($value = ArrayDotAccess::get($extra, $name, null)) !== null) {
             } elseif (defined($name)) {
                 $value = constant($name);
             } else {
                 $value = $this->get($name, $matchs[0]);
             }
-            return is_string($value)?trim(json_encode($value), '"'):$value;
+            return is_string($value) ?trim(json_encode($value), '"') : $value;
         }, $content);
     }
 }

nebula/src/application/config/ConfigLoader.php

Spacing +15 added lines, -15 removed lines

@@ -9,11 +9,11 @@ 
  */
 abstract class ConfigLoader
 {
-    public function loadConfig(string $path, array $extra =[]):?array
+    public function loadConfig(string $path, array $extra = []): ?array
     {
-        $data=null;
+        $data = null;
         if (!file_exists($path)) {
-            $path =$this->resolve($path);
+            $path = $this->resolve($path);
         }
         if ($path) {
             $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION));
@@ -27,25 +27,25 @@ 
         return $data;
     }
 
-    protected function loadJson(string $path, array $extra =[]):array
+    protected function loadJson(string $path, array $extra = []):array
     {
         $content = file_get_contents($path);
-        $content =$this->parseValue($content, $extra);
+        $content = $this->parseValue($content, $extra);
         $data = json_decode($content, true);
-        if (json_last_error()!==JSON_ERROR_NONE) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             throw new JSONException(json_last_error());
         }
         return $data;
     }
 
-    protected function loadIni(string $path, array $extra =[]):array
+    protected function loadIni(string $path, array $extra = []):array
     {
         $content = file_get_contents($path);
-        $content =$this->parseValue($content, $extra);
+        $content = $this->parseValue($content, $extra);
         return \parse_ini_string($content, true) ?: [];
     }
 
-    protected function loadYaml(string $path, array $extra =[]):array
+    protected function loadYaml(string $path, array $extra = []):array
     {
         if (function_exists('yaml_parse')) {
             $name = 'yaml_parse';
@@ -55,25 +55,25 @@ 
             throw new YamlException("parse yaml config error : missing yaml extension or spyc", 1);
         }
         $content = file_get_contents($path);
-        $content =$this->parseValue($content, $extra);
+        $content = $this->parseValue($content, $extra);
         return \call_user_func_array($name, [$content]);
     }
 
-    abstract public function parseValue(string $content, array $extra =[]):string;
+    abstract public function parseValue(string $content, array $extra = []):string;
 
-    public function resolve(string $path):?string
+    public function resolve(string $path): ?string
     {
         if (file_exists($path)) {
             return $path;
         }
         $basepath = pathinfo($path, PATHINFO_FILENAME);
-        if (file_exists($conf = $basepath.'.yml')  || file_exists($conf = $basepath.'.yaml')) {
+        if (file_exists($conf = $basepath.'.yml') || file_exists($conf = $basepath.'.yaml')) {
             if (function_exists('yaml_parse') || class_exists('Spyc')) {
                 return $conf;
             }
         }
-        foreach (['.json','.php','.ini'] as $ext) {
-            if (file_exists($conf=$basepath.$ext)) {
+        foreach (['.json', '.php', '.ini'] as $ext) {
+            if (file_exists($conf = $basepath.$ext)) {
                 return $conf;
             }
         }

nebula/loader/loader.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@
 
 defined('NEBULA_SYSTEM') or define('NEBULA_SYSTEM', dirname(__DIR__));
 
-require_once NEBULA_SYSTEM .'/src/component/loader/PathTrait.php';
-require_once NEBULA_SYSTEM .'/src/component/loader/PathInterface.php';
-require_once NEBULA_SYSTEM .'/src/component/loader/IncludeManager.php';
-require_once NEBULA_SYSTEM .'/src/component/loader/Loader.php';
+require_once NEBULA_SYSTEM.'/src/component/loader/PathTrait.php';
+require_once NEBULA_SYSTEM.'/src/component/loader/PathInterface.php';
+require_once NEBULA_SYSTEM.'/src/component/loader/IncludeManager.php';
+require_once NEBULA_SYSTEM.'/src/component/loader/Loader.php';

nebula/loader/web.php

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 use nebula\Application;
 use nebula\component\loader\Loader;
 
-require_once __DIR__ .'/loader.php';
+require_once __DIR__.'/loader.php';
 
 
 // 初始化系统加载器
 
 $loader = new Loader;
 $loader->register();
-$loader->addIncludePath(NEBULA_SYSTEM .'/src', 'nebula');
+$loader->addIncludePath(NEBULA_SYSTEM.'/src', 'nebula');
 
 // 初始化应用
 $app = new Application;

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)) {