@@ -9,10 +9,10 @@ |
||
| 9 | 9 | class StringStream implements Stream |
| 10 | 10 | { |
| 11 | 11 | /** |
| 12 | - * 设置偏移 |
|
| 13 | - * |
|
| 14 | - * @var int |
|
| 15 | - */ |
|
| 12 | + * 设置偏移 |
|
| 13 | + * |
|
| 14 | + * @var int |
|
| 15 | + */ |
|
| 16 | 16 | protected $offset = 0; |
| 17 | 17 | |
| 18 | 18 | /** |
@@ -17,10 +17,10 @@ |
||
| 17 | 17 | class ContentWrapper |
| 18 | 18 | { |
| 19 | 19 | protected $types = [ |
| 20 | - [ JsonContentWrapper::class , ['array', JsonSerializable::class],], |
|
| 21 | - [ HtmlContentWrapper::class , ['boolean', 'integer','double', 'string'],], |
|
| 22 | - [ NullContentWrapper::class , ['NULL'],], |
|
| 23 | - [ FileContentWrapper::class , [SplFileObject::class],], |
|
| 20 | + [ JsonContentWrapper::class , ['array', JsonSerializable::class],], |
|
| 21 | + [ HtmlContentWrapper::class , ['boolean', 'integer','double', 'string'],], |
|
| 22 | + [ NullContentWrapper::class , ['NULL'],], |
|
| 23 | + [ FileContentWrapper::class , [SplFileObject::class],], |
|
| 24 | 24 | ]; |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | class ContentWrapper |
| 18 | 18 | { |
| 19 | 19 | protected $types = [ |
| 20 | - [ JsonContentWrapper::class , ['array', JsonSerializable::class],], |
|
| 21 | - [ HtmlContentWrapper::class , ['boolean', 'integer','double', 'string'],], |
|
| 22 | - [ NullContentWrapper::class , ['NULL'],], |
|
| 23 | - [ FileContentWrapper::class , [SplFileObject::class],], |
|
| 20 | + [JsonContentWrapper::class, ['array', JsonSerializable::class], ], |
|
| 21 | + [HtmlContentWrapper::class, ['boolean', 'integer', 'double', 'string'], ], |
|
| 22 | + [NullContentWrapper::class, ['NULL'], ], |
|
| 23 | + [FileContentWrapper::class, [SplFileObject::class], ], |
|
| 24 | 24 | ]; |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | public static function isTypeOf($data, string $type) : bool |
| 46 | 46 | { |
| 47 | 47 | if (is_object($data) |
| 48 | - && !in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string','array','NULL'])) { |
|
| 48 | + && !in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string', 'array', 'NULL'])) { |
|
| 49 | 49 | try { |
| 50 | 50 | $class = new ReflectionClass($data); |
| 51 | 51 | $typeRef = new ReflectionClass($type); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @param $content |
| 101 | 101 | * @return ContentWrapperInterface|null |
| 102 | 102 | */ |
| 103 | - private function matchWrapper($content):?ContentWrapperInterface |
|
| 103 | + private function matchWrapper($content): ?ContentWrapperInterface |
|
| 104 | 104 | { |
| 105 | 105 | foreach ($this->types as $typeConfig) { |
| 106 | 106 | list($wrapper, $types) = $typeConfig; |
@@ -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 | } |
@@ -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); |
@@ -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 | } |
@@ -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 | } |