@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | protected function loadRouteGroup(string $groupName) |
| 205 | 205 | { |
| 206 | - $group = $groupName === 'default' ? '': '-'. $groupName; |
|
| 206 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
| 207 | 207 | if ($path = $this->module->getResource()->getConfigResourcePath('config/route'.$group)) { |
| 208 | 208 | $routeConfig = Config::loadConfig($path, [ |
| 209 | 209 | 'module' => $this->module->getName(), |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | */ |
| 230 | 230 | protected function loadRouteConfig(string $prefix, string $groupName, array $routeConfig) |
| 231 | 231 | { |
| 232 | - $module = $this->module->getFullName(); |
|
| 232 | + $module = $this->module->getFullName(); |
|
| 233 | 233 | foreach ($routeConfig as $name => $config) { |
| 234 | 234 | $exname = $this->application->getRouteName($name, $module, $groupName); |
| 235 | 235 | $method = $config['method'] ?? []; |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | if ($anti) { |
| 244 | 244 | $uri = '/'.trim($uri, '/'); |
| 245 | 245 | } else { |
| 246 | - $uri = '/'.trim($prefix . $uri, '/'); |
|
| 246 | + $uri = '/'.trim($prefix.$uri, '/'); |
|
| 247 | 247 | } |
| 248 | 248 | $this->application->request($method, $exname, $uri, $attributes); |
| 249 | 249 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function getFullName(): string |
| 111 | 111 | { |
| 112 | - return $this->getName() . ':' . $this->getVersion(); |
|
| 112 | + return $this->getName().':'.$this->getVersion(); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public function getUriSafeName(): string |
| 121 | 121 | { |
| 122 | - return $this->getName() . '/' . $this->getVersion(); |
|
| 122 | + return $this->getName().'/'.$this->getVersion(); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
@@ -14,10 +14,10 @@ |
||
| 14 | 14 | public function __construct(Throwable $exception) |
| 15 | 15 | { |
| 16 | 16 | parent::__construct('', []); |
| 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(), |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | public function getSourcePath(): ?string |
| 25 | 25 | { |
| 26 | 26 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
| 27 | - return $this->getResource($this->module)->getResourcePath($this->getTemplatePath() . '/' . $this->name . $subfix); |
|
| 27 | + return $this->getResource($this->module)->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function getPath() |
| 36 | 36 | { |
| 37 | - $output = $this->config['output'] ?? $this->application->getDataPath() . '/template/' . $this->uriName; |
|
| 37 | + $output = $this->config['output'] ?? $this->application->getDataPath().'/template/'.$this->uriName; |
|
| 38 | 38 | FileSystem::make($output); |
| 39 | - return $output . '/' . $this->name . '.php'; |
|
| 39 | + return $output.'/'.$this->name.'.php'; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -56,18 +56,18 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | public function getRenderedString() |
| 58 | 58 | { |
| 59 | - $this->application->debug()->time('render ' . $this->name); |
|
| 59 | + $this->application->debug()->time('render '.$this->name); |
|
| 60 | 60 | $code = parent::getRenderedString(); |
| 61 | - $this->application->debug()->timeEnd('render ' . $this->name); |
|
| 61 | + $this->application->debug()->timeEnd('render '.$this->name); |
|
| 62 | 62 | return $code; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | protected function compile() |
| 66 | 66 | { |
| 67 | 67 | if ($this->isCompiled() === false) { |
| 68 | - $this->application->debug()->time('compile ' . $this->name); |
|
| 68 | + $this->application->debug()->time('compile '.$this->name); |
|
| 69 | 69 | $result = parent::compile(); |
| 70 | - $this->application->debug()->timeEnd('compile ' . $this->name); |
|
| 70 | + $this->application->debug()->timeEnd('compile '.$this->name); |
|
| 71 | 71 | return $result; |
| 72 | 72 | } |
| 73 | 73 | return true; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
| 107 | 107 | } elseif (is_string($defaultName)) { |
| 108 | - $parameter = is_array($name)?array_merge($query, $name):$query; |
|
| 108 | + $parameter = is_array($name) ?array_merge($query, $name) : $query; |
|
| 109 | 109 | return $this->application->getUrl( |
| 110 | 110 | $this->request, |
| 111 | 111 | $defaultName, |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $this->group |
| 116 | 116 | ); |
| 117 | 117 | } |
| 118 | - return '#' . $defaultName; |
|
| 118 | + return '#'.$defaultName; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | class ContentWrapper |
| 23 | 23 | { |
| 24 | 24 | protected $types = [ |
| 25 | - [ JsonContentWrapper::class , ['array', JsonSerializable::class],], |
|
| 26 | - [ HtmlContentWrapper::class , ['boolean', 'integer','double', 'string'],], |
|
| 27 | - [ NullContentWrapper::class , ['NULL'],], |
|
| 28 | - [ FileContentWrapper::class , [SplFileObject::class],], |
|
| 25 | + [JsonContentWrapper::class, ['array', JsonSerializable::class], ], |
|
| 26 | + [HtmlContentWrapper::class, ['boolean', 'integer', 'double', 'string'], ], |
|
| 27 | + [NullContentWrapper::class, ['NULL'], ], |
|
| 28 | + [FileContentWrapper::class, [SplFileObject::class], ], |
|
| 29 | 29 | ]; |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | public static function isTypeOf($data, string $type) : bool |
| 51 | 51 | { |
| 52 | 52 | if (is_object($data) |
| 53 | - && !in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string','array','NULL'])) { |
|
| 53 | + && !in_array($type, ['boolean', 'bool', 'integer', 'int', 'float', 'double', 'string', 'array', 'NULL'])) { |
|
| 54 | 54 | try { |
| 55 | 55 | $class = new ReflectionClass($data); |
| 56 | 56 | $typeRef = new ReflectionClass($type); |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | return ob_get_clean(); |
| 99 | 99 | } |
| 100 | 100 | throw new NoTemplateFoundException( |
| 101 | - 'missing dest at ' . $this->getPath(), |
|
| 101 | + 'missing dest at '.$this->getPath(), |
|
| 102 | 102 | E_USER_ERROR, |
| 103 | 103 | $this->getPath(), |
| 104 | 104 | 1 |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function register() |
| 39 | 39 | { |
| 40 | - set_exception_handler([$this,'uncaughtException']); |
|
| 40 | + set_exception_handler([$this, 'uncaughtException']); |
|
| 41 | 41 | return $this; |
| 42 | 42 | } |
| 43 | 43 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | // 添加 * ? 匹配 |
| 37 | 37 | $url = str_replace(['\*', '\?'], ['[^/]*?', '[^/]'], $url); |
| 38 | 38 | // 编译页面参数 |
| 39 | - $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function ($match) use (&$parameters) { |
|
| 39 | + $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function($match) use (&$parameters) { |
|
| 40 | 40 | $name = $match[1]; |
| 41 | 41 | $type = 'string'; |
| 42 | 42 | $extra = ''; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $url = static::parseIgnorableParameter($url, $matcher, $parameter, $mapper); |
| 71 | 71 | $url = static::replaceParameter($url, $matcher, $parameter, $mapper); |
| 72 | 72 | if (count($query) && $allowQuery) { |
| 73 | - return $url . '?' . http_build_query($query, 'v', '&', PHP_QUERY_RFC3986); |
|
| 73 | + return $url.'?'.http_build_query($query, 'v', '&', PHP_QUERY_RFC3986); |
|
| 74 | 74 | } |
| 75 | 75 | return $url; |
| 76 | 76 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | array $parameter, |
| 89 | 89 | array $mapper |
| 90 | 90 | ): string { |
| 91 | - return preg_replace_callback('/\[(.+?)\]/', function ($match) use ($matcher, $parameter, $mapper) { |
|
| 91 | + return preg_replace_callback('/\[(.+?)\]/', function($match) use ($matcher, $parameter, $mapper) { |
|
| 92 | 92 | if (preg_match('/\{(\w+).+?\}/', $match[1])) { |
| 93 | 93 | $count = 0; |
| 94 | 94 | $subUrl = static::replaceParameter($match[1], $matcher, $parameter, $mapper, true, $count); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | foreach ($parameter as $key => $value) { |
| 108 | 108 | if (is_numeric($key)) { |
| 109 | 109 | $mp = $matcher->getParameterByIndex($key); |
| 110 | - if ($mp !== null) { |
|
| 110 | + if ($mp !== null) { |
|
| 111 | 111 | unset($parameter[$key]); |
| 112 | 112 | $key = $mp->getIndexName(); |
| 113 | 113 | $parameter[$key] = $value; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | ) { |
| 144 | 144 | return preg_replace_callback( |
| 145 | 145 | '/\{(\w+).+?\}/', |
| 146 | - function ($match) use ($matcher, $parameter, $mapper, $ignore, &$count) { |
|
| 146 | + function($match) use ($matcher, $parameter, $mapper, $ignore, &$count) { |
|
| 147 | 147 | if (array_key_exists($match[1], $mapper)) { |
| 148 | 148 | $count++; |
| 149 | 149 | return $mapper[$match[1]]->packValue($parameter[$match[1]]); |
@@ -62,12 +62,12 @@ discard block |
||
| 62 | 62 | $methodStart = $splitLength ?: strpos($command, '::') ?: $dynmicsMethod; |
| 63 | 63 | $parameter = self::buildParameter($parameter); |
| 64 | 64 | if ($methodStart > 0) { |
| 65 | - $splitLength = $splitLength > 0 ? 1:2; |
|
| 65 | + $splitLength = $splitLength > 0 ? 1 : 2; |
|
| 66 | 66 | $methodName = substr($command, $methodStart + $splitLength); |
| 67 | 67 | $command = substr($command, 0, $methodStart); |
| 68 | 68 | list($className, $constructParameter) = self::splitParameter($command); |
| 69 | 69 | $constructParameter = self::buildParameter($constructParameter); |
| 70 | - $target = new MethodTarget($className, $dynmicsMethod? $constructParameter :null, $methodName, $parameter); |
|
| 70 | + $target = new MethodTarget($className, $dynmicsMethod ? $constructParameter : null, $methodName, $parameter); |
|
| 71 | 71 | } else { |
| 72 | 72 | $target = new FunctionTarget(self::buildName($command), $parameter); |
| 73 | 73 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | if (preg_match('/^[\w\\\\\/.]+$/', $name) !== 1) { |
| 100 | 100 | throw new InvalidNameException(sprintf('invalid name: %s ', $name)); |
| 101 | 101 | } |
| 102 | - return str_replace(['.','/'], '\\', $name); |
|
| 102 | + return str_replace(['.', '/'], '\\', $name); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | private static function splitParameter(string $command):array |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $parameter = substr($command, $paramStart + 1, strlen($command) - $paramStart - 2); |
| 111 | 111 | $command = substr($command, 0, $paramStart); |
| 112 | 112 | } |
| 113 | - return [$command,$parameter]; |
|
| 113 | + return [$command, $parameter]; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | private static function buildParameter(?string $parameter) |