@@ -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; |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | * @param boolean $ignoreCase |
| 47 | 47 | * @return array|null |
| 48 | 48 | */ |
| 49 | - public function match(string $url, bool $ignoreCase = true):?array |
|
| 49 | + public function match(string $url, bool $ignoreCase = true): ?array |
|
| 50 | 50 | { |
| 51 | - $match = '#^'. $this->match.'$#'. ($ignoreCase?'i':''); |
|
| 51 | + $match = '#^'.$this->match.'$#'.($ignoreCase ? 'i' : ''); |
|
| 52 | 52 | $parameter = []; |
| 53 | 53 | if (preg_match($match, $url, $parameter, PREG_UNMATCHED_AS_NULL) > 0) { |
| 54 | 54 | return array_slice($parameter, 1); |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | return $parameters; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - public function getParameter(string $name):?Parameter |
|
| 82 | + public function getParameter(string $name): ?Parameter |
|
| 83 | 83 | { |
| 84 | 84 | foreach ($this->parameter as $parameter) { |
| 85 | 85 | if ($parameter->getIndexName() === $name) { |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @param integer $index |
| 130 | 130 | * @return Parameter|null |
| 131 | 131 | */ |
| 132 | - public function getParameterByIndex(int $index):?Parameter |
|
| 132 | + public function getParameterByIndex(int $index): ?Parameter |
|
| 133 | 133 | { |
| 134 | 134 | foreach ($this->parameter as $parameter) { |
| 135 | 135 | if ($parameter->getIndex() === $index) { |
@@ -11,13 +11,13 @@ |
||
| 11 | 11 | protected $ignorePath = [__FILE__]; |
| 12 | 12 | protected $backtrace; |
| 13 | 13 | |
| 14 | - public function __construct(array $backtrace, array $ignorePath =[]) |
|
| 14 | + public function __construct(array $backtrace, array $ignorePath = []) |
|
| 15 | 15 | { |
| 16 | 16 | $this->ignorePath = array_merge($this->ignorePath, $ignorePath); |
| 17 | 17 | $this->backtrace = $backtrace; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function getCallerTrace():?array |
|
| 20 | + public function getCallerTrace(): ?array |
|
| 21 | 21 | { |
| 22 | 22 | foreach ($this->backtrace as $trace) { |
| 23 | 23 | if (array_key_exists('file', $trace)) { |
@@ -67,11 +67,11 @@ discard block |
||
| 67 | 67 | protected static function valueToString(string $key, $value, int $deep):string |
| 68 | 68 | { |
| 69 | 69 | if (is_string($value) && strlen($value) > static::$dumpStringLength) { |
| 70 | - return $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE) .'... ,'; |
|
| 70 | + return $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE).'... ,'; |
|
| 71 | 71 | } elseif (is_bool($value)) { |
| 72 | 72 | return $key.'='.($value ? 'true' : 'false').' ,'; |
| 73 | 73 | } else { |
| 74 | - return $key.'='.self::parameterToString($value, $deep - 1) .' ,'; |
|
| 74 | + return $key.'='.self::parameterToString($value, $deep - 1).' ,'; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $argsDump = ''; |
| 120 | 120 | if (!empty($trace['args'])) { |
| 121 | 121 | foreach ($trace['args'] as $arg) { |
| 122 | - $argsDump .= self::parameterToString($arg) .','; |
|
| 122 | + $argsDump .= self::parameterToString($arg).','; |
|
| 123 | 123 | } |
| 124 | 124 | $argsDump = rtrim($argsDump, ','); |
| 125 | 125 | } |
@@ -129,8 +129,8 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | public static function dumpThrowable(Throwable $e) |
| 131 | 131 | { |
| 132 | - $dump = get_class($e).':'. $e->getMessage() .PHP_EOL; |
|
| 133 | - $dump .= 'At: ' . $e->getFile().':'.$e->getLine().PHP_EOL; |
|
| 132 | + $dump = get_class($e).':'.$e->getMessage().PHP_EOL; |
|
| 133 | + $dump .= 'At: '.$e->getFile().':'.$e->getLine().PHP_EOL; |
|
| 134 | 134 | $dump .= static::dumpTrace($e->getTrace()); |
| 135 | 135 | return $dump; |
| 136 | 136 | } |
@@ -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 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | parse_str($query, $this->query); |
| 39 | 39 | } |
| 40 | 40 | $url = parse_url($url, PHP_URL_PATH); |
| 41 | - $this->uri = '/' . trim($url, '\/'); |
|
| 41 | + $this->uri = '/'.trim($url, '\/'); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | public function getQuery():array |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | } |
| 59 | 59 | if (strpos($url, $indexFile) === 0) { |
| 60 | 60 | // for /index.php/ |
| 61 | - $url = substr($url, strlen($indexFile));// for /index.php?/ |
|
| 61 | + $url = substr($url, strlen($indexFile)); // for /index.php?/ |
|
| 62 | 62 | if (strpos($url, '?/') === 0) { |
| 63 | 63 | $url = ltrim($url, '?'); |
| 64 | 64 | } |
@@ -16,9 +16,9 @@ discard block |
||
| 16 | 16 | * @param string $path 目标路径 |
| 17 | 17 | * @return string|null 返回格式化结果,如果路径不存在则返回NULL |
| 18 | 18 | */ |
| 19 | - public static function format(string $path):?string |
|
| 19 | + public static function format(string $path): ?string |
|
| 20 | 20 | { |
| 21 | - return static::existCharset($path, ['GBK','GB2312','BIG5']); |
|
| 21 | + return static::existCharset($path, ['GBK', 'GB2312', 'BIG5']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * @param array $charset |
| 27 | 27 | * @return string|null |
| 28 | 28 | */ |
| 29 | - public static function existCharset(string $path, array $charset):?string |
|
| 29 | + public static function existCharset(string $path, array $charset): ?string |
|
| 30 | 30 | { |
| 31 | 31 | $abspath = static::toAbsolutePath($path); |
| 32 | 32 | if (static::existCase($abspath)) { |
@@ -23,5 +23,5 @@ |
||
| 23 | 23 | /** |
| 24 | 24 | * @return string|null |
| 25 | 25 | */ |
| 26 | - public static function getHomePath():?string; |
|
| 26 | + public static function getHomePath(): ?string; |
|
| 27 | 27 | } |