@@ -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 | } |
@@ -23,10 +23,10 @@ discard block |
||
| 23 | 23 | protected function analyse(array $context) |
| 24 | 24 | { |
| 25 | 25 | $replace = []; |
| 26 | - $attach = [] ; |
|
| 26 | + $attach = []; |
|
| 27 | 27 | foreach ($context as $key => $val) { |
| 28 | 28 | if ($this->isReplacedObj($val)) { |
| 29 | - $replace['{' . $key . '}'] = $val; |
|
| 29 | + $replace['{'.$key.'}'] = $val; |
|
| 30 | 30 | } else { |
| 31 | 31 | $attach[$key] = $val; |
| 32 | 32 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | protected function isReplacedObj($val) : bool |
| 38 | 38 | { |
| 39 | - return !is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && ! $val instanceof Throwable; |
|
| 39 | + return !is_array($val) && (!is_object($val) || method_exists($val, '__toString')) && !$val instanceof Throwable; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function interpolate(string $message, array $context, array $attribute) |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | list($attach, $replace) = $this->analyse($context); |
| 45 | 45 | $attribute = array_merge($this->attribute, $attribute); |
| 46 | 46 | foreach ($attribute as $key => $val) { |
| 47 | - $replace['%' . $key . '%'] = $val; |
|
| 47 | + $replace['%'.$key.'%'] = $val; |
|
| 48 | 48 | } |
| 49 | 49 | $message = strtr($message, $replace); |
| 50 | 50 | $attachInfo = ''; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | class Debug implements LoggerInterface, LoggerAwareInterface, DumpInterface, AttachInterface, ConfigInterface |
| 20 | 20 | { |
| 21 | - use LoggerTrait,LoggerAwareTrait,DumpTrait,AttachTrait,ConfigTrait; |
|
| 21 | + use LoggerTrait, LoggerAwareTrait, DumpTrait, AttachTrait, ConfigTrait; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * 忽略堆栈 |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $replace = []; |
| 71 | 71 | foreach ($context as $key => $val) { |
| 72 | - $replace['{' . $key . '}'] = $val; |
|
| 72 | + $replace['{'.$key.'}'] = $val; |
|
| 73 | 73 | } |
| 74 | 74 | return strtr($message, $replace); |
| 75 | 75 | } |
@@ -85,26 +85,26 @@ discard block |
||
| 85 | 85 | return $attribute; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public static function formatBytes(int $bytes, int $precision=0) |
|
| 88 | + public static function formatBytes(int $bytes, int $precision = 0) |
|
| 89 | 89 | { |
| 90 | - $human= ['B', 'KB', 'MB', 'GB', 'TB']; |
|
| 90 | + $human = ['B', 'KB', 'MB', 'GB', 'TB']; |
|
| 91 | 91 | $bytes = max($bytes, 0); |
| 92 | - $pow = floor(($bytes?log($bytes):0)/log(1024)); |
|
| 93 | - $pos = min($pow, count($human)-1); |
|
| 94 | - $bytes /= (1 << (10* $pos)); |
|
| 92 | + $pow = floor(($bytes ?log($bytes) : 0) / log(1024)); |
|
| 93 | + $pos = min($pow, count($human) - 1); |
|
| 94 | + $bytes /= (1 << (10 * $pos)); |
|
| 95 | 95 | return round($bytes, $precision).' '.$human[$pos]; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - public function time(string $name, string $type= LogLevel::INFO) |
|
| 98 | + public function time(string $name, string $type = LogLevel::INFO) |
|
| 99 | 99 | { |
| 100 | - $this->timeRecord[$name]=['time'=>microtime(true),'level'=>$type]; |
|
| 100 | + $this->timeRecord[$name] = ['time'=>microtime(true), 'level'=>$type]; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | public function timeEnd(string $name) |
| 104 | 104 | { |
| 105 | 105 | if (array_key_exists($name, $this->timeRecord)) { |
| 106 | - $pass=microtime(true)-$this->timeRecord[$name]['time']; |
|
| 107 | - $this->log($this->timeRecord[$name]['level'], 'process '. $name.' cost '. number_format($pass, 5).'s'); |
|
| 106 | + $pass = microtime(true) - $this->timeRecord[$name]['time']; |
|
| 107 | + $this->log($this->timeRecord[$name]['level'], 'process '.$name.' cost '.number_format($pass, 5).'s'); |
|
| 108 | 108 | return $pass; |
| 109 | 109 | } |
| 110 | 110 | return 0; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | throw new FileLoggerException(__CLASS__.':'.sprintf('cannot create log file')); |
| 84 | 84 | } |
| 85 | 85 | $this->latest = $this->getConfig('save-path').'/'.$this->getConfig('file-name'); |
| 86 | - register_shutdown_function([$this,'save']); |
|
| 86 | + register_shutdown_function([$this, 'save']); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | public function getDefaultConfig():array |
@@ -102,10 +102,10 @@ discard block |
||
| 102 | 102 | protected function packLogFile() |
| 103 | 103 | { |
| 104 | 104 | $logFile = $this->latest; |
| 105 | - $path = preg_replace('/[\\\\]+/', '/', $this->getConfig('save-zip-path') .'/'.date('Y-m-d').'.zip'); |
|
| 105 | + $path = preg_replace('/[\\\\]+/', '/', $this->getConfig('save-zip-path').'/'.date('Y-m-d').'.zip'); |
|
| 106 | 106 | $zip = $this->getZipArchive($path); |
| 107 | 107 | if ($zip !== null) { |
| 108 | - if ($zip->addFile($logFile, date('Y-m-d'). '-'. $zip->numFiles .'.log')) { |
|
| 108 | + if ($zip->addFile($logFile, date('Y-m-d').'-'.$zip->numFiles.'.log')) { |
|
| 109 | 109 | array_push($this->removeFiles, $logFile); |
| 110 | 110 | } |
| 111 | 111 | if (is_dir($this->getConfig('save-pack-path'))) { |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $zip->close(); |
| 120 | 120 | } else { |
| 121 | 121 | if (is_file($logFile) && file_exists($logFile)) { |
| 122 | - rename($logFile, $this->getConfig('save-path') . '/' . date('Y-m-d'). '-'. substr(md5_file($logFile), 0, 8).'.log'); |
|
| 122 | + rename($logFile, $this->getConfig('save-path').'/'.date('Y-m-d').'-'.substr(md5_file($logFile), 0, 8).'.log'); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | } elseif (null === $val) { |
| 218 | 218 | $val = 'null'; |
| 219 | 219 | } |
| 220 | - $replace['{' . $key . '}'] = $val; |
|
| 220 | + $replace['{'.$key.'}'] = $val; |
|
| 221 | 221 | } |
| 222 | 222 | return strtr($message, $replace); |
| 223 | 223 | } |
@@ -11,21 +11,21 @@ discard block |
||
| 11 | 11 | * @param string $path |
| 12 | 12 | * @return string|null |
| 13 | 13 | */ |
| 14 | - public static function resolve(string $path):?string |
|
| 14 | + public static function resolve(string $path): ?string |
|
| 15 | 15 | { |
| 16 | 16 | if (file_exists($path)) { |
| 17 | 17 | return $path; |
| 18 | 18 | } |
| 19 | 19 | $basepath = dirname($path).'/'.pathinfo($path, PATHINFO_FILENAME); |
| 20 | 20 | |
| 21 | - return static::resolveYaml($basepath) ?? static::resolveExtensions($basepath, ['json','php','ini']); |
|
| 21 | + return static::resolveYaml($basepath) ?? static::resolveExtensions($basepath, ['json', 'php', 'ini']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * @param string $basepath |
| 26 | 26 | * @return string|null |
| 27 | 27 | */ |
| 28 | - protected static function resolveYaml(string $basepath):?string |
|
| 28 | + protected static function resolveYaml(string $basepath): ?string |
|
| 29 | 29 | { |
| 30 | 30 | if (file_exists($conf = $basepath.'.yml') || file_exists($conf = $basepath.'.yaml')) { |
| 31 | 31 | if (function_exists('yaml_parse') || class_exists('Spyc')) { |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | return null; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - protected static function resolveExtensions(string $basepath, array $extensions):?string |
|
| 38 | + protected static function resolveExtensions(string $basepath, array $extensions): ?string |
|
| 39 | 39 | { |
| 40 | 40 | foreach ($extensions as $ext) { |
| 41 | 41 | if (file_exists($conf = $basepath.'.'.$ext)) { |
@@ -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 | } |