@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @return string|null |
| 31 | 31 | */ |
| 32 | - public function getSourcePath():?string |
|
| 32 | + public function getSourcePath(): ?string |
|
| 33 | 33 | { |
| 34 | 34 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
| 35 | 35 | return $this->getResource($this->module)->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function getPath() |
| 44 | 44 | { |
| 45 | - $output = $this->config['output'] ?? constant('SUDA_DATA').'/template/'. $this->uriName; |
|
| 45 | + $output = $this->config['output'] ?? constant('SUDA_DATA').'/template/'.$this->uriName; |
|
| 46 | 46 | FileSystem::make($output); |
| 47 | - return $output .'/'. $this->name.'.php'; |
|
| 47 | + return $output.'/'.$this->name.'.php'; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
| 74 | 74 | } elseif (is_array($name) && is_string($defaultName)) { |
| 75 | - return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name) , true, $this->module, $this->group); |
|
| 75 | + return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name), true, $this->module, $this->group); |
|
| 76 | 76 | } elseif (is_string($defaultName)) { |
| 77 | 77 | return $this->application->getUrl($this->request, $defaultName, $this->request->get() ?? [], true, $this->module, $this->group); |
| 78 | 78 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | if ($this->request->getAttribute('route') === $full) { |
| 92 | 92 | if (is_array($parameter)) { |
| 93 | 93 | foreach ($parameter as $key => $value) { |
| 94 | - if ($this->request->getQuery($key) != $value){ |
|
| 94 | + if ($this->request->getQuery($key) != $value) { |
|
| 95 | 95 | return false; |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -14,10 +14,10 @@ |
||
| 14 | 14 | { |
| 15 | 15 | public function __construct(Throwable $exception) |
| 16 | 16 | { |
| 17 | - $this->path = SUDA_RESOURCE. '/error.php'; |
|
| 17 | + $this->path = SUDA_RESOURCE.'/error.php'; |
|
| 18 | 18 | $type = get_class($exception); |
| 19 | 19 | $this->value = [ |
| 20 | - 'error_type' => $type , |
|
| 20 | + 'error_type' => $type, |
|
| 21 | 21 | 'error_sort_type' => strpos($type, '\\') === false ? $type : substr($type, strrpos($type, '\\') + 1), |
| 22 | 22 | 'error_code' => $exception->getCode(), |
| 23 | 23 | 'error_message' => $exception->getMessage(), |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function __construct($resource = []) |
| 28 | 28 | { |
| 29 | - $this->resource = is_array($resource)?$resource:[$resource]; |
|
| 29 | + $this->resource = is_array($resource) ? $resource : [$resource]; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param string $limitPath 父级溢出 |
| 67 | 67 | * @return string|null |
| 68 | 68 | */ |
| 69 | - public function getResourcePath(string $path, string $limitPath = null):?string |
|
| 69 | + public function getResourcePath(string $path, string $limitPath = null): ?string |
|
| 70 | 70 | { |
| 71 | 71 | foreach ($this->resource as $root) { |
| 72 | 72 | $target = $root.'/'.$path; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @param string $path |
| 85 | 85 | * @return string|null |
| 86 | 86 | */ |
| 87 | - public function getConfigResourcePath(string $path):?string |
|
| 87 | + public function getConfigResourcePath(string $path): ?string |
|
| 88 | 88 | { |
| 89 | 89 | foreach ($this->resource as $root) { |
| 90 | 90 | if ($target = PathResolver::resolve($root.'/'.$path)) { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @param string $name |
| 78 | 78 | * @return Module|null |
| 79 | 79 | */ |
| 80 | - public function find(string $name):?Module |
|
| 80 | + public function find(string $name): ?Module |
|
| 81 | 81 | { |
| 82 | 82 | return $this->module->get($name); |
| 83 | 83 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $this->modulePaths[] = Resource::getPathByRelativePath($path, $this->path); |
| 112 | 112 | } |
| 113 | 113 | } else { |
| 114 | - $this->modulePaths = [ Resource::getPathByRelativePath('modules', $this->path) ]; |
|
| 114 | + $this->modulePaths = [Resource::getPathByRelativePath('modules', $this->path)]; |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | protected function className(string $name) |
| 136 | 136 | { |
| 137 | - return str_replace(['.','/'], '\\', $name); |
|
| 137 | + return str_replace(['.', '/'], '\\', $name); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
@@ -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); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | public function __construct(array $methods, string $uri, array $attribute = []) |
| 45 | 45 | { |
| 46 | - array_walk($methods, function ($value) { |
|
| 46 | + array_walk($methods, function($value) { |
|
| 47 | 47 | return strtoupper($value); |
| 48 | 48 | }); |
| 49 | 49 | $this->methods = $methods; |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * @param Request $request |
| 160 | 160 | * @return array|null |
| 161 | 161 | */ |
| 162 | - public function match(Request $request):?array |
|
| 162 | + public function match(Request $request): ?array |
|
| 163 | 163 | { |
| 164 | 164 | if (count($this->methods) > 0 && !in_array($request->getMethod(), $this->methods)) { |
| 165 | 165 | return null; |
@@ -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 | } |