@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | /** |
| 45 | 45 | * @return array|null |
| 46 | 46 | */ |
| 47 | - private function seekSourcePath():?array |
|
| 47 | + private function seekSourcePath(): ?array |
|
| 48 | 48 | { |
| 49 | 49 | $extArray = []; |
| 50 | 50 | if (array_key_exists('subfix', $this->config)) { |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | $extArray['.php'] = true; |
| 55 | 55 | $resource = $this->getResource($this->module); |
| 56 | 56 | foreach ($extArray as $ext => $isRaw) { |
| 57 | - $path = $resource->getResourcePath($this->getTemplatePath() . '/' . $this->name . $ext); |
|
| 57 | + $path = $resource->getResourcePath($this->getTemplatePath().'/'.$this->name.$ext); |
|
| 58 | 58 | if ($path !== null) { |
| 59 | - return [$path , $isRaw]; |
|
| 59 | + return [$path, $isRaw]; |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | return null; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function has(string $name): bool |
| 24 | 24 | { |
| 25 | - return method_exists($this, 'parse' . ucfirst($name)); |
|
| 25 | + return method_exists($this, 'parse'.ucfirst($name)); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | public function parse(string $name, string $content): string |
| 34 | 34 | { |
| 35 | 35 | if ($this->has($name)) { |
| 36 | - return $this->{'parse' . ucfirst($name)}($this->parseEchoValue($content)); |
|
| 36 | + return $this->{'parse'.ucfirst($name)}($this->parseEchoValue($content)); |
|
| 37 | 37 | } |
| 38 | 38 | return ''; |
| 39 | 39 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | { |
| 66 | 66 | preg_match('/\((.+)\)/', $exp, $v); |
| 67 | 67 | $name = trim(str_replace('\'', '-', trim($v[1], '"\''))); |
| 68 | - return '<?php $this->insert(\'' . $name . '\',function () { ?>'; |
|
| 68 | + return '<?php $this->insert(\''.$name.'\',function () { ?>'; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | protected function parseInclude($content) |
| 182 | 182 | { |
| 183 | - return '<?php $this->include' . $content . '; ?>'; |
|
| 183 | + return '<?php $this->include'.$content.'; ?>'; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | protected function parseExtend($content) |
| 191 | 191 | { |
| 192 | - return '<?php $this->extend' . $content . '; ?>'; |
|
| 192 | + return '<?php $this->extend'.$content.'; ?>'; |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | protected function parseStatic($content) |
| 200 | 200 | { |
| 201 | 201 | $content = strlen(trim($content)) === 0 ? '()' : $content; |
| 202 | - return '<?php echo $this->getStaticPrefix' . $content . '; ?>'; |
|
| 202 | + return '<?php echo $this->getStaticPrefix'.$content.'; ?>'; |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | /** |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param string $className |
| 42 | 42 | * @return string|null |
| 43 | 43 | */ |
| 44 | - public function getClassPath(string $className):?string |
|
| 44 | + public function getClassPath(string $className): ?string |
|
| 45 | 45 | { |
| 46 | 46 | // 搜索路径 |
| 47 | 47 | foreach ($this->includePath as $includeNamespace => $includePaths) { |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * @param string $filename |
| 59 | 59 | * @return string|null |
| 60 | 60 | */ |
| 61 | - public function import(string $filename):?string |
|
| 61 | + public function import(string $filename): ?string |
|
| 62 | 62 | { |
| 63 | 63 | if ($filename = static::realPath($filename)) { |
| 64 | 64 | static::requireOnce($filename); |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @param string $className |
| 102 | 102 | * @return string|null |
| 103 | 103 | */ |
| 104 | - protected function getClassPathByAlias(string $includePath, string $className):?string |
|
| 104 | + protected function getClassPathByAlias(string $includePath, string $className): ?string |
|
| 105 | 105 | { |
| 106 | 106 | $namepath = static::formatSeparator($className); |
| 107 | 107 | $className = static::realName($className); |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @param string $className |
| 127 | 127 | * @return string|null |
| 128 | 128 | */ |
| 129 | - protected function getClassPathByName(string $includeNamespace, string $includePath, string $className):?string |
|
| 129 | + protected function getClassPathByName(string $includeNamespace, string $includePath, string $className): ?string |
|
| 130 | 130 | { |
| 131 | 131 | if (is_numeric($includeNamespace)) { |
| 132 | 132 | $path = $includePath.DIRECTORY_SEPARATOR.static::formatSeparator($className).'.php'; |
@@ -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) && is_file($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') || class_exists('Symfony\Component\Yaml\Yaml')) { |
@@ -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 | $conf = $basepath.'.'.$ext; |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | |
| 66 | 66 | protected static function parseValue(string $content, array $extra = [], bool $raw = true): string |
| 67 | 67 | { |
| 68 | - return preg_replace_callback('/\$\{(.+?)\}/', function ($matchs) use ($extra, $raw) { |
|
| 68 | + return preg_replace_callback('/\$\{(.+?)\}/', function($matchs) use ($extra, $raw) { |
|
| 69 | 69 | $name = $matchs[1]; |
| 70 | 70 | if (($value = ArrayDotAccess::get($extra, $name, null)) !== null) { |
| 71 | 71 | } elseif (defined($name)) { |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | if (array_key_exists('server-port', $this->server)) { |
| 114 | 114 | return $this->server['server-port']; |
| 115 | 115 | } |
| 116 | - return $this->getSecure()?443:80; |
|
| 116 | + return $this->getSecure() ? 443 : 80; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | public static function createUriBase(RequestWrapper $request) |
| 159 | 159 | { |
| 160 | - $scheme = $request->isSecure()?'https':'http'; |
|
| 160 | + $scheme = $request->isSecure() ? 'https' : 'http'; |
|
| 161 | 161 | $port = $request->getPort(); |
| 162 | 162 | if ($port == 80 && $scheme == 'http') { |
| 163 | 163 | $port = ''; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | } else { |
| 167 | 167 | $port = ':'.$port; |
| 168 | 168 | } |
| 169 | - $base = $scheme.'://'. $request->getHost().$port; |
|
| 169 | + $base = $scheme.'://'.$request->getHost().$port; |
|
| 170 | 170 | return $base; |
| 171 | 171 | } |
| 172 | 172 | |
@@ -304,15 +304,15 @@ |
||
| 304 | 304 | if ($this->expire !== 0) { |
| 305 | 305 | $time = $this->fullTime ? $this->expire : time() + $this->expire; |
| 306 | 306 | $dateTime = DateTime::createFromFormat('U', $time, new DateTimeZone('GMT')); |
| 307 | - $cookie .= '; Expires=' . str_replace('+0000', '', $dateTime->format('D, d M Y H:i:s T')); |
|
| 307 | + $cookie .= '; Expires='.str_replace('+0000', '', $dateTime->format('D, d M Y H:i:s T')); |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | if ($this->domain !== null) { |
| 311 | - $cookie .= '; Domain=' . $this->domain; |
|
| 311 | + $cookie .= '; Domain='.$this->domain; |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | if ($this->path) { |
| 315 | - $cookie .= '; Path=' . $this->path; |
|
| 315 | + $cookie .= '; Path='.$this->path; |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | if ($this->secure) { |
@@ -164,7 +164,7 @@ |
||
| 164 | 164 | private function sendWarningIfy(string $name) |
| 165 | 165 | { |
| 166 | 166 | if ($this->isSend()) { |
| 167 | - trigger_error($name .': response has been send', E_USER_WARNING); |
|
| 167 | + trigger_error($name.': response has been send', E_USER_WARNING); |
|
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | public function status(int $statusCode) |
| 48 | 48 | { |
| 49 | 49 | $this->response->status($statusCode); |
| 50 | - $this->status = $statusCode; |
|
| 50 | + $this->status = $statusCode; |
|
| 51 | 51 | return $this; |
| 52 | 52 | } |
| 53 | 53 | |