@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think; |
14 | 14 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | public function __construct(App $app) |
57 | 57 | { |
58 | 58 | $this->app = $app; |
59 | - $this->multi = is_dir($this->app->getBasePath() . 'controller') ? false : true; |
|
59 | + $this->multi = is_dir($this->app->getBasePath().'controller') ? false : true; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | $this->initialize(); |
173 | 173 | |
174 | 174 | // 加载全局中间件 |
175 | - if (is_file($this->app->getBasePath() . 'middleware.php')) { |
|
176 | - $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php'); |
|
175 | + if (is_file($this->app->getBasePath().'middleware.php')) { |
|
176 | + $this->app->middleware->import(include $this->app->getBasePath().'middleware.php'); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | if ($this->multi) { |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | // 监听HttpRun |
187 | 187 | $this->app->event->trigger('HttpRun'); |
188 | 188 | |
189 | - $withRoute = $this->app->config->get('app.with_route', true) ? function () { |
|
189 | + $withRoute = $this->app->config->get('app.with_route', true) ? function() { |
|
190 | 190 | $this->loadRoutes(); |
191 | 191 | } : null; |
192 | 192 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | { |
203 | 203 | // 加载路由定义 |
204 | 204 | if (is_dir($this->getRoutePath())) { |
205 | - $files = glob($this->getRoutePath() . '*.php'); |
|
205 | + $files = glob($this->getRoutePath().'*.php'); |
|
206 | 206 | foreach ($files as $file) { |
207 | 207 | include $file; |
208 | 208 | } |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | */ |
219 | 219 | protected function getRoutePath(): string |
220 | 220 | { |
221 | - return $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($this->isMulti() ? $this->getName() . DIRECTORY_SEPARATOR : ''); |
|
221 | + return $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($this->isMulti() ? $this->getName().DIRECTORY_SEPARATOR : ''); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | $appName = $map[$name]; |
304 | 304 | } |
305 | 305 | } elseif ($name && (false !== array_search($name, $map) || in_array($name, $deny))) { |
306 | - throw new HttpException(404, 'app not exists:' . $name); |
|
306 | + throw new HttpException(404, 'app not exists:'.$name); |
|
307 | 307 | } elseif ($name && isset($map['*'])) { |
308 | 308 | $appName = $map['*']; |
309 | 309 | } else { |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | } |
312 | 312 | |
313 | 313 | if ($name) { |
314 | - $this->app->request->setRoot('/' . $name); |
|
314 | + $this->app->request->setRoot('/'.$name); |
|
315 | 315 | $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : ''); |
316 | 316 | } |
317 | 317 | } |
@@ -331,41 +331,41 @@ discard block |
||
331 | 331 | { |
332 | 332 | $this->name = $appName; |
333 | 333 | $this->app->request->setApp($appName); |
334 | - $this->app->setAppPath($this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR); |
|
335 | - $this->app->setRuntimePath($this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR); |
|
334 | + $this->app->setAppPath($this->path ?: $this->app->getBasePath().$appName.DIRECTORY_SEPARATOR); |
|
335 | + $this->app->setRuntimePath($this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$appName.DIRECTORY_SEPARATOR); |
|
336 | 336 | |
337 | 337 | //加载app文件 |
338 | 338 | if (is_dir($this->app->getAppPath())) { |
339 | 339 | $appPath = $this->app->getAppPath(); |
340 | 340 | |
341 | - if (is_file($appPath . 'common.php')) { |
|
342 | - include_once $appPath . 'common.php'; |
|
341 | + if (is_file($appPath.'common.php')) { |
|
342 | + include_once $appPath.'common.php'; |
|
343 | 343 | } |
344 | 344 | |
345 | 345 | $configPath = $this->app->getConfigPath(); |
346 | 346 | |
347 | 347 | $files = []; |
348 | 348 | |
349 | - if (is_dir($configPath . $appName)) { |
|
350 | - $files = array_merge($files, glob($configPath . $appName . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt())); |
|
351 | - } elseif (is_dir($appPath . 'config')) { |
|
352 | - $files = array_merge($files, glob($appPath . 'config' . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt())); |
|
349 | + if (is_dir($configPath.$appName)) { |
|
350 | + $files = array_merge($files, glob($configPath.$appName.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt())); |
|
351 | + } elseif (is_dir($appPath.'config')) { |
|
352 | + $files = array_merge($files, glob($appPath.'config'.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt())); |
|
353 | 353 | } |
354 | 354 | |
355 | 355 | foreach ($files as $file) { |
356 | 356 | $this->app->config->load($file, pathinfo($file, PATHINFO_FILENAME)); |
357 | 357 | } |
358 | 358 | |
359 | - if (is_file($appPath . 'event.php')) { |
|
360 | - $this->app->loadEvent(include $appPath . 'event.php'); |
|
359 | + if (is_file($appPath.'event.php')) { |
|
360 | + $this->app->loadEvent(include $appPath.'event.php'); |
|
361 | 361 | } |
362 | 362 | |
363 | - if (is_file($appPath . 'middleware.php')) { |
|
364 | - $this->app->middleware->import(include $appPath . 'middleware.php'); |
|
363 | + if (is_file($appPath.'middleware.php')) { |
|
364 | + $this->app->middleware->import(include $appPath.'middleware.php'); |
|
365 | 365 | } |
366 | 366 | |
367 | - if (is_file($appPath . 'provider.php')) { |
|
368 | - $this->app->bind(include $appPath . 'provider.php'); |
|
367 | + if (is_file($appPath.'provider.php')) { |
|
368 | + $this->app->bind(include $appPath.'provider.php'); |
|
369 | 369 | } |
370 | 370 | } |
371 | 371 | |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | $this->app->loadLangPack($this->app->lang->defaultLangSet()); |
374 | 374 | |
375 | 375 | // 设置应用命名空间 |
376 | - $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\' . $appName); |
|
376 | + $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\'.$appName); |
|
377 | 377 | } |
378 | 378 | |
379 | 379 | /** |
@@ -29,14 +29,14 @@ discard block |
||
29 | 29 | { |
30 | 30 | $app = $input->getArgument('app'); |
31 | 31 | |
32 | - if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) { |
|
32 | + if (empty($app) && !is_dir($this->app->getBasePath().'controller')) { |
|
33 | 33 | $output->writeln('<error>Miss app name!</error>'); |
34 | 34 | return false; |
35 | 35 | } |
36 | 36 | |
37 | - $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : ''); |
|
37 | + $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : ''); |
|
38 | 38 | |
39 | - $filename = $path . 'route.php'; |
|
39 | + $filename = $path.'route.php'; |
|
40 | 40 | if (is_file($filename)) { |
41 | 41 | unlink($filename); |
42 | 42 | } |
@@ -51,21 +51,21 @@ discard block |
||
51 | 51 | $this->app->route->lazy(false); |
52 | 52 | |
53 | 53 | // 路由检测 |
54 | - $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : ''); |
|
54 | + $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : ''); |
|
55 | 55 | |
56 | 56 | $files = is_dir($path) ? scandir($path) : []; |
57 | 57 | |
58 | 58 | foreach ($files as $file) { |
59 | 59 | if (strpos($file, '.php')) { |
60 | - include $path . $file; |
|
60 | + include $path.$file; |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | 64 | //触发路由载入完成事件 |
65 | 65 | $this->app->event->trigger(RouteLoaded::class); |
66 | 66 | |
67 | - $content = '<?php ' . PHP_EOL . 'return '; |
|
68 | - $content .= '\think\App::unserialize(\'' . \think\App::serialize($this->app->route->getName()) . '\');'; |
|
67 | + $content = '<?php '.PHP_EOL.'return '; |
|
68 | + $content .= '\think\App::unserialize(\''.\think\App::serialize($this->app->route->getName()).'\');'; |
|
69 | 69 | return $content; |
70 | 70 | } |
71 | 71 |