@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public static function formatSeparator(string $path, string $separator = DIRECTORY_SEPARATOR):string |
16 | 16 | { |
17 | - return str_replace(['\\','/'], $separator, $path); |
|
17 | + return str_replace(['\\', '/'], $separator, $path); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | { |
85 | 85 | if (static::getHomePath() !== null && strpos($path, '~') === 0) { |
86 | 86 | $scheme = ''; |
87 | - $subpath = static::getHomePath() .DIRECTORY_SEPARATOR.substr($path, 1); |
|
87 | + $subpath = static::getHomePath().DIRECTORY_SEPARATOR.substr($path, 1); |
|
88 | 88 | } elseif (strpos($path, '://') !== false) { |
89 | 89 | list($scheme, $subpath) = explode('://', $path, 2); |
90 | 90 | $scheme .= '://'; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | /** |
100 | 100 | * @return string|null |
101 | 101 | */ |
102 | - public static function getHomePath():?string |
|
102 | + public static function getHomePath(): ?string |
|
103 | 103 | { |
104 | 104 | if (defined('USER_HOME_PATH')) { |
105 | 105 | return constant('USER_HOME_PATH'); |
@@ -45,10 +45,10 @@ |
||
45 | 45 | |
46 | 46 | foreach ($info as $name => $logs) { |
47 | 47 | if (count($logs)) { |
48 | - $textOutput .= '- '. $name. PHP_EOL; |
|
48 | + $textOutput .= '- '.$name.PHP_EOL; |
|
49 | 49 | $logs = array_unique($logs); |
50 | 50 | foreach ($logs as $log) { |
51 | - $textOutput .= ' - '. $log. PHP_EOL; |
|
51 | + $textOutput .= ' - '.$log.PHP_EOL; |
|
52 | 52 | } |
53 | 53 | } |
54 | 54 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | try { |
104 | 104 | $reflectClass = new ReflectionClass($statement->getFetchClass()); |
105 | 105 | } catch (ReflectionException $e) { |
106 | - throw new FetchResultException('error create class: '. $e->getMessage(), $e->getCode(), $e); |
|
106 | + throw new FetchResultException('error create class: '.$e->getMessage(), $e->getCode(), $e); |
|
107 | 107 | } |
108 | 108 | $object = $reflectClass->newInstanceArgs($statement->getFetchClassArgs()); |
109 | 109 | if (method_exists($object, '__set')) { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | try { |
134 | 134 | $property = $reflectClass->getProperty($propertyName); |
135 | 135 | } catch (ReflectionException $e) { |
136 | - throw new FetchResultException('error create property: '. $e->getMessage(), $e->getCode(), $e); |
|
136 | + throw new FetchResultException('error create property: '.$e->getMessage(), $e->getCode(), $e); |
|
137 | 137 | } |
138 | 138 | $property->setAccessible(true); |
139 | 139 | $property->setValue($object, $value); |
@@ -32,20 +32,20 @@ |
||
32 | 32 | $replace = []; |
33 | 33 | $attribute = array_merge($this->attribute, $attribute); |
34 | 34 | foreach ($attribute as $key => $val) { |
35 | - $replace['%' . $key . '%'] = $val; |
|
35 | + $replace['%'.$key.'%'] = $val; |
|
36 | 36 | } |
37 | 37 | $message = strtr($message, $replace); |
38 | 38 | $attachInfo = ''; |
39 | 39 | foreach ($context as $name => $value) { |
40 | - $attachInfo .= $name . ' = '; |
|
40 | + $attachInfo .= $name.' = '; |
|
41 | 41 | if ($value instanceof AttachValueInterface) { |
42 | - $attachInfo .= $value->getLogAttach() . PHP_EOL; |
|
42 | + $attachInfo .= $value->getLogAttach().PHP_EOL; |
|
43 | 43 | } else { |
44 | - $attachInfo .= DumpTrait::parameterToString($value) . PHP_EOL; |
|
44 | + $attachInfo .= DumpTrait::parameterToString($value).PHP_EOL; |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | if (strlen($attachInfo) > 0) { |
48 | - return $message . PHP_EOL . $attachInfo; |
|
48 | + return $message.PHP_EOL.$attachInfo; |
|
49 | 49 | } |
50 | 50 | return $message; |
51 | 51 | } |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | protected static function fixConfig(Application $application, ?string $module, array $config) |
45 | 45 | { |
46 | 46 | if (!array_key_exists('assets-prefix', $config)) { |
47 | - $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS'): 'assets'; |
|
47 | + $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS') : 'assets'; |
|
48 | 48 | } |
49 | 49 | if (!array_key_exists('static', $config)) { |
50 | 50 | $config['static'] = 'static'; |
51 | 51 | } |
52 | 52 | if (!array_key_exists('assets-path', $config)) { |
53 | - $config['assets-path'] = SUDA_PUBLIC. '/'.$config['assets-prefix']; |
|
53 | + $config['assets-path'] = SUDA_PUBLIC.'/'.$config['assets-prefix']; |
|
54 | 54 | } |
55 | 55 | if (!array_key_exists('static-name', $config)) { |
56 | 56 | $config['uri-name'] = static::getSafeUriName($application, $module); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | $assetRoot = static::getAssetRoot($application, $module); |
116 | 116 | if (in_array($request->getIndex(), $application->conf('index', ['/index.php']))) { |
117 | 117 | $name = static::isAssetsWritable($application, $module) |
118 | - ? dirname($request->getIndex()):$request->getIndex(); |
|
118 | + ? dirname($request->getIndex()) : $request->getIndex(); |
|
119 | 119 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
120 | 120 | } |
121 | 121 | return rtrim(str_replace('\\', '/', $request->getIndex()), '/').$assetRoot; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | ?string $module = null |
152 | 152 | ):string { |
153 | 153 | $assetRoot = static::getAssetRoot($application, $module); |
154 | - $name = static::isAssetsWritable($application, $module) ? dirname($request->getIndex()):$request->getIndex(); |
|
154 | + $name = static::isAssetsWritable($application, $module) ? dirname($request->getIndex()) : $request->getIndex(); |
|
155 | 155 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
156 | 156 | } |
157 | 157 |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | protected function getStaticOutputPath(?string $name = null) |
104 | 104 | { |
105 | 105 | $public = defined('SUDA_PUBLIC') ? constant('SUDA_PUBLIC') : '.'; |
106 | - $path = $this->config['assets-public'] ?? $public . '/assets/' . $this->getStaticName($name); |
|
106 | + $path = $this->config['assets-public'] ?? $public.'/assets/'.$this->getStaticName($name); |
|
107 | 107 | FileSystem::make($path); |
108 | 108 | return $path; |
109 | 109 | } |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | if ($this->isRaw()) { |
119 | 119 | return $this->source; |
120 | 120 | } |
121 | - $output = $this->config['output'] ?? constant('SUDA_DATA') . '/template'; |
|
121 | + $output = $this->config['output'] ?? constant('SUDA_DATA').'/template'; |
|
122 | 122 | FileSystem::make($output); |
123 | - return $output . '/' . $this->name . '-' . substr(md5_file($this->getSourcePath()), 10, 8) . '.php'; |
|
123 | + return $output.'/'.$this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $sourcePath = $this->getSourcePath(); |
184 | 184 | if ($sourcePath === null) { |
185 | 185 | throw new NoTemplateFoundException( |
186 | - 'missing source ' . $this->name, |
|
186 | + 'missing source '.$this->name, |
|
187 | 187 | E_USER_ERROR, |
188 | 188 | $this->name, |
189 | 189 | NoTemplateFoundException::T_SOURCE |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | public function include(string $path) |
204 | 204 | { |
205 | 205 | $subfix = $this->config['subfix'] ?? ''; |
206 | - $included = new self(Resource::getPathByRelativePath($path . $subfix, dirname($this->source)), $this->config); |
|
206 | + $included = new self(Resource::getPathByRelativePath($path.$subfix, dirname($this->source)), $this->config); |
|
207 | 207 | $included->parent = $this; |
208 | 208 | echo $included->getRenderedString(); |
209 | 209 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | } else { |
223 | 223 | $prefix = '/assets'; |
224 | 224 | } |
225 | - return '/' . ltrim($prefix, '/') . '/' . $this->getStaticName($name); |
|
225 | + return '/'.ltrim($prefix, '/').'/'.$this->getStaticName($name); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | /** |
@@ -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 | /** |