@@ -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); |
@@ -134,7 +134,7 @@ |
||
134 | 134 | protected function getFilePath(string $name) |
135 | 135 | { |
136 | 136 | $path = md5($name); |
137 | - $savePath = $this->path.'/'.substr($path, 0,2); |
|
137 | + $savePath = $this->path.'/'.substr($path, 0, 2); |
|
138 | 138 | FileSystem::make($savePath); |
139 | 139 | return $savePath.'/'.$path.'.cache'; |
140 | 140 | } |
@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @var Tag[] |
28 | 28 | */ |
29 | - protected $tags=[]; |
|
29 | + protected $tags = []; |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * 命令对象 |
33 | 33 | * |
34 | 34 | * @var CommandInterface[] |
35 | 35 | */ |
36 | - protected $commands=[]; |
|
36 | + protected $commands = []; |
|
37 | 37 | |
38 | 38 | public function init() |
39 | 39 | { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function registerTag(Tag $tag) |
64 | 64 | { |
65 | - $this->tags[$tag->getName()] =$tag; |
|
65 | + $this->tags[$tag->getName()] = $tag; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -76,15 +76,15 @@ discard block |
||
76 | 76 | public function compileText(string $text, array $tagConfig = []):string |
77 | 77 | { |
78 | 78 | $this->applyTagConfig($tagConfig); |
79 | - $result = ''; |
|
79 | + $result = ''; |
|
80 | 80 | foreach (token_get_all($text) as $token) { |
81 | 81 | if (is_array($token)) { |
82 | 82 | list($tag, $content) = $token; |
83 | 83 | // 所有将要编译的文本 |
84 | 84 | // 跳过各种的PHP |
85 | 85 | if ($tag == T_INLINE_HTML) { |
86 | - $content=$this->proccesTags($content); |
|
87 | - $content=$this->processCommands($content); |
|
86 | + $content = $this->proccesTags($content); |
|
87 | + $content = $this->processCommands($content); |
|
88 | 88 | } |
89 | 89 | $result .= $content; |
90 | 90 | } else { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | foreach ($this->tags as $tag) { |
110 | 110 | $pregExp = sprintf('/(!)?%s\s*(.+?)\s*%s/', preg_quote($tag->getOpen()), preg_quote($tag->getClose())); |
111 | - $text = preg_replace_callback($pregExp, function ($match) use ($tag) { |
|
111 | + $text = preg_replace_callback($pregExp, function($match) use ($tag) { |
|
112 | 112 | if ($match[1] === '!') { |
113 | 113 | return substr($match[0], 1); |
114 | 114 | } else { |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | */ |
127 | 127 | protected function processCommands(string $text):string |
128 | 128 | { |
129 | - $pregExp ='/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
130 | - $code = preg_replace_callback($pregExp, [$this,'doMatchCommand'], $text); |
|
129 | + $pregExp = '/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
130 | + $code = preg_replace_callback($pregExp, [$this, 'doMatchCommand'], $text); |
|
131 | 131 | $error = preg_last_error(); |
132 | 132 | if ($error !== PREG_NO_ERROR) { |
133 | 133 | throw new Exception($error); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | list($input, $ignore, $name, $space) = $match; |
144 | 144 | $params = ''; |
145 | 145 | } |
146 | - if ($ignore ==='!') { |
|
146 | + if ($ignore === '!') { |
|
147 | 147 | return str_replace('@!', '@', $input); |
148 | 148 | } else { |
149 | 149 | foreach ($this->commands as $command) { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $path |
80 | 80 | * @return Module|null |
81 | 81 | */ |
82 | - public function guess(string $path):?Module |
|
82 | + public function guess(string $path): ?Module |
|
83 | 83 | { |
84 | 84 | foreach ($this->module as $module) { |
85 | 85 | if (FileSystem::isOverflowPath($module->getPath(), $path) === false) { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @throws ApplicationException |
115 | 115 | * @return Module|null |
116 | 116 | */ |
117 | - public function get(string $name):?Module |
|
117 | + public function get(string $name): ?Module |
|
118 | 118 | { |
119 | 119 | $full = $this->getFullName($name); |
120 | 120 | return $this->module[$full] ?? null; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | if (array_key_exists($version, $this->knownsFullName[$sortName])) { |
210 | 210 | return $this->knownsFullName[$sortName][$version]; |
211 | 211 | } |
212 | - return $hasVersion?$sortName.':'.$version:end($this->knownsFullName[$sortName]); |
|
212 | + return $hasVersion ? $sortName.':'.$version : end($this->knownsFullName[$sortName]); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | protected function getLikeName(string $name):string |
@@ -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 | } |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | $replace = []; |
51 | 51 | $attach = []; |
52 | 52 | foreach ($context as $key => $val) { |
53 | - $replaceKey = '{' . $key . '}'; |
|
53 | + $replaceKey = '{'.$key.'}'; |
|
54 | 54 | if ($this->canBeStringValue($val) && strpos($message, $replaceKey) !== false) { |
55 | - $replace['{' . $key . '}'] = $val; |
|
55 | + $replace['{'.$key.'}'] = $val; |
|
56 | 56 | } else { |
57 | 57 | $attach[$key] = $val; |
58 | 58 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); |
103 | 103 | $pos = min($pow, count($human) - 1); |
104 | 104 | $bytes /= (1 << (10 * $pos)); |
105 | - return round($bytes, $precision) . ' ' . $human[$pos]; |
|
105 | + return round($bytes, $precision).' '.$human[$pos]; |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | public function time(string $name, string $type = LogLevel::INFO) |
@@ -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 |