@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | { |
124 | 124 | $config = $this->getModuleConfig($module); |
125 | 125 | $name = $name ?? $this->getModuleConfig($module)['static']; |
126 | - $path = $config['assets-path'].'/'. $this->getModuleUriName($module) .'/'.$name; |
|
126 | + $path = $config['assets-path'].'/'.$this->getModuleUriName($module).'/'.$name; |
|
127 | 127 | FileSystem::make($path); |
128 | 128 | return $path; |
129 | 129 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $this->prepareStaticModuleSource($module, $name); |
169 | 169 | $config = TemplateUtil::getConfig($this->application, $module); |
170 | 170 | $name = $name ?? $config['static']; |
171 | - return $this->getModuleStaticAssetRoot($module) .'/'.$this->getModuleUriName($module). '/'.$name; |
|
171 | + return $this->getModuleStaticAssetRoot($module).'/'.$this->getModuleUriName($module).'/'.$name; |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | if ($module === null) { |
181 | 181 | $module = $this->module; |
182 | 182 | } |
183 | - return $this->getModuleAssetRoot($module) .'/'.$this->getModuleUriName($module); |
|
183 | + return $this->getModuleAssetRoot($module).'/'.$this->getModuleUriName($module); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | /** |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | /** |
45 | 45 | * @return array|null |
46 | 46 | */ |
47 | - private function seekSourcePath():?array |
|
47 | + private function seekSourcePath(): ?array |
|
48 | 48 | { |
49 | 49 | $extArray = []; |
50 | 50 | if (array_key_exists('subfix', $this->config)) { |
@@ -54,9 +54,9 @@ discard block |
||
54 | 54 | $extArray['.php'] = true; |
55 | 55 | $resource = $this->getResource($this->module); |
56 | 56 | foreach ($extArray as $ext => $isRaw) { |
57 | - $path = $resource->getResourcePath($this->getTemplatePath() . '/' . $this->name . $ext); |
|
57 | + $path = $resource->getResourcePath($this->getTemplatePath().'/'.$this->name.$ext); |
|
58 | 58 | if ($path !== null) { |
59 | - return [$path , $isRaw]; |
|
59 | + return [$path, $isRaw]; |
|
60 | 60 | } |
61 | 61 | } |
62 | 62 | return null; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function has(string $name): bool |
24 | 24 | { |
25 | - return method_exists($this, 'parse' . ucfirst($name)); |
|
25 | + return method_exists($this, 'parse'.ucfirst($name)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | public function parse(string $name, string $content): string |
34 | 34 | { |
35 | 35 | if ($this->has($name)) { |
36 | - return $this->{'parse' . ucfirst($name)}($this->parseEchoValue($content)); |
|
36 | + return $this->{'parse'.ucfirst($name)}($this->parseEchoValue($content)); |
|
37 | 37 | } |
38 | 38 | return ''; |
39 | 39 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | preg_match('/\((.+)\)/', $exp, $v); |
67 | 67 | $name = trim(str_replace('\'', '-', trim($v[1], '"\''))); |
68 | - return '<?php $this->insert(\'' . $name . '\',function () { ?>'; |
|
68 | + return '<?php $this->insert(\''.$name.'\',function () { ?>'; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | */ |
181 | 181 | protected function parseInclude($content) |
182 | 182 | { |
183 | - return '<?php $this->include' . $content . '; ?>'; |
|
183 | + return '<?php $this->include'.$content.'; ?>'; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | /** |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | */ |
190 | 190 | protected function parseExtend($content) |
191 | 191 | { |
192 | - return '<?php $this->extend' . $content . '; ?>'; |
|
192 | + return '<?php $this->extend'.$content.'; ?>'; |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | /** |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | protected function parseStatic($content) |
200 | 200 | { |
201 | 201 | $content = strlen(trim($content)) === 0 ? '()' : $content; |
202 | - return '<?php echo $this->getStaticPrefix' . $content . '; ?>'; |
|
202 | + return '<?php echo $this->getStaticPrefix'.$content.'; ?>'; |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param string $className |
42 | 42 | * @return string|null |
43 | 43 | */ |
44 | - public function getClassPath(string $className):?string |
|
44 | + public function getClassPath(string $className): ?string |
|
45 | 45 | { |
46 | 46 | // 搜索路径 |
47 | 47 | foreach ($this->includePath as $includeNamespace => $includePaths) { |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @param string $filename |
59 | 59 | * @return string|null |
60 | 60 | */ |
61 | - public function import(string $filename):?string |
|
61 | + public function import(string $filename): ?string |
|
62 | 62 | { |
63 | 63 | if ($filename = static::realPath($filename)) { |
64 | 64 | static::requireOnce($filename); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @param string $className |
102 | 102 | * @return string|null |
103 | 103 | */ |
104 | - protected function getClassPathByAlias(string $includePath, string $className):?string |
|
104 | + protected function getClassPathByAlias(string $includePath, string $className): ?string |
|
105 | 105 | { |
106 | 106 | $namepath = static::formatSeparator($className); |
107 | 107 | $className = static::realName($className); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @param string $className |
127 | 127 | * @return string|null |
128 | 128 | */ |
129 | - protected function getClassPathByName(string $includeNamespace, string $includePath, string $className):?string |
|
129 | + protected function getClassPathByName(string $includeNamespace, string $includePath, string $className): ?string |
|
130 | 130 | { |
131 | 131 | if (is_numeric($includeNamespace)) { |
132 | 132 | $path = $includePath.DIRECTORY_SEPARATOR.static::formatSeparator($className).'.php'; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | public function loadVendorIfExist() |
86 | 86 | { |
87 | - $vendorAutoload = $this->application->getPath() . '/vendor/autoload.php'; |
|
87 | + $vendorAutoload = $this->application->getPath().'/vendor/autoload.php'; |
|
88 | 88 | if (FileSystem::exist($vendorAutoload)) { |
89 | 89 | Loader::requireOnce($vendorAutoload); |
90 | 90 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | protected function registerModule() |
123 | 123 | { |
124 | - $extractPath = $this->application->getDataPath() . '/extract-module'; |
|
124 | + $extractPath = $this->application->getDataPath().'/extract-module'; |
|
125 | 125 | FileSystem::make($extractPath); |
126 | 126 | foreach ($this->application->getModulePaths() as $path) { |
127 | 127 | $this->registerModuleFrom($path, $extractPath); |
@@ -68,13 +68,13 @@ |
||
68 | 68 | ); |
69 | 69 | $exported = []; |
70 | 70 | foreach ($props as $value) { |
71 | - $name = dechex($value->getModifiers()) . '$' . $value->getName(); |
|
71 | + $name = dechex($value->getModifiers()).'$'.$value->getName(); |
|
72 | 72 | $value->setAccessible(true); |
73 | 73 | $exported[$name] = new DebugObject($value->getValue($object), $this->context); |
74 | 74 | } |
75 | 75 | return $exported; |
76 | 76 | } catch (\ReflectionException $e) { |
77 | - return 'Err:' . $e->getMessage(); |
|
77 | + return 'Err:'.$e->getMessage(); |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 |
@@ -11,21 +11,21 @@ discard block |
||
11 | 11 | * @param string $path |
12 | 12 | * @return string|null |
13 | 13 | */ |
14 | - public static function resolve(string $path):?string |
|
14 | + public static function resolve(string $path): ?string |
|
15 | 15 | { |
16 | 16 | if (file_exists($path) && is_file($path)) { |
17 | 17 | return $path; |
18 | 18 | } |
19 | 19 | $basepath = dirname($path).'/'.pathinfo($path, PATHINFO_FILENAME); |
20 | 20 | |
21 | - return static::resolveYaml($basepath) ?? static::resolveExtensions($basepath, ['json','php','ini']); |
|
21 | + return static::resolveYaml($basepath) ?? static::resolveExtensions($basepath, ['json', 'php', 'ini']); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
25 | 25 | * @param string $basepath |
26 | 26 | * @return string|null |
27 | 27 | */ |
28 | - protected static function resolveYaml(string $basepath):?string |
|
28 | + protected static function resolveYaml(string $basepath): ?string |
|
29 | 29 | { |
30 | 30 | if (file_exists($conf = $basepath.'.yml') || file_exists($conf = $basepath.'.yaml')) { |
31 | 31 | if (function_exists('yaml_parse') || class_exists('Spyc') || class_exists('Symfony\Component\Yaml\Yaml')) { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | return null; |
36 | 36 | } |
37 | 37 | |
38 | - protected static function resolveExtensions(string $basepath, array $extensions):?string |
|
38 | + protected static function resolveExtensions(string $basepath, array $extensions): ?string |
|
39 | 39 | { |
40 | 40 | foreach ($extensions as $ext) { |
41 | 41 | $conf = $basepath.'.'.$ext; |
@@ -65,7 +65,7 @@ |
||
65 | 65 | |
66 | 66 | protected static function parseValue(string $content, array $extra = [], bool $raw = true): string |
67 | 67 | { |
68 | - return preg_replace_callback('/\$\{(.+?)\}/', function ($matchs) use ($extra, $raw) { |
|
68 | + return preg_replace_callback('/\$\{(.+?)\}/', function($matchs) use ($extra, $raw) { |
|
69 | 69 | $name = $matchs[1]; |
70 | 70 | if (($value = ArrayDotAccess::get($extra, $name, null)) !== null) { |
71 | 71 | } elseif (defined($name)) { |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | protected function prepare(Request $request, Response $response) |
78 | 78 | { |
79 | - $response->setHeader('x-powered-by', 'suda/' . SUDA_VERSION, true); |
|
79 | + $response->setHeader('x-powered-by', 'suda/'.SUDA_VERSION, true); |
|
80 | 80 | $response->getWrapper()->register(ExceptionContentWrapper::class, [Throwable::class]); |
81 | 81 | $response->getWrapper()->register(TemplateWrapper::class, [RawTemplate::class]); |
82 | 82 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | if (!$appResponse->isSend()) { |
130 | 130 | $appResponse->end(); |
131 | 131 | } |
132 | - $this->debug->info('responded with code ' . $appResponse->getStatus()); |
|
132 | + $this->debug->info('responded with code '.$appResponse->getStatus()); |
|
133 | 133 | $this->debug->timeEnd('sending response'); |
134 | 134 | } catch (Throwable $e) { |
135 | 135 | $this->debug->uncaughtException($e); |
@@ -155,13 +155,13 @@ discard block |
||
155 | 155 | $route = $attributes['config'] ?? []; |
156 | 156 | $runnable = null; |
157 | 157 | if (array_key_exists('class', $route)) { |
158 | - $runnable = $this->className($route['class']) . '->onRequest'; |
|
158 | + $runnable = $this->className($route['class']).'->onRequest'; |
|
159 | 159 | } elseif (array_key_exists('source', $route)) { |
160 | 160 | $attributes['source'] = $route['source']; |
161 | - $runnable = FileRequestProcessor::class . '->onRequest'; |
|
161 | + $runnable = FileRequestProcessor::class.'->onRequest'; |
|
162 | 162 | } elseif (array_key_exists('template', $route)) { |
163 | 163 | $attributes['template'] = $route['template']; |
164 | - $runnable = TemplateRequestProcessor::class . '->onRequest'; |
|
164 | + $runnable = TemplateRequestProcessor::class.'->onRequest'; |
|
165 | 165 | } elseif (array_key_exists('runnable', $route)) { |
166 | 166 | $runnable = $route['runnable']; |
167 | 167 | } else { |