@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | { |
18 | 18 | protected static $types = [ |
19 | 19 | JsonContent::class => ['array', JsonSerializable::class], |
20 | - HtmlContent::class => ['boolean', 'integer','double', 'string'], |
|
20 | + HtmlContent::class => ['boolean', 'integer', 'double', 'string'], |
|
21 | 21 | NullContent::class => ['NULL'], |
22 | 22 | FileContent::class => [SplFileInfo::class], |
23 | 23 | ]; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | public static function isTypeOf($data, $type) : bool |
46 | 46 | { |
47 | - if (is_object($data) && !\in_array($type, ['boolean', 'integer','double', 'string','array','NULL'])) { |
|
47 | + if (is_object($data) && !\in_array($type, ['boolean', 'integer', 'double', 'string', 'array', 'NULL'])) { |
|
48 | 48 | $class = new ReflectionClass($data); |
49 | 49 | $typeRef = new ReflectionClass($type); |
50 | 50 | if ($typeRef->isInterface()) { |
@@ -13,12 +13,12 @@ discard block |
||
13 | 13 | */ |
14 | 14 | protected static $mimes = [ |
15 | 15 | # Image Type |
16 | - 'jpe' => 'image/jpeg' , |
|
17 | - 'jpeg' => 'image/jpeg' , |
|
18 | - 'jpg' => 'image/jpeg' , |
|
19 | - 'svg' => 'image/svg+xml' , |
|
20 | - 'png' => 'image/png' , |
|
21 | - 'gif' => 'image/gif' , |
|
16 | + 'jpe' => 'image/jpeg', |
|
17 | + 'jpeg' => 'image/jpeg', |
|
18 | + 'jpg' => 'image/jpeg', |
|
19 | + 'svg' => 'image/svg+xml', |
|
20 | + 'png' => 'image/png', |
|
21 | + 'gif' => 'image/gif', |
|
22 | 22 | 'ico' => 'image/x-icon', |
23 | 23 | 'webp' => 'image/webp', |
24 | 24 | |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | 'js' => 'text/javascript', |
27 | 27 | 'css' => 'text/css', |
28 | 28 | 'txt' => 'text/plain', |
29 | - 'html' => 'text/html' , |
|
30 | - 'csv' => 'text/csv' , |
|
29 | + 'html' => 'text/html', |
|
30 | + 'csv' => 'text/csv', |
|
31 | 31 | 'xml' => 'text/xml', |
32 | 32 | |
33 | 33 | # App type |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | # Archive |
41 | 41 | 'zip' => 'application/zip', |
42 | - 'gtar' => 'application/x-gtar' , |
|
43 | - 'gz' => 'application/x-gzip' , |
|
42 | + 'gtar' => 'application/x-gtar', |
|
43 | + 'gz' => 'application/x-gzip', |
|
44 | 44 | '7z' => 'application/x-7z-compressed', |
45 | 45 | 'rar' => 'application/x-rar-compressed', |
46 | 46 |
@@ -21,7 +21,7 @@ |
||
21 | 21 | { |
22 | 22 | if ($content->isFile()) { |
23 | 23 | $response->setType($content->getExtension()); |
24 | - $response->setHeader('Content-Disposition', 'attachment;filename="' . $content->getBasename().'"'); |
|
24 | + $response->setHeader('Content-Disposition', 'attachment;filename="'.$content->getBasename().'"'); |
|
25 | 25 | $response->setHeader('Cache-Control', 'max-age=0'); |
26 | 26 | $response->send(file_get_contents($content->getRealPath())); |
27 | 27 | } else { |
@@ -8,5 +8,5 @@ |
||
8 | 8 | */ |
9 | 9 | abstract class Response extends BaseResponse |
10 | 10 | { |
11 | - public abstract function onRequest(Request $request, Response $response); |
|
11 | + public abstract function onRequest(Request $request, Response $response); |
|
12 | 12 | } |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | * @param boolean $full |
95 | 95 | * @return \Iterator |
96 | 96 | */ |
97 | - public static function readFiles(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator |
|
97 | + public static function readFiles(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator |
|
98 | 98 | { |
99 | 99 | $parent = Path::format($path); |
100 | 100 | foreach (static::read($path, $recursive, $regex, false, $mode) as $subpath) { |
101 | - $path = $full?$subpath:$parent.DIRECTORY_SEPARATOR.$subpath; |
|
101 | + $path = $full ? $subpath : $parent.DIRECTORY_SEPARATOR.$subpath; |
|
102 | 102 | if (is_file($path)) { |
103 | 103 | yield $subpath; |
104 | 104 | } |
@@ -114,11 +114,11 @@ discard block |
||
114 | 114 | * @param boolean $full |
115 | 115 | * @return \Iterator |
116 | 116 | */ |
117 | - public static function readDirs(string $path, bool $recursive=false, ?string $regex=null, bool $full=false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator |
|
117 | + public static function readDirs(string $path, bool $recursive = false, ?string $regex = null, bool $full = false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator |
|
118 | 118 | { |
119 | 119 | $parent = Path::format($path); |
120 | 120 | foreach (static::read($path, $recursive, $regex, false, $mode) as $subpath) { |
121 | - $path = $full?$subpath:$parent.DIRECTORY_SEPARATOR.$subpath; |
|
121 | + $path = $full ? $subpath : $parent.DIRECTORY_SEPARATOR.$subpath; |
|
122 | 122 | if (is_dir($path)) { |
123 | 123 | yield $subpath; |
124 | 124 | } |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | * @param boolean $full |
135 | 135 | * @return \Iterator |
136 | 136 | */ |
137 | - public static function read(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator |
|
137 | + public static function read(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator |
|
138 | 138 | { |
139 | 139 | $directory = Path::format($path); |
140 | 140 | if ($directory && \is_dir($directory)) { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | |
152 | 152 | |
153 | - protected static function buildIterator(string $directory, bool $recursive=false, ?string $regex = null, int $mode): \Iterator |
|
153 | + protected static function buildIterator(string $directory, bool $recursive = false, ?string $regex = null, int $mode): \Iterator |
|
154 | 154 | { |
155 | 155 | $it = new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS); |
156 | 156 | if ($regex !== null) { |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public static function cut(string $path, string $basepath):string |
173 | 173 | { |
174 | - $path = PathTrait::toAbsolutePath($path); |
|
174 | + $path = PathTrait::toAbsolutePath($path); |
|
175 | 175 | $basepath = PathTrait::toAbsolutePath($basepath); |
176 | 176 | if (strpos($path, $basepath.DIRECTORY_SEPARATOR) === 0) { |
177 | 177 | return substr($path, \strlen($basepath) + 1); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | * @param boolean $move |
189 | 189 | * @return boolean |
190 | 190 | */ |
191 | - public static function copy(string $path, string $toPath, ?string $regex=null, bool $move = false):bool |
|
191 | + public static function copy(string $path, string $toPath, ?string $regex = null, bool $move = false):bool |
|
192 | 192 | { |
193 | 193 | $directory = Path::format($path); |
194 | 194 | static::makes($toPath); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * @param string|null $regex |
228 | 228 | * @return boolean |
229 | 229 | */ |
230 | - public static function move(string $path, string $toPath, ?string $regex=null):bool |
|
230 | + public static function move(string $path, string $toPath, ?string $regex = null):bool |
|
231 | 231 | { |
232 | 232 | return static::copy($path, $toPath, $regex, true); |
233 | 233 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public static function delete(string $filename):bool |
27 | 27 | { |
28 | - if (($path=Path::format($filename)) !== null) { |
|
28 | + if (($path = Path::format($filename)) !== null) { |
|
29 | 29 | if (!is_writable($path)) { |
30 | 30 | return false; |
31 | 31 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public static function move(string $src, string $dest):bool |
45 | 45 | { |
46 | - if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) { |
|
46 | + if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) { |
|
47 | 47 | return rename($path, $dest); |
48 | 48 | } |
49 | 49 | return false; |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public static function copy(string $src, string $dest):bool |
60 | 60 | { |
61 | - if (($path=Path::format($src)) !== null && is_writable(dirname($dest))) { |
|
61 | + if (($path = Path::format($src)) !== null && is_writable(dirname($dest))) { |
|
62 | 62 | return copy($path, $dest); |
63 | 63 | } |
64 | 64 | return false; |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | * @param string $name |
87 | 87 | * @return string|null |
88 | 88 | */ |
89 | - public static function get(string $filename):?string |
|
89 | + public static function get(string $filename): ?string |
|
90 | 90 | { |
91 | - if (is_readable($filename) && ($path=Path::format($filename)) !== null) { |
|
91 | + if (is_readable($filename) && ($path = Path::format($filename)) !== null) { |
|
92 | 92 | return file_get_contents($path); |
93 | 93 | } |
94 | 94 | return null; |
@@ -19,9 +19,9 @@ |
||
19 | 19 | } |
20 | 20 | |
21 | 21 | use FileHelper { |
22 | - delete as protected deleteFile; |
|
23 | - FileHelper::copy insteadof DirectoryHelper; |
|
24 | - FileHelper::move insteadof DirectoryHelper; |
|
22 | + delete as protected deleteFile; |
|
23 | + FileHelper::copy insteadof DirectoryHelper; |
|
24 | + FileHelper::move insteadof DirectoryHelper; |
|
25 | 25 | } |
26 | 26 | |
27 | 27 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | */ |
35 | 35 | public static function delete(string $path):bool |
36 | 36 | { |
37 | - if (($path=Path::format($path)) !== null) { |
|
37 | + if (($path = Path::format($path)) !== null) { |
|
38 | 38 | if (is_file($path)) { |
39 | 39 | return static::deleteFile($path); |
40 | 40 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param string $name |
57 | 57 | * @return string|null |
58 | 58 | */ |
59 | - public static function get(string $filename):?string; |
|
59 | + public static function get(string $filename): ?string; |
|
60 | 60 | |
61 | 61 | |
62 | 62 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @param boolean $full |
78 | 78 | * @return \Iterator |
79 | 79 | */ |
80 | - public static function readFiles(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator; |
|
80 | + public static function readFiles(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY) : \Iterator; |
|
81 | 81 | |
82 | 82 | /** |
83 | 83 | * 读目录下文件夹 |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @param boolean $full |
89 | 89 | * @return \Iterator |
90 | 90 | */ |
91 | - public static function readDirs(string $path, bool $recursive=false, ?string $regex=null, bool $full=false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator; |
|
91 | + public static function readDirs(string $path, bool $recursive = false, ?string $regex = null, bool $full = false, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator; |
|
92 | 92 | |
93 | 93 | /** |
94 | 94 | * 读目录,包括文件,文件夹 |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @param boolean $full |
100 | 100 | * @return \Iterator |
101 | 101 | */ |
102 | - public static function read(string $path, bool $recursive=false, ?string $regex=null, bool $full=true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator; |
|
102 | + public static function read(string $path, bool $recursive = false, ?string $regex = null, bool $full = true, int $mode = RecursiveIteratorIterator::LEAVES_ONLY): \Iterator; |
|
103 | 103 | |
104 | 104 | /** |
105 | 105 | * 截断部分目录 |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | * @param boolean $move |
120 | 120 | * @return boolean |
121 | 121 | */ |
122 | - public static function copyDir(string $path, string $toPath, ?string $regex=null, bool $move = false):bool; |
|
122 | + public static function copyDir(string $path, string $toPath, ?string $regex = null, bool $move = false):bool; |
|
123 | 123 | |
124 | 124 | /** |
125 | 125 | * 移动文件夹 |
@@ -129,5 +129,5 @@ discard block |
||
129 | 129 | * @param string|null $regex |
130 | 130 | * @return boolean |
131 | 131 | */ |
132 | - public static function moveDir(string $path, string $toPath, ?string $regex=null):bool; |
|
132 | + public static function moveDir(string $path, string $toPath, ?string $regex = null):bool; |
|
133 | 133 | } |
@@ -181,7 +181,7 @@ |
||
181 | 181 | $object = $class->getMethod('instance')->invoke(null); |
182 | 182 | $context->setResponse($object); |
183 | 183 | $class->getMethod('proccess')->invokeArgs($object, [ |
184 | - new Runnable([$object,'onRequest']), |
|
184 | + new Runnable([$object, 'onRequest']), |
|
185 | 185 | $this->getRequest($context), |
186 | 186 | $this->matcher->getAttribute('buffer', true), |
187 | 187 | $context->isDebug(), |