@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * |
28 | 28 | * @var array |
29 | 29 | */ |
30 | - protected static $headers =[ |
|
30 | + protected static $headers = [ |
|
31 | 31 | 'content-type' => ContentTypeItem::class, |
32 | 32 | ]; |
33 | 33 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | if ($value instanceof HeaderItem) { |
70 | 70 | $header = $value; |
71 | 71 | } elseif (array_key_exists($name, static::$headers)) { |
72 | - $class =static::$headers[$name]; |
|
72 | + $class = static::$headers[$name]; |
|
73 | 73 | $header = new $class($name, $value); |
74 | 74 | } else { |
75 | 75 | $header = new HeaderItem($name, $value); |
@@ -85,7 +85,7 @@ |
||
85 | 85 | if (is_null($this->pdo)) { |
86 | 86 | try { |
87 | 87 | $this->pdo = new PDO($this->getDsn(), $this->config['database-user'], $this->config['database-password']); |
88 | - static::$connetionCount ++; |
|
88 | + static::$connetionCount++; |
|
89 | 89 | } catch (PDOException $e) { |
90 | 90 | throw new ConnectionException($e->getMessage(), $e->getCode()); |
91 | 91 | } |
@@ -9,9 +9,9 @@ discard block |
||
9 | 9 | */ |
10 | 10 | class Config extends ConfigLoader |
11 | 11 | { |
12 | - public $config=[]; |
|
12 | + public $config = []; |
|
13 | 13 | |
14 | - public function load(string $path, array $extra =[]) |
|
14 | + public function load(string $path, array $extra = []) |
|
15 | 15 | { |
16 | 16 | $data = $this->loadConfig($path, $extra); |
17 | 17 | if ($data) { |
@@ -26,10 +26,10 @@ discard block |
||
26 | 26 | |
27 | 27 | public function assign(array $config) |
28 | 28 | { |
29 | - return $this->config=array_merge($this->config, $config); |
|
29 | + return $this->config = array_merge($this->config, $config); |
|
30 | 30 | } |
31 | 31 | |
32 | - public function get(string $name=null, $default=null) |
|
32 | + public function get(string $name = null, $default = null) |
|
33 | 33 | { |
34 | 34 | if (is_null($name)) { |
35 | 35 | return $this->config; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | return ArrayDotAccess::get($this->config, $name, $default); |
38 | 38 | } |
39 | 39 | |
40 | - public function set(string $name, $value, $combine=null) |
|
40 | + public function set(string $name, $value, $combine = null) |
|
41 | 41 | { |
42 | 42 | return ArrayDotAccess::set($this->config, $name, $value, $combine); |
43 | 43 | } |
@@ -47,17 +47,17 @@ discard block |
||
47 | 47 | return ArrayDotAccess::exist($this->config, $name); |
48 | 48 | } |
49 | 49 | |
50 | - public function parseValue(string $content, array $extra =[]):string |
|
50 | + public function parseValue(string $content, array $extra = []):string |
|
51 | 51 | { |
52 | - return preg_replace_callback('/\$\{(.+?)\}/', function ($matchs) use ($extra) { |
|
52 | + return preg_replace_callback('/\$\{(.+?)\}/', function($matchs) use ($extra) { |
|
53 | 53 | $name = $matchs[1]; |
54 | - if (($value = ArrayDotAccess::get($extra, $name, null))!==null) { |
|
54 | + if (($value = ArrayDotAccess::get($extra, $name, null)) !== null) { |
|
55 | 55 | } elseif (defined($name)) { |
56 | 56 | $value = constant($name); |
57 | 57 | } else { |
58 | 58 | $value = $this->get($name, $matchs[0]); |
59 | 59 | } |
60 | - return is_string($value)?trim(json_encode($value), '"'):$value; |
|
60 | + return is_string($value) ?trim(json_encode($value), '"') : $value; |
|
61 | 61 | }, $content); |
62 | 62 | } |
63 | 63 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @param mixed $default |
67 | 67 | * @return mixed |
68 | 68 | */ |
69 | - public function getHeader(string $name, $default =null) |
|
69 | + public function getHeader(string $name, $default = null) |
|
70 | 70 | { |
71 | 71 | if (array_key_exists(strtolower($name), $this->headers)) { |
72 | 72 | return $this->headers[$name]; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function ip() |
94 | 94 | { |
95 | - static $ipFrom = ['HTTP_CLIENT_IP','HTTP_X_FORWARDED_FOR','HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP','HTTP_FORWARDED_FOR','HTTP_FORWARDED','REMOTE_ADDR']; |
|
95 | + static $ipFrom = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP', 'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR']; |
|
96 | 96 | foreach ($ipFrom as $key) { |
97 | 97 | if (array_key_exists($key, $_SERVER)) { |
98 | 98 | foreach (explode(',', $_SERVER[$key]) as $ip) { |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | } |
122 | 122 | $method = strtoupper($server['REQUEST_METHOD'] ?? 'GET'); |
123 | 123 | $uri = $server['REQUEST_URI']??'/'; |
124 | - $headers = HeaderItem::buildFromServer($server ?: $_SERVER); |
|
125 | - $request = new Request($method, $uri, $headers); |
|
124 | + $headers = HeaderItem::buildFromServer($server ?: $_SERVER); |
|
125 | + $request = new Request($method, $uri, $headers); |
|
126 | 126 | $request->setDocumentRoot($server['DOCUMENT_ROOT']); |
127 | 127 | if ($simulate && $server !== null) { |
128 | 128 | $request->setServer($server); |
@@ -14,12 +14,12 @@ |
||
14 | 14 | * @param string $path 目标路径 |
15 | 15 | * @return string|null 返回格式化结果,如果路径不存在则返回NULL |
16 | 16 | */ |
17 | - public static function format(string $path):?string |
|
17 | + public static function format(string $path): ?string |
|
18 | 18 | { |
19 | - return static::existCharset($path, ['GBK','GB2312','BIG5']); |
|
19 | + return static::existCharset($path, ['GBK', 'GB2312', 'BIG5']); |
|
20 | 20 | } |
21 | 21 | |
22 | - public static function existCharset(string $path, array $charset):?string |
|
22 | + public static function existCharset(string $path, array $charset): ?string |
|
23 | 23 | { |
24 | 24 | $abspath = static::toAbsolutePath($path); |
25 | 25 | if (static::existCase($abspath)) { |
@@ -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 | } |
@@ -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; |
@@ -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 | } |
@@ -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 | } |