@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | |
76 | 76 | public function getRoute(string $groupName): GroupRoutes |
77 | 77 | { |
78 | - $group = $groupName === 'default' ? '': '-'. $groupName; |
|
79 | - $routeConfig = $this->getConfig('route'.$group, ['group' => $group,]); |
|
80 | - $routes = new GroupRoutes($groupName); |
|
78 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
79 | + $routeConfig = $this->getConfig('route'.$group, ['group' => $group, ]); |
|
80 | + $routes = new GroupRoutes($groupName); |
|
81 | 81 | if (\is_array($routeConfig)) { |
82 | 82 | $prefix = $this->config->get('route.prefix', ''); |
83 | 83 | foreach ($routeConfig as $name => $value) { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function getFullName() |
120 | 120 | { |
121 | - return $this->name .':'. $this->version; |
|
121 | + return $this->name.':'.$this->version; |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | public function registerModule() |
117 | 117 | { |
118 | 118 | $scan = $this->getContext()->getConfig()->get('app.module.scan-path', []); |
119 | - $cache = $this->getContext()->getDataPath() .'/module-cache'; |
|
119 | + $cache = $this->getContext()->getDataPath().'/module-cache'; |
|
120 | 120 | FileSystem::makes($cache); |
121 | 121 | foreach (Builder::scan($scan, $cache) as $module) { |
122 | 122 | $this->finder->add($module->getName(), $module->getVersion()); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * @param string $name |
142 | 142 | * @return Module|null |
143 | 143 | */ |
144 | - public function find(string $name):?Module { |
|
144 | + public function find(string $name): ?Module { |
|
145 | 145 | |
146 | 146 | } |
147 | 147 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $this->config = $config; |
21 | 21 | } |
22 | 22 | |
23 | - public function load(string $path, array $extra =[]) |
|
23 | + public function load(string $path, array $extra = []) |
|
24 | 24 | { |
25 | 25 | $data = $this->loadConfig($path, $extra); |
26 | 26 | if ($data) { |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | |
36 | 36 | public function assign(array $config) |
37 | 37 | { |
38 | - return $this->config=array_merge($this->config, $config); |
|
38 | + return $this->config = array_merge($this->config, $config); |
|
39 | 39 | } |
40 | 40 | |
41 | - public function get(string $name=null, $default=null) |
|
41 | + public function get(string $name = null, $default = null) |
|
42 | 42 | { |
43 | 43 | if (is_null($name)) { |
44 | 44 | return $this->config; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | return ArrayDotAccess::get($this->config, $name, $default); |
47 | 47 | } |
48 | 48 | |
49 | - public function set(string $name, $value, $combine=null) |
|
49 | + public function set(string $name, $value, $combine = null) |
|
50 | 50 | { |
51 | 51 | return ArrayDotAccess::set($this->config, $name, $value, $combine); |
52 | 52 | } |
@@ -56,17 +56,17 @@ discard block |
||
56 | 56 | return ArrayDotAccess::exist($this->config, $name); |
57 | 57 | } |
58 | 58 | |
59 | - public function parseValue(string $content, array $extra =[]):string |
|
59 | + public function parseValue(string $content, array $extra = []):string |
|
60 | 60 | { |
61 | - return preg_replace_callback('/\$\{(.+?)\}/', function ($matchs) use ($extra) { |
|
61 | + return preg_replace_callback('/\$\{(.+?)\}/', function($matchs) use ($extra) { |
|
62 | 62 | $name = $matchs[1]; |
63 | - if (($value = ArrayDotAccess::get($extra, $name, null))!==null) { |
|
63 | + if (($value = ArrayDotAccess::get($extra, $name, null)) !== null) { |
|
64 | 64 | } elseif (defined($name)) { |
65 | 65 | $value = constant($name); |
66 | 66 | } else { |
67 | 67 | $value = $this->get($name, $matchs[0]); |
68 | 68 | } |
69 | - return is_string($value)?trim(json_encode($value), '"'):$value; |
|
69 | + return is_string($value) ?trim(json_encode($value), '"') : $value; |
|
70 | 70 | }, $content); |
71 | 71 | } |
72 | 72 | } |
@@ -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'); |