@@ -9,9 +9,9 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | abstract class ConfigLoader |
| 11 | 11 | { |
| 12 | - public function loadConfig(string $path, array $extra =[]):?array |
|
| 12 | + public function loadConfig(string $path, array $extra = []): ?array |
|
| 13 | 13 | { |
| 14 | - $data=null; |
|
| 14 | + $data = null; |
|
| 15 | 15 | if (!file_exists($path)) { |
| 16 | 16 | $path = static::resolve($path); |
| 17 | 17 | } |
@@ -27,25 +27,25 @@ discard block |
||
| 27 | 27 | return $data; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - protected function loadJson(string $path, array $extra =[]):array |
|
| 30 | + protected function loadJson(string $path, array $extra = []):array |
|
| 31 | 31 | { |
| 32 | 32 | $content = file_get_contents($path); |
| 33 | - $content =$this->parseValue($content, $extra); |
|
| 33 | + $content = $this->parseValue($content, $extra); |
|
| 34 | 34 | $data = json_decode($content, true); |
| 35 | - if (json_last_error()!==JSON_ERROR_NONE) { |
|
| 35 | + if (json_last_error() !== JSON_ERROR_NONE) { |
|
| 36 | 36 | throw new JSONException(json_last_error()); |
| 37 | 37 | } |
| 38 | 38 | return $data; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - protected function loadIni(string $path, array $extra =[]):array |
|
| 41 | + protected function loadIni(string $path, array $extra = []):array |
|
| 42 | 42 | { |
| 43 | 43 | $content = file_get_contents($path); |
| 44 | - $content =$this->parseValue($content, $extra); |
|
| 44 | + $content = $this->parseValue($content, $extra); |
|
| 45 | 45 | return \parse_ini_string($content, true) ?: []; |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - protected function loadYaml(string $path, array $extra =[]):array |
|
| 48 | + protected function loadYaml(string $path, array $extra = []):array |
|
| 49 | 49 | { |
| 50 | 50 | if (function_exists('yaml_parse')) { |
| 51 | 51 | $name = 'yaml_parse'; |
@@ -55,25 +55,25 @@ discard block |
||
| 55 | 55 | throw new YamlException("parse yaml config error : missing yaml extension or spyc", 1); |
| 56 | 56 | } |
| 57 | 57 | $content = file_get_contents($path); |
| 58 | - $content =$this->parseValue($content, $extra); |
|
| 58 | + $content = $this->parseValue($content, $extra); |
|
| 59 | 59 | return \call_user_func_array($name, [$content]); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - abstract public function parseValue(string $content, array $extra =[]):string; |
|
| 62 | + abstract public function parseValue(string $content, array $extra = []):string; |
|
| 63 | 63 | |
| 64 | - public static function resolve(string $path):?string |
|
| 64 | + public static function resolve(string $path): ?string |
|
| 65 | 65 | { |
| 66 | 66 | if (file_exists($path)) { |
| 67 | 67 | return $path; |
| 68 | 68 | } |
| 69 | 69 | $basepath = dirname($path).'/'.pathinfo($path, PATHINFO_FILENAME); |
| 70 | - if (file_exists($conf = $basepath.'.yml') || file_exists($conf = $basepath.'.yaml')) { |
|
| 70 | + if (file_exists($conf = $basepath.'.yml') || file_exists($conf = $basepath.'.yaml')) { |
|
| 71 | 71 | if (function_exists('yaml_parse') || class_exists('Spyc')) { |
| 72 | 72 | return $conf; |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | - foreach (['.json','.php','.ini'] as $ext) { |
|
| 76 | - if (file_exists($conf=$basepath.$ext)) { |
|
| 75 | + foreach (['.json', '.php', '.ini'] as $ext) { |
|
| 76 | + if (file_exists($conf = $basepath.$ext)) { |
|
| 77 | 77 | return $conf; |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -20,9 +20,9 @@ |
||
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | -require_once NEBULA_SYSTEM .'/src/component/loader/Path.php'; |
|
| 24 | -require_once NEBULA_SYSTEM .'/src/component/loader/PathTrait.php'; |
|
| 25 | -require_once NEBULA_SYSTEM .'/src/component/loader/PathInterface.php'; |
|
| 26 | -require_once NEBULA_SYSTEM .'/src/component/loader/IncludeManager.php'; |
|
| 27 | -require_once NEBULA_SYSTEM .'/src/component/loader/Loader.php'; |
|
| 28 | -require_once NEBULA_SYSTEM .'/src/application/Loader.php'; |
|
| 23 | +require_once NEBULA_SYSTEM.'/src/component/loader/Path.php'; |
|
| 24 | +require_once NEBULA_SYSTEM.'/src/component/loader/PathTrait.php'; |
|
| 25 | +require_once NEBULA_SYSTEM.'/src/component/loader/PathInterface.php'; |
|
| 26 | +require_once NEBULA_SYSTEM.'/src/component/loader/IncludeManager.php'; |
|
| 27 | +require_once NEBULA_SYSTEM.'/src/component/loader/Loader.php'; |
|
| 28 | +require_once NEBULA_SYSTEM.'/src/application/Loader.php'; |
|
@@ -4,15 +4,15 @@ |
||
| 4 | 4 | use suda\application\Loader; |
| 5 | 5 | use suda\application\Request; |
| 6 | 6 | |
| 7 | -require_once __DIR__ .'/loader.php'; |
|
| 7 | +require_once __DIR__.'/loader.php'; |
|
| 8 | 8 | |
| 9 | 9 | |
| 10 | 10 | |
| 11 | 11 | // 初始化系统加载器 |
| 12 | 12 | $loader = new Loader; |
| 13 | 13 | $loader->register(); |
| 14 | -$loader->addIncludePath(NEBULA_SYSTEM .'/src', 'suda'); |
|
| 15 | -$loader->import(NEBULA_SYSTEM .'/src/functions.php'); |
|
| 14 | +$loader->addIncludePath(NEBULA_SYSTEM.'/src', 'suda'); |
|
| 15 | +$loader->import(NEBULA_SYSTEM.'/src/functions.php'); |
|
| 16 | 16 | // 初始化请求 |
| 17 | 17 | $request = Request::buildFromServer(); |
| 18 | 18 | $request->apply(true); |