@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | protected function parseStatic($content) |
29 | 29 | { |
30 | - $content = strlen(trim($content)) === 0 ?'()':$content; |
|
30 | + $content = strlen(trim($content)) === 0 ? '()' : $content; |
|
31 | 31 | return '<?php echo $this->getStaticModulePrefix'.$content.'; ?>'; |
32 | 32 | } |
33 | 33 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | protected function parseE($content) |
39 | 39 | { |
40 | - $content = strlen(trim($content)) === 0 ?'()':$content; |
|
40 | + $content = strlen(trim($content)) === 0 ? '()' : $content; |
|
41 | 41 | return '<?php echo $this->application->_'.$content.'; ?>'; |
42 | 42 | } |
43 | 43 | } |
@@ -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 | /** |
39 | 39 | * 初始化 |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function registerTag(Tag $tag) |
83 | 83 | { |
84 | - $this->tags[$tag->getName()] =$tag; |
|
84 | + $this->tags[$tag->getName()] = $tag; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | public function compileText(string $text, array $tagConfig = []):string |
96 | 96 | { |
97 | 97 | $this->applyTagConfig($tagConfig); |
98 | - $result = ''; |
|
98 | + $result = ''; |
|
99 | 99 | foreach (token_get_all($text) as $token) { |
100 | 100 | if (is_array($token)) { |
101 | 101 | list($tag, $content) = $token; |
102 | 102 | // 所有将要编译的文本 |
103 | 103 | // 跳过各种的PHP |
104 | 104 | if ($tag == T_INLINE_HTML) { |
105 | - $content=$this->processTags($content); |
|
106 | - $content=$this->processCommands($content); |
|
105 | + $content = $this->processTags($content); |
|
106 | + $content = $this->processCommands($content); |
|
107 | 107 | } |
108 | 108 | $result .= $content; |
109 | 109 | } else { |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | { |
140 | 140 | foreach ($this->tags as $tag) { |
141 | 141 | $pregExp = sprintf('/(!)?%s\s*(.+?)\s*%s/', preg_quote($tag->getOpen()), preg_quote($tag->getClose())); |
142 | - $text = preg_replace_callback($pregExp, function ($match) use ($tag) { |
|
142 | + $text = preg_replace_callback($pregExp, function($match) use ($tag) { |
|
143 | 143 | if ($match[1] === '!') { |
144 | 144 | return substr($match[0], 1); |
145 | 145 | } else { |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | */ |
158 | 158 | protected function processCommands(string $text):string |
159 | 159 | { |
160 | - $pregExp ='/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
161 | - $code = preg_replace_callback($pregExp, [$this,'doMatchCommand'], $text); |
|
160 | + $pregExp = '/\B\@(\!)?([\w\x{4e00}-\x{9aff}]+)(\s*)(\( ( (?>[^()]+) | (?4) )* \) )? /ux'; |
|
161 | + $code = preg_replace_callback($pregExp, [$this, 'doMatchCommand'], $text); |
|
162 | 162 | $error = preg_last_error(); |
163 | 163 | if ($error !== PREG_NO_ERROR) { |
164 | 164 | throw new Exception($error); |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | list($input, $ignore, $name, $space) = $match; |
175 | 175 | $params = ''; |
176 | 176 | } |
177 | - if ($ignore ==='!') { |
|
177 | + if ($ignore === '!') { |
|
178 | 178 | return str_replace('@!', '@', $input); |
179 | 179 | } else { |
180 | 180 | foreach ($this->commands as $command) { |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $group = $group ?? $request->getAttribute('group'); |
37 | 37 | $default = $default ?? $request->getAttribute('module'); |
38 | 38 | $url = $this->route->create($this->getRouteName($name, $default, $group), $parameter, $allowQuery); |
39 | - return $this->getUrlIndex($request) . ltrim($url, '/'); |
|
39 | + return $this->getUrlIndex($request).ltrim($url, '/'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $module = $default; |
74 | 74 | } |
75 | 75 | if ($module !== null && ($moduleObj = $this->find($module))) { |
76 | - return $moduleObj->getFullName() . ':' . $name; |
|
76 | + return $moduleObj->getFullName().':'.$name; |
|
77 | 77 | } |
78 | 78 | return $name; |
79 | 79 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | } |
96 | 96 | $prefixGroup = $this->getRouteGroupPrefix($group); |
97 | 97 | if ($module !== null && ($moduleObj = $this->find($module))) { |
98 | - return $moduleObj->getFullName() . $prefixGroup . ':' . $name; |
|
98 | + return $moduleObj->getFullName().$prefixGroup.':'.$name; |
|
99 | 99 | } |
100 | 100 | return $name; |
101 | 101 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | public function getUriBase(Request $request, bool $beautify = true): string |
138 | 138 | { |
139 | 139 | $index = $beautify ? $this->getUrlIndex($request) : $request->getIndex(); |
140 | - return $request->getUriBase() . $index; |
|
140 | + return $request->getUriBase().$index; |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -148,6 +148,6 @@ discard block |
||
148 | 148 | */ |
149 | 149 | protected function getRouteGroupPrefix(?string $group): string |
150 | 150 | { |
151 | - return $group === null || $group === 'default' ? '' : '@' . $group; |
|
151 | + return $group === null || $group === 'default' ? '' : '@'.$group; |
|
152 | 152 | } |
153 | 153 | } |
@@ -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) { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @param string $name |
113 | 113 | * @return Module|null |
114 | 114 | */ |
115 | - public function get(string $name):?Module |
|
115 | + public function get(string $name): ?Module |
|
116 | 116 | { |
117 | 117 | $full = $this->getFullName($name); |
118 | 118 | return $this->module[$full] ?? null; |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | if (array_key_exists($version, $this->knownsFullName[$sortName])) { |
206 | 206 | return $this->knownsFullName[$sortName][$version]; |
207 | 207 | } |
208 | - return $hasVersion?$sortName.':'.$version:end($this->knownsFullName[$sortName]); |
|
208 | + return $hasVersion ? $sortName.':'.$version : end($this->knownsFullName[$sortName]); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | protected function getLikeName(string $name):string |
@@ -31,7 +31,7 @@ |
||
31 | 31 | */ |
32 | 32 | public function packValue(?string $matched) |
33 | 33 | { |
34 | - return $matched ? urlencode($matched): ''; |
|
34 | + return $matched ? urlencode($matched) : ''; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | { |
44 | 44 | $this->routes = new RouteCollection; |
45 | 45 | $this->runnable = []; |
46 | - $this->default = new Runnable([__CLASS__ , 'defaultResponse']); |
|
46 | + $this->default = new Runnable([__CLASS__, 'defaultResponse']); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | * @param bool $allowQuery |
301 | 301 | * @return string|null |
302 | 302 | */ |
303 | - public function create(string $name, array $parameter, bool $allowQuery = true):?string |
|
303 | + public function create(string $name, array $parameter, bool $allowQuery = true): ?string |
|
304 | 304 | { |
305 | 305 | if ($matcher = $this->routes->get($name)) { |
306 | 306 | return UriMatcher::buildUri($matcher->getMatcher(), $parameter, $allowQuery); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | */ |
18 | 18 | public function log($level, $message, array $context = []) |
19 | 19 | { |
20 | - print date('Y-m-d H:i:s') . ' ' . $this->interpolate($message, $context) . PHP_EOL; |
|
20 | + print date('Y-m-d H:i:s').' '.$this->interpolate($message, $context).PHP_EOL; |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | { |
30 | 30 | $replace = []; |
31 | 31 | foreach ($context as $key => $val) { |
32 | - $replace['{' . $key . '}'] = $val; |
|
32 | + $replace['{'.$key.'}'] = $val; |
|
33 | 33 | } |
34 | 34 | return strtr($message, $replace); |
35 | 35 | } |
@@ -2,17 +2,17 @@ |
||
2 | 2 | $host = $argv[1] ?? '127.0.0.1:9501'; |
3 | 3 | list($ip, $port) = explode(':', $host); |
4 | 4 | |
5 | -define('SUDA_APP', __DIR__ . '/app'); |
|
6 | -define('SUDA_DATA', __DIR__ . '/data'); |
|
7 | -define('SUDA_SYSTEM', __DIR__ . '/suda'); |
|
5 | +define('SUDA_APP', __DIR__.'/app'); |
|
6 | +define('SUDA_DATA', __DIR__.'/data'); |
|
7 | +define('SUDA_SYSTEM', __DIR__.'/suda'); |
|
8 | 8 | define('SUDA_PUBLIC', __DIR__); |
9 | 9 | define('SUDA_DEBUG', true); |
10 | 10 | define('SUDA_DEBUG_LEVEL', 'debug'); |
11 | -define('SUDA_APP_MANIFEST', SUDA_APP . '/manifest'); |
|
11 | +define('SUDA_APP_MANIFEST', SUDA_APP.'/manifest'); |
|
12 | 12 | |
13 | 13 | // 设置IP或者端口 |
14 | 14 | define('SUDA_SWOOLE_IP', $ip); |
15 | 15 | define('SUDA_SWOOLE_PORT', $port); |
16 | 16 | |
17 | -require_once __DIR__ .'/vendor/autoload.php'; |
|
17 | +require_once __DIR__.'/vendor/autoload.php'; |
|
18 | 18 | require_once SUDA_SYSTEM.'/loader/swoole.php'; |
19 | 19 | \ No newline at end of file |
@@ -6,7 +6,7 @@ |
||
6 | 6 | define('SUDA_DEBUG', true); |
7 | 7 | define('SUDA_DEBUG_LEVEL', 'info'); |
8 | 8 | |
9 | -require_once __DIR__ .'/../vendor/autoload.php'; |
|
9 | +require_once __DIR__.'/../vendor/autoload.php'; |
|
10 | 10 | require_once SUDA_SYSTEM.'/loader/main.php'; |
11 | 11 | |
12 | 12 |