@@ -11,7 +11,7 @@ |
||
| 11 | 11 | public function __construct(DataSource $datasource) |
| 12 | 12 | { |
| 13 | 13 | parent::__construct('hello'); |
| 14 | - (new MySQLTableCreator($this->getSource()->write(),$this->getStruct()->getFields()))->create(); |
|
| 14 | + (new MySQLTableCreator($this->getSource()->write(), $this->getStruct()->getFields()))->create(); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function onCreateStruct(TableStruct $struct):TableStruct |
@@ -26,9 +26,9 @@ |
||
| 26 | 26 | $status = $result ? 'OK' : 'Err'; |
| 27 | 27 | if ($result) { |
| 28 | 28 | $effect = $statement->getStatement()->rowCount(); |
| 29 | - $this->debug->info('query ['.$status.'] '.$query.' '. number_format($timeSpend, 5).'s and effect '. $effect . ' rows'); |
|
| 29 | + $this->debug->info('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s and effect '.$effect.' rows'); |
|
| 30 | 30 | } else { |
| 31 | - $this->debug->error('query ['.$status.'] '.$query.' '. number_format($timeSpend, 5).'s'); |
|
| 31 | + $this->debug->error('query ['.$status.'] '.$query.' '.number_format($timeSpend, 5).'s'); |
|
| 32 | 32 | $this->debug->error('query ['.$status.'] '.\implode(':', $statement->getStatement()->errorInfo())); |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @param string $name |
| 83 | 83 | * @return \suda\application\Module|null |
| 84 | 84 | */ |
| 85 | - public function find(string $name):?Module |
|
| 85 | + public function find(string $name): ?Module |
|
| 86 | 86 | { |
| 87 | 87 | return $this->module->get($name); |
| 88 | 88 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $this->modulePaths[] = Resource::getPathByRelativedPath($path, $this->path); |
| 117 | 117 | } |
| 118 | 118 | } else { |
| 119 | - $this->modulePaths = [ Resource::getPathByRelativedPath('modules', $this->path) ]; |
|
| 119 | + $this->modulePaths = [Resource::getPathByRelativedPath('modules', $this->path)]; |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | protected function className(string $name) |
| 141 | 141 | { |
| 142 | - return str_replace(['.','/'], '\\', $name); |
|
| 142 | + return str_replace(['.', '/'], '\\', $name); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
@@ -28,9 +28,9 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function register() |
| 30 | 30 | { |
| 31 | - register_shutdown_function([$this,'uncaughtFatalError']); |
|
| 32 | - set_error_handler([$this,'uncaughtError']); |
|
| 33 | - set_exception_handler([$this,'uncaughtException']); |
|
| 31 | + register_shutdown_function([$this, 'uncaughtFatalError']); |
|
| 32 | + set_error_handler([$this, 'uncaughtError']); |
|
| 33 | + set_exception_handler([$this, 'uncaughtException']); |
|
| 34 | 34 | return $this; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | // 添加忽略 |
| 31 | 31 | $url = preg_replace('/(\[)([^\[\]]+)(?(1)\])/', '(?:$2)?', $url); |
| 32 | 32 | // 添加 * ? 匹配 |
| 33 | - $url = str_replace(['\*','\?'], ['[^/]*?','[^/]'], $url); |
|
| 33 | + $url = str_replace(['\*', '\?'], ['[^/]*?', '[^/]'], $url); |
|
| 34 | 34 | // 编译页面参数 |
| 35 | - $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function ($match) use (&$parameters) { |
|
| 35 | + $url = preg_replace_callback('/\{(\w+)(?:\:([^}]+?))?\}/', function($match) use (&$parameters) { |
|
| 36 | 36 | $name = $match[1]; |
| 37 | 37 | $type = 'string'; |
| 38 | 38 | $extra = ''; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | // 拆分参数 |
| 62 | 62 | list($mapper, $query, $parameter) = static::analyseParameter($matcher, $parameter); |
| 63 | 63 | // for * ? |
| 64 | - $url = \str_replace(['*','?'], ['','-'], $uri); |
|
| 64 | + $url = \str_replace(['*', '?'], ['', '-'], $uri); |
|
| 65 | 65 | // for ignore value |
| 66 | 66 | $url = static::parseIgnoreableParameter($url, $matcher, $parameter, $mapper); |
| 67 | 67 | $url = static::replaceParameter($url, $matcher, $parameter, $mapper); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | protected static function parseIgnoreableParameter(string $url, UriMatcher $matcher, array $parameter, array $mapper):string |
| 75 | 75 | { |
| 76 | - return preg_replace_callback('/\[(.+?)\]/', function ($match) use ($matcher, $parameter, $mapper) { |
|
| 76 | + return preg_replace_callback('/\[(.+?)\]/', function($match) use ($matcher, $parameter, $mapper) { |
|
| 77 | 77 | if (preg_match('/\{(\w+).+?\}/', $match[1])) { |
| 78 | 78 | $count = 0; |
| 79 | 79 | $subUrl = static::replaceParameter($match[1], $matcher, $parameter, $mapper, true, $count); |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | protected static function replaceParameter(string $input, UriMatcher $matcher, array $parameter, array $mapper, bool $ignore = false, ?int &$count = null) |
| 111 | 111 | { |
| 112 | - return preg_replace_callback('/\{(\w+).+?\}/', function ($match) use ($matcher, $parameter, $mapper, $ignore, &$count) { |
|
| 112 | + return preg_replace_callback('/\{(\w+).+?\}/', function($match) use ($matcher, $parameter, $mapper, $ignore, &$count) { |
|
| 113 | 113 | if (\array_key_exists($match[1], $mapper)) { |
| 114 | - $count ++; |
|
| 114 | + $count++; |
|
| 115 | 115 | return $mapper[$match[1]]->packValue($parameter[$match[1]]); |
| 116 | 116 | } |
| 117 | 117 | if ($default = $matcher->getParameter($match[1])) { |
| 118 | 118 | if ($default->hasDefault()) { |
| 119 | - $count ++; |
|
| 119 | + $count++; |
|
| 120 | 120 | return $default->getDefaultValue(); |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | |
| 25 | 25 | public function packValue(?string $matched) |
| 26 | 26 | { |
| 27 | - return $matched ? urlencode($matched): ''; |
|
| 27 | + return $matched ? urlencode($matched) : ''; |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | protected function loadRouteGroup(string $groupName) |
| 182 | 182 | { |
| 183 | - $group = $groupName === 'default' ? '': '-'. $groupName; |
|
| 183 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
| 184 | 184 | if ($path = $this->module->getResource()->getConfigResourcePath('config/route'.$group)) { |
| 185 | 185 | $routeConfig = Config::loadConfig($path, [ |
| 186 | 186 | 'module' => $this->module->getName(), |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | */ |
| 205 | 205 | protected function loadRouteConfig(string $prefix, string $groupName, array $routeConfig) |
| 206 | 206 | { |
| 207 | - $module = $this->module->getFullName(); |
|
| 207 | + $module = $this->module->getFullName(); |
|
| 208 | 208 | foreach ($routeConfig as $name => $config) { |
| 209 | 209 | $exname = $this->application->getRouteName($name, $module, $groupName); |
| 210 | 210 | $method = $config['method'] ?? []; |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | if ($anti) { |
| 219 | 219 | $uri = '/'.trim($uri, '/'); |
| 220 | 220 | } else { |
| 221 | - $uri = '/'.trim($prefix . $uri, '/'); |
|
| 221 | + $uri = '/'.trim($prefix.$uri, '/'); |
|
| 222 | 222 | } |
| 223 | 223 | $this->application->request($method, $exname, $uri, $attriute); |
| 224 | 224 | } |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | protected static function valueToString(string $key, $value, int $deep):string |
| 65 | 65 | { |
| 66 | 66 | if (is_string($value) && strlen($value) > static::$dumpStringLength) { |
| 67 | - return $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE) .'... ,'; |
|
| 67 | + return $key.'='.json_encode(substr($value, 0, static::$dumpStringLength), JSON_UNESCAPED_UNICODE).'... ,'; |
|
| 68 | 68 | } elseif (is_bool($value)) { |
| 69 | 69 | return $key.'='.($value ? 'true' : 'false').' ,'; |
| 70 | 70 | } else { |
| 71 | - return $key.'='.self::parameterToString($value, $deep - 1) .' ,'; |
|
| 71 | + return $key.'='.self::parameterToString($value, $deep - 1).' ,'; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $argsDump = ''; |
| 117 | 117 | if (!empty($trace['args'])) { |
| 118 | 118 | foreach ($trace['args'] as $arg) { |
| 119 | - $argsDump .= self::parameterToString($arg) .','; |
|
| 119 | + $argsDump .= self::parameterToString($arg).','; |
|
| 120 | 120 | } |
| 121 | 121 | $argsDump = rtrim($argsDump, ','); |
| 122 | 122 | } |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | public static function dumpThrowable(\Throwable $e) |
| 128 | 128 | { |
| 129 | - $dump = get_class($e).':'. $e->getMessage() .PHP_EOL; |
|
| 130 | - $dump .= 'At: ' . $e->getFile().':'.$e->getLine().PHP_EOL; |
|
| 129 | + $dump = get_class($e).':'.$e->getMessage().PHP_EOL; |
|
| 130 | + $dump .= 'At: '.$e->getFile().':'.$e->getLine().PHP_EOL; |
|
| 131 | 131 | $dump .= static::dumpTrace($e->getTrace()); |
| 132 | 132 | return $dump; |
| 133 | 133 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | public function __construct(string $name, int $type = 0) |
| 14 | 14 | { |
| 15 | 15 | $this->name = $name; |
| 16 | - parent::__construct(sprintf('missing template %s', $name, $type == 0 ? 'source':'dest')); |
|
| 16 | + parent::__construct(sprintf('missing template %s', $name, $type == 0 ? 'source' : 'dest')); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | |