@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * |
| 12 | 12 | * @var array |
| 13 | 13 | */ |
| 14 | - private $locales=[]; |
|
| 14 | + private $locales = []; |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * 包含本地化语言数组 |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public static function format(string $string, array $param) |
| 51 | 51 | { |
| 52 | - return preg_replace_callback('/(?<!\$)\$(\{)?(\d+|\w+?\b)(?(1)\})/', function ($match) use ($param) { |
|
| 52 | + return preg_replace_callback('/(?<!\$)\$(\{)?(\d+|\w+?\b)(?(1)\})/', function($match) use ($param) { |
|
| 53 | 53 | $key = $match[2]; |
| 54 | 54 | if (array_key_exists($key, $param)) { |
| 55 | 55 | return strval($param[$key]); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | { |
| 43 | 43 | $this->routes = new RouteCollection; |
| 44 | 44 | $this->runnable = []; |
| 45 | - $this->default = new Runnable([__CLASS__ , 'defaultResponse']); |
|
| 45 | + $this->default = new Runnable([__CLASS__, 'defaultResponse']); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * @param boolean $allowQuery |
| 290 | 290 | * @return string|null |
| 291 | 291 | */ |
| 292 | - public function create(string $name, array $parameter, bool $allowQuery = true):?string |
|
| 292 | + public function create(string $name, array $parameter, bool $allowQuery = true): ?string |
|
| 293 | 293 | { |
| 294 | 294 | if ($matcher = $this->routes->get($name)) { |
| 295 | 295 | return UriMatcher::buildUri($matcher->getMatcher(), $parameter, $allowQuery); |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | |
| 25 | 25 | public function packValue(?string $matched) |
| 26 | 26 | { |
| 27 | - return $matched ? urlencode($matched): ''; |
|
| 27 | + return $matched ? urlencode($matched) : ''; |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -230,7 +230,7 @@ |
||
| 230 | 230 | protected function closeOutputBuffer(bool $flush) |
| 231 | 231 | { |
| 232 | 232 | while (ob_get_level() > 0) { |
| 233 | - $flush?ob_end_flush():ob_end_clean(); |
|
| 233 | + $flush ?ob_end_flush() : ob_end_clean(); |
|
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | * @return DataAccess |
| 60 | 60 | * @throws ReflectionException |
| 61 | 61 | */ |
| 62 | - public static function new(string $object, ?Middleware $middleware = null):DataAccess |
|
| 62 | + public static function new(string $object, ?Middleware $middleware = null) : DataAccess |
|
| 63 | 63 | { |
| 64 | 64 | return new self($object, $middleware); |
| 65 | 65 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function __construct($resource = []) |
| 28 | 28 | { |
| 29 | - $this->resource = is_array($resource)?$resource:[$resource]; |
|
| 29 | + $this->resource = is_array($resource) ? $resource : [$resource]; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param string $limitPath 父级溢出 |
| 67 | 67 | * @return string|null |
| 68 | 68 | */ |
| 69 | - public function getResourcePath(string $path, string $limitPath = null):?string |
|
| 69 | + public function getResourcePath(string $path, string $limitPath = null): ?string |
|
| 70 | 70 | { |
| 71 | 71 | foreach ($this->resource as $root) { |
| 72 | 72 | $target = $root.'/'.$path; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @param string $path |
| 85 | 85 | * @return string|null |
| 86 | 86 | */ |
| 87 | - public function getConfigResourcePath(string $path):?string |
|
| 87 | + public function getConfigResourcePath(string $path): ?string |
|
| 88 | 88 | { |
| 89 | 89 | foreach ($this->resource as $root) { |
| 90 | 90 | if ($target = PathResolver::resolve($root.'/'.$path)) { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @param string $name |
| 78 | 78 | * @return Module|null |
| 79 | 79 | */ |
| 80 | - public function find(string $name):?Module |
|
| 80 | + public function find(string $name): ?Module |
|
| 81 | 81 | { |
| 82 | 82 | return $this->module->get($name); |
| 83 | 83 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $this->modulePaths[] = Resource::getPathByRelativePath($path, $this->path); |
| 112 | 112 | } |
| 113 | 113 | } else { |
| 114 | - $this->modulePaths = [ Resource::getPathByRelativePath('modules', $this->path) ]; |
|
| 114 | + $this->modulePaths = [Resource::getPathByRelativePath('modules', $this->path)]; |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | protected function className(string $name) |
| 136 | 136 | { |
| 137 | - return str_replace(['.','/'], '\\', $name); |
|
| 137 | + return str_replace(['.', '/'], '\\', $name); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @param array|Config $extra |
| 112 | 112 | * @return array|null |
| 113 | 113 | */ |
| 114 | - public static function loadConfig(string $path, $extra = []):?array |
|
| 114 | + public static function loadConfig(string $path, $extra = []): ?array |
|
| 115 | 115 | { |
| 116 | 116 | if (!file_exists($path)) { |
| 117 | 117 | $path = PathResolver::resolve($path); |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | if ($path) { |
| 123 | 123 | $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION)); |
| 124 | - if (in_array($ext, ['yaml','yml','json','php','ini'])) { |
|
| 124 | + if (in_array($ext, ['yaml', 'yml', 'json', 'php', 'ini'])) { |
|
| 125 | 125 | return ContentLoader::{'load'.ucfirst($ext)}($path, $extra); |
| 126 | 126 | } |
| 127 | 127 | return ContentLoader::loadJson($path, $extra); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | public function __construct(array $methods, string $uri, array $attribute = []) |
| 45 | 45 | { |
| 46 | - array_walk($methods, function ($value) { |
|
| 46 | + array_walk($methods, function($value) { |
|
| 47 | 47 | return strtoupper($value); |
| 48 | 48 | }); |
| 49 | 49 | $this->methods = $methods; |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * @param Request $request |
| 160 | 160 | * @return array|null |
| 161 | 161 | */ |
| 162 | - public function match(Request $request):?array |
|
| 162 | + public function match(Request $request): ?array |
|
| 163 | 163 | { |
| 164 | 164 | if (count($this->methods) > 0 && !in_array($request->getMethod(), $this->methods)) { |
| 165 | 165 | return null; |