@@ -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 | } |
@@ -42,9 +42,9 @@ |
||
42 | 42 | $extension !== 'module') { |
43 | 43 | return null; |
44 | 44 | } |
45 | - $zip=new ZipArchive; |
|
45 | + $zip = new ZipArchive; |
|
46 | 46 | if ($zip->open($path, ZipArchive::CHECKCONS)) { |
47 | - $unzipPath = $unpackPath.'/'. pathinfo($path, PATHINFO_FILENAME) .'-'.substr(md5_file($path), 0, 8); |
|
47 | + $unzipPath = $unpackPath.'/'.pathinfo($path, PATHINFO_FILENAME).'-'.substr(md5_file($path), 0, 8); |
|
48 | 48 | $zip->extractTo($unzipPath); |
49 | 49 | $zip->close(); |
50 | 50 | return Config::resolve($unzipPath.'/module'); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function add(?string $module = null, string $name, RouteMatcher $router) |
57 | 57 | { |
58 | - $module = $module ?: $this->default; |
|
58 | + $module = $module ?: $this->default; |
|
59 | 59 | if (\array_key_exists($module, $this->routes)) { |
60 | 60 | $this->routes[$module]->add($name, $router); |
61 | 61 | } else { |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | * @param string $name |
89 | 89 | * @return RouteMatcher|null |
90 | 90 | */ |
91 | - public function find(?string $module = null, string $name):?RouteMatcher |
|
91 | + public function find(?string $module = null, string $name): ?RouteMatcher |
|
92 | 92 | { |
93 | - $module = $module ?: $this->default; |
|
93 | + $module = $module ?: $this->default; |
|
94 | 94 | if (\array_key_exists($module, $this->routes)) { |
95 | 95 | return $this->routes[$module]->get($name); |
96 | 96 | } |
@@ -146,8 +146,8 @@ |
||
146 | 146 | */ |
147 | 147 | protected function registerModuleManager() |
148 | 148 | { |
149 | - $this->manager = new Manager($this); |
|
150 | - $this->manager->registerModule(); |
|
149 | + $this->manager = new Manager($this); |
|
150 | + $this->manager->registerModule(); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | public function registerModule() |
118 | 118 | { |
119 | 119 | $scan = $this->getApp()->getConfig('app.module.scan-path', []); |
120 | - $cache = $this->getApp()->getDataPath() .'/module-cache'; |
|
120 | + $cache = $this->getApp()->getDataPath().'/module-cache'; |
|
121 | 121 | FileSystem::makes($cache); |
122 | 122 | foreach (Builder::scan($scan, $cache) as $module) { |
123 | 123 | $this->finder->add($module->getName(), $module->getVersion()); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @param string $name |
134 | 134 | * @return Module|null |
135 | 135 | */ |
136 | - public function find(string $name):?Module { |
|
136 | + public function find(string $name): ?Module { |
|
137 | 137 | $fullName = $this->finder->getFullName($name); |
138 | 138 | return $this->module[$fullName] ?? null; |
139 | 139 | } |