@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . '/loader.php'; |
|
2 | +require_once __DIR__.'/loader.php'; |
|
3 | 3 | |
4 | 4 | use Swoole\Http\Server; |
5 | 5 | use suda\swoole\Request; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | // 初始化系统加载器 |
17 | 17 | $loader = new Loader; |
18 | 18 | $loader->register(); |
19 | -$loader->addIncludePath(SUDA_SYSTEM . '/src', 'suda'); |
|
19 | +$loader->addIncludePath(SUDA_SYSTEM.'/src', 'suda'); |
|
20 | 20 | // 创建应用 |
21 | 21 | $application = ApplicationBuilder::build($loader, SUDA_APP, SUDA_APP_MANIFEST, SUDA_DATA); |
22 | 22 | // 注册Debug工具 |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | $logger = new FileLogger( |
28 | 28 | [ |
29 | 29 | 'log-level' => SUDA_DEBUG_LEVEL, |
30 | - 'save-path' => $application->getDataPath() . '/logs', |
|
31 | - 'save-zip-path' => $application->getDataPath() . '/logs/zip', |
|
32 | - 'save-dump-path' => $application->getDataPath() . '/logs/dump', |
|
30 | + 'save-path' => $application->getDataPath().'/logs', |
|
31 | + 'save-zip-path' => $application->getDataPath().'/logs/zip', |
|
32 | + 'save-dump-path' => $application->getDataPath().'/logs/dump', |
|
33 | 33 | 'log-format' => '%message%', |
34 | 34 | ] |
35 | 35 | ); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | 'log_file' => $logger->getConfig('save-dump-path').'/swoole.log', |
41 | 41 | ]); |
42 | 42 | |
43 | -$http->on('request', function ($request, $response) use ($application, $logger) { |
|
43 | +$http->on('request', function($request, $response) use ($application, $logger) { |
|
44 | 44 | // 拷贝副本 |
45 | 45 | $runApplication = clone $application; |
46 | 46 | $runLogger = clone $logger; |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | protected function whereStringArray(string $where, array $whereBinder) |
172 | 172 | { |
173 | 173 | list($where, $whereBinder) = $this->prepareWhereString($where, $whereBinder); |
174 | - $this->where = 'WHERE ' . $where; |
|
174 | + $this->where = 'WHERE '.$where; |
|
175 | 175 | $this->binder = $this->mergeBinder($this->binder, $whereBinder); |
176 | 176 | } |
177 | 177 | |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | */ |
184 | 184 | public function groupBy(string $what) |
185 | 185 | { |
186 | - $this->groupBy = 'GROUP BY `' . $what . '`'; |
|
186 | + $this->groupBy = 'GROUP BY `'.$what.'`'; |
|
187 | 187 | return $this; |
188 | 188 | } |
189 | 189 | |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | protected function havingStringArray(string $having, array $havingBinder) |
227 | 227 | { |
228 | 228 | list($having, $havingBinder) = $this->prepareWhereString($having, $havingBinder); |
229 | - $this->having = 'HAVING ' . $having; |
|
229 | + $this->having = 'HAVING '.$having; |
|
230 | 230 | $this->binder = $this->mergeBinder($this->binder, $havingBinder); |
231 | 231 | } |
232 | 232 | |
@@ -241,9 +241,9 @@ discard block |
||
241 | 241 | { |
242 | 242 | $order = strtoupper($order); |
243 | 243 | if (strlen($this->orderBy) > 0) { |
244 | - $this->orderBy .= ',`' . $what . '` ' . $order; |
|
244 | + $this->orderBy .= ',`'.$what.'` '.$order; |
|
245 | 245 | } else { |
246 | - $this->orderBy = 'ORDER BY `' . $what . '` ' . $order; |
|
246 | + $this->orderBy = 'ORDER BY `'.$what.'` '.$order; |
|
247 | 247 | } |
248 | 248 | return $this; |
249 | 249 | } |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | */ |
258 | 258 | public function limit(int $start, int $length = null) |
259 | 259 | { |
260 | - $this->limit = 'LIMIT ' . $start . ($length !== null ? ',' . $length : ''); |
|
260 | + $this->limit = 'LIMIT '.$start.($length !== null ? ','.$length : ''); |
|
261 | 261 | return $this; |
262 | 262 | } |
263 | 263 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $fields = $reads; |
26 | 26 | } else { |
27 | 27 | $field = []; |
28 | - $prefix = strlen($table) ?"`{$table}`." :''; |
|
28 | + $prefix = strlen($table) ? "`{$table}`." : ''; |
|
29 | 29 | foreach ($reads as $want) { |
30 | 30 | $field[] = $prefix."`$want`"; |
31 | 31 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | foreach ($where as $name => $value) { |
49 | 49 | $query = $this->getQueryForArray($name, $value); |
50 | 50 | $and[] = $query->getQuery(); |
51 | - $binders = array_merge($binders, $query->getBinder()); |
|
51 | + $binders = array_merge($binders, $query->getBinder()); |
|
52 | 52 | } |
53 | 53 | return [implode(' AND ', $and), $binders]; |
54 | 54 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | protected function prepareQueryMark(string $sql, array $parameter) |
198 | 198 | { |
199 | 199 | $binders = []; |
200 | - $query = preg_replace_callback('/\?/', function ($match) use (&$binders, $parameter) { |
|
200 | + $query = preg_replace_callback('/\?/', function($match) use (&$binders, $parameter) { |
|
201 | 201 | $index = count($binders); |
202 | 202 | if (array_key_exists($index, $parameter)) { |
203 | 203 | $name = Binder::index($index); |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | protected function mergeBinder(array $binderArray, array $parameter) |
227 | 227 | { |
228 | 228 | foreach ($parameter as $key => $value) { |
229 | - if (! ($value instanceof Binder)) { |
|
229 | + if (!($value instanceof Binder)) { |
|
230 | 230 | $value = new Binder($key, $value); |
231 | 231 | } |
232 | 232 | if (!in_array($value, $binderArray)) { |
@@ -110,7 +110,7 @@ |
||
110 | 110 | public function get(string $name = null, $default = null) |
111 | 111 | { |
112 | 112 | if ($name !== null) { |
113 | - return $this->has($name) ?$_SESSION[$name]:$default; |
|
113 | + return $this->has($name) ? $_SESSION[$name] : $default; |
|
114 | 114 | } else { |
115 | 115 | return $_SESSION; |
116 | 116 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | */ |
9 | 9 | interface DumpInterface |
10 | 10 | { |
11 | - public static function parameterToString($object, int $deep=2); |
|
11 | + public static function parameterToString($object, int $deep = 2); |
|
12 | 12 | public static function dumpThrowable(Throwable $e); |
13 | - public static function dumpTrace(array $backtrace, bool $str=true, string $perfix=''); |
|
13 | + public static function dumpTrace(array $backtrace, bool $str = true, string $perfix = ''); |
|
14 | 14 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $this->config = $config; |
80 | 80 | $this->name = $name ?? 'anonymous'; |
81 | 81 | $this->observer = new NullObserver; |
82 | - register_shutdown_function(function () { |
|
82 | + register_shutdown_function(function() { |
|
83 | 83 | $this->onBeforeSystemShutdown(); |
84 | 84 | }); |
85 | 85 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | try { |
108 | 108 | $this->pdo = $this->createPDO(); |
109 | 109 | $this->id = static::$connectionCount; |
110 | - static::$connectionCount ++; |
|
110 | + static::$connectionCount++; |
|
111 | 111 | } catch (PDOException $e) { |
112 | 112 | throw new SQLException(sprintf( |
113 | 113 | "%s connect database error:%s", |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | */ |
181 | 181 | public function beginTransaction() |
182 | 182 | { |
183 | - $this->transaction ++; |
|
183 | + $this->transaction++; |
|
184 | 184 | if ($this->transaction == 1) { |
185 | 185 | $this->pdo->beginTransaction(); |
186 | 186 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | if (array_key_exists($name, $this->processor)) { |
59 | 59 | if ($this->processor[$name] === ObjectMiddleware::SERIALIZE) { |
60 | - return $data === null? $data : serialize($data); |
|
60 | + return $data === null ? $data : serialize($data); |
|
61 | 61 | } |
62 | 62 | if ($this->processor[$name] === ObjectMiddleware::JSON) { |
63 | 63 | return json_encode($data); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | if ($doc = $property->getDocComment()) { |
114 | 114 | if (is_string($doc) && preg_match('/@var\s+(\w+)/i', $doc, $match)) { |
115 | 115 | $type = strtolower($match[1]); |
116 | - if (in_array($type, ['boolean', 'bool', 'integer', 'int' , 'float' , 'double', 'string'])) { |
|
116 | + if (in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string'])) { |
|
117 | 117 | return ObjectMiddleware::RAW; |
118 | 118 | } |
119 | 119 | } |
@@ -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->processTags($content); |
|
87 | - $content=$this->processCommands($content); |
|
86 | + $content = $this->processTags($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) { |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
24 | 24 | $path = $this |
25 | 25 | ->getResource($this->module) |
26 | - ->getResourcePath($this->getTemplatePath() . '/' . $this->name . $subfix); |
|
26 | + ->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
|
27 | 27 | $this->loadDynamicTemplateConfig($path.'.ini'); |
28 | 28 | return $path; |
29 | 29 | } |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getPath() |
50 | 50 | { |
51 | - $output = $this->config['output'] ?? $this->application->getDataPath() . '/template/' . $this->uriName; |
|
51 | + $output = $this->config['output'] ?? $this->application->getDataPath().'/template/'.$this->uriName; |
|
52 | 52 | FileSystem::make($output); |
53 | - return $output . '/' . $this->name . '.php'; |
|
53 | + return $output.'/'.$this->name.'.php'; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | /** |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function getRenderedString() |
76 | 76 | { |
77 | - $this->application->debug()->time('render ' . $this->name); |
|
77 | + $this->application->debug()->time('render '.$this->name); |
|
78 | 78 | $code = parent::getRenderedString(); |
79 | - $this->application->debug()->timeEnd('render ' . $this->name); |
|
79 | + $this->application->debug()->timeEnd('render '.$this->name); |
|
80 | 80 | return $code; |
81 | 81 | } |
82 | 82 | |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | protected function compile() |
88 | 88 | { |
89 | 89 | if ($this->isCompiled() === false) { |
90 | - $this->application->debug()->time('compile ' . $this->name); |
|
90 | + $this->application->debug()->time('compile '.$this->name); |
|
91 | 91 | $result = parent::compile(); |
92 | - $this->application->debug()->timeEnd('compile ' . $this->name); |
|
92 | + $this->application->debug()->timeEnd('compile '.$this->name); |
|
93 | 93 | return $result; |
94 | 94 | } |
95 | 95 | return true; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
115 | 115 | } elseif (is_string($defaultName)) { |
116 | - $parameter = is_array($name)?array_merge($query, $name):$query; |
|
116 | + $parameter = is_array($name) ?array_merge($query, $name) : $query; |
|
117 | 117 | return $this->application->getUrl( |
118 | 118 | $this->request, |
119 | 119 | $defaultName, |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $this->group |
124 | 124 | ); |
125 | 125 | } |
126 | - return '#' . $defaultName; |
|
126 | + return '#'.$defaultName; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 |