@@ -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'); |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | * |
12 | 12 | * @var array |
13 | 13 | */ |
14 | - protected $attribute=[]; |
|
14 | + protected $attribute = []; |
|
15 | 15 | |
16 | - public function addAttribute(string $name , $value) |
|
16 | + public function addAttribute(string $name, $value) |
|
17 | 17 | { |
18 | 18 | $this->attribute[$name] = $value; |
19 | 19 | } |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | protected function analyse(array $context) |
22 | 22 | { |
23 | 23 | $replace = []; |
24 | - $attach =[] ; |
|
24 | + $attach = []; |
|
25 | 25 | foreach ($context as $key => $val) { |
26 | - if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && ! $val instanceof \Exception) { |
|
27 | - $replace['{' . $key . '}'] = $val; |
|
26 | + if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && !$val instanceof \Exception) { |
|
27 | + $replace['{'.$key.'}'] = $val; |
|
28 | 28 | } else { |
29 | 29 | $attach[$key] = $val; |
30 | 30 | } |
@@ -34,19 +34,19 @@ discard block |
||
34 | 34 | |
35 | 35 | public function interpolate(string $message, array $context, array $attribute) |
36 | 36 | { |
37 | - list($attach, $replace) = $this->analyse($context); |
|
37 | + list($attach, $replace) = $this->analyse($context); |
|
38 | 38 | $attribute = array_merge($this->attribute, $attribute); |
39 | 39 | foreach ($attribute as $key => $val) { |
40 | - $replace['%' . $key . '%'] = $val; |
|
40 | + $replace['%'.$key.'%'] = $val; |
|
41 | 41 | } |
42 | 42 | $message = strtr($message, $replace); |
43 | 43 | $attachInfo = ''; |
44 | 44 | foreach ($attach as $name => $value) { |
45 | 45 | $attachInfo = $name.' = '; |
46 | 46 | if ($value instanceof AttachValueInterface) { |
47 | - $attachInfo.= $value->getLogAttach().PHP_EOL; |
|
47 | + $attachInfo .= $value->getLogAttach().PHP_EOL; |
|
48 | 48 | } else { |
49 | - $attachInfo.= DumpTrait::parameterToString($value).PHP_EOL; |
|
49 | + $attachInfo .= DumpTrait::parameterToString($value).PHP_EOL; |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | if (strlen($attachInfo) > 0) { |
@@ -162,8 +162,8 @@ |
||
162 | 162 | */ |
163 | 163 | protected function registerModuleManager() |
164 | 164 | { |
165 | - $this->manager = new Manager($this->getContext()); |
|
166 | - $this->manager->registerModule(); |
|
165 | + $this->manager = new Manager($this->getContext()); |
|
166 | + $this->manager->registerModule(); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | public function registerModule() |
141 | 141 | { |
142 | 142 | $scan = $this->getContext()->getConfig()->get('app.module.scan-path', []); |
143 | - $cache = $this->getContext()->getApplication()->getDataPath() .'/module-cache'; |
|
143 | + $cache = $this->getContext()->getApplication()->getDataPath().'/module-cache'; |
|
144 | 144 | FileSystem::makes($cache); |
145 | 145 | // 扫描加载 |
146 | 146 | foreach (Builder::scan($scan, $cache) as $module) { |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | * @param string $name |
191 | 191 | * @return Module|null |
192 | 192 | */ |
193 | - public function find(string $name):?Module |
|
193 | + public function find(string $name): ?Module |
|
194 | 194 | { |
195 | 195 | $fullName = $this->finder->getFullName($name); |
196 | 196 | return $this->module[$fullName] ?? null; |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | |
85 | 85 | public function getRoute(string $groupName): GroupRoutes |
86 | 86 | { |
87 | - $group = $groupName === 'default' ? '': '-'. $groupName; |
|
88 | - $routeConfig = $this->getConfigFrom('route'.$group, ['group' => $group,]); |
|
89 | - $routes = new GroupRoutes($groupName); |
|
87 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
88 | + $routeConfig = $this->getConfigFrom('route'.$group, ['group' => $group, ]); |
|
89 | + $routes = new GroupRoutes($groupName); |
|
90 | 90 | if (\is_array($routeConfig)) { |
91 | 91 | // debug()->debug('load route {group} from {module}',['group'=>$groupName, 'module' => $this->getFullName()]); |
92 | 92 | $prefix = $this->config->get('route.prefix', ''); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | */ |
142 | 142 | public function getFullName() |
143 | 143 | { |
144 | - return $this->name .':'. $this->version; |
|
144 | + return $this->name.':'.$this->version; |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | */ |
89 | 89 | private function initBaseConfig() |
90 | 90 | { |
91 | - $this->initConfigIfNotSet('app.route.active', defined('NEBULA_ROUTE_GROUPS')? \explode(',', \constant('NEBULA_ROUTE_GROUPS')) :['default']); |
|
91 | + $this->initConfigIfNotSet('app.route.active', defined('NEBULA_ROUTE_GROUPS') ? \explode(',', \constant('NEBULA_ROUTE_GROUPS')) : ['default']); |
|
92 | 92 | $this->initConfigIfNotSet('app.import', [\constant('NEBULA_APP').'/'.'share']); |
93 | 93 | $this->initConfigIfNotSet('app.resource', [\constant('NEBULA_APP').'/'.'resource']); |
94 | 94 | $this->initConfigIfNotSet('app.module.scan-path', [\constant('NEBULA_APP').'/'.'modules']); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | */ |
116 | 116 | private function initTimezone() |
117 | 117 | { |
118 | - $timezone = defined('DEFAULT_TIMEZONE')?constant('DEFAULT_TIMEZONE'):'PRC'; |
|
118 | + $timezone = defined('DEFAULT_TIMEZONE') ?constant('DEFAULT_TIMEZONE') : 'PRC'; |
|
119 | 119 | date_default_timezone_set($this->config->get('app.timezone', $timezone)); |
120 | 120 | } |
121 | 121 | |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function run() |
201 | 201 | { |
202 | - $className = $this->config->get('app.application', Application::class); |
|
202 | + $className = $this->config->get('app.application', Application::class); |
|
203 | 203 | $this->application = Runnable::newClassInstance($className); |
204 | 204 | $this->application->setContext($this); |
205 | 205 | $this->application->setPath($this->path); |
@@ -13,12 +13,12 @@ discard block |
||
13 | 13 | */ |
14 | 14 | protected static $mimes = [ |
15 | 15 | # Image Type |
16 | - 'jpe' => 'image/jpeg' , |
|
17 | - 'jpeg' => 'image/jpeg' , |
|
18 | - 'jpg' => 'image/jpeg' , |
|
19 | - 'svg' => 'image/svg+xml' , |
|
20 | - 'png' => 'image/png' , |
|
21 | - 'gif' => 'image/gif' , |
|
16 | + 'jpe' => 'image/jpeg', |
|
17 | + 'jpeg' => 'image/jpeg', |
|
18 | + 'jpg' => 'image/jpeg', |
|
19 | + 'svg' => 'image/svg+xml', |
|
20 | + 'png' => 'image/png', |
|
21 | + 'gif' => 'image/gif', |
|
22 | 22 | 'ico' => 'image/x-icon', |
23 | 23 | 'webp' => 'image/webp', |
24 | 24 | |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | 'js' => 'text/javascript', |
27 | 27 | 'css' => 'text/css', |
28 | 28 | 'txt' => 'text/plain', |
29 | - 'html' => 'text/html' , |
|
30 | - 'csv' => 'text/csv' , |
|
29 | + 'html' => 'text/html', |
|
30 | + 'csv' => 'text/csv', |
|
31 | 31 | 'xml' => 'text/xml', |
32 | 32 | |
33 | 33 | # App type |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | # Archive |
41 | 41 | 'zip' => 'application/zip', |
42 | - 'gtar' => 'application/x-gtar' , |
|
43 | - 'gz' => 'application/x-gzip' , |
|
42 | + 'gtar' => 'application/x-gtar', |
|
43 | + 'gz' => 'application/x-gzip', |
|
44 | 44 | '7z' => 'application/x-7z-compressed', |
45 | 45 | 'rar' => 'application/x-rar-compressed', |
46 | 46 |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @param mixed $default |
67 | 67 | * @return mixed |
68 | 68 | */ |
69 | - public function getHeader(string $name, $default =null) |
|
69 | + public function getHeader(string $name, $default = null) |
|
70 | 70 | { |
71 | 71 | if (array_key_exists(strtolower($name), $this->headers)) { |
72 | 72 | return $this->headers[$name]; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function ip() |
94 | 94 | { |
95 | - static $ipFrom = ['HTTP_CLIENT_IP','HTTP_X_FORWARDED_FOR','HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP','HTTP_FORWARDED_FOR','HTTP_FORWARDED','REMOTE_ADDR']; |
|
95 | + static $ipFrom = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP', 'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR']; |
|
96 | 96 | foreach ($ipFrom as $key) { |
97 | 97 | if (array_key_exists($key, $_SERVER)) { |
98 | 98 | foreach (explode(',', $_SERVER[$key]) as $ip) { |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | } |
122 | 122 | $method = strtoupper($server['REQUEST_METHOD'] ?? 'GET'); |
123 | 123 | $uri = $server['REQUEST_URI']??'/'; |
124 | - $headers = HeaderItem::buildFromServer($server ?: $_SERVER); |
|
125 | - $request = new static($method, $uri, $headers); |
|
124 | + $headers = HeaderItem::buildFromServer($server ?: $_SERVER); |
|
125 | + $request = new static($method, $uri, $headers); |
|
126 | 126 | $request->setDocumentRoot($server['DOCUMENT_ROOT']); |
127 | 127 | if ($simulate && $server !== null) { |
128 | 128 | $request->setServer($server); |