@@ -40,7 +40,7 @@ |
||
40 | 40 | $this->content = $content; |
41 | 41 | $this->name = $name; |
42 | 42 | $this->open = $open; |
43 | - $this->close= $close; |
|
43 | + $this->close = $close; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $path |
80 | 80 | * @return Module|null |
81 | 81 | */ |
82 | - public function guess(string $path):?Module |
|
82 | + public function guess(string $path): ?Module |
|
83 | 83 | { |
84 | 84 | foreach ($this->module as $module) { |
85 | 85 | if (FileSystem::isOverflowPath($module->getPath(), $path) === false) { |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @throws ApplicationException |
112 | 112 | * @return Module|null |
113 | 113 | */ |
114 | - public function get(string $name):?Module |
|
114 | + public function get(string $name): ?Module |
|
115 | 115 | { |
116 | 116 | $full = $this->getFullName($name); |
117 | 117 | return $this->module[$full]; |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | if (array_key_exists($version, $this->knownsFullName[$name])) { |
196 | 196 | return $this->knownsFullName[$name][$version]; |
197 | 197 | } |
198 | - return $hasVersion?$name.':'.$version:end($this->knownsFullName[$name]); |
|
198 | + return $hasVersion ? $name.':'.$version : end($this->knownsFullName[$name]); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | protected function getLikeName(string $name):string |
@@ -42,8 +42,8 @@ |
||
42 | 42 | } |
43 | 43 | } |
44 | 44 | // 加载器 |
45 | -require_once SUDA_SYSTEM .'/src/framework/loader/Path.php'; |
|
46 | -require_once SUDA_SYSTEM .'/src/framework/loader/PathTrait.php'; |
|
47 | -require_once SUDA_SYSTEM .'/src/framework/loader/PathInterface.php'; |
|
48 | -require_once SUDA_SYSTEM .'/src/framework/loader/IncludeManager.php'; |
|
49 | -require_once SUDA_SYSTEM .'/src/framework/loader/Loader.php'; |
|
45 | +require_once SUDA_SYSTEM.'/src/framework/loader/Path.php'; |
|
46 | +require_once SUDA_SYSTEM.'/src/framework/loader/PathTrait.php'; |
|
47 | +require_once SUDA_SYSTEM.'/src/framework/loader/PathInterface.php'; |
|
48 | +require_once SUDA_SYSTEM.'/src/framework/loader/IncludeManager.php'; |
|
49 | +require_once SUDA_SYSTEM.'/src/framework/loader/Loader.php'; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $password = $this->config['password'] ?? ''; |
46 | 46 | $pdo = new PDO($this->getDsn(), $user, $password); |
47 | 47 | $this->id = static::$connectionCount; |
48 | - static::$connectionCount ++; |
|
48 | + static::$connectionCount++; |
|
49 | 49 | return $pdo; |
50 | 50 | } catch (PDOException $e) { |
51 | 51 | throw new SQLException(sprintf( |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function switchDatabase(string $database) |
66 | 66 | { |
67 | - return $this->query(new QueryStatement('USE `' . $database.'`')); |
|
67 | + return $this->query(new QueryStatement('USE `'.$database.'`')); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | public function rawTableName(string $name) |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | try { |
41 | 41 | $pdo = new PDO($this->getDsn()); |
42 | 42 | $this->id = static::$connectionCount; |
43 | - static::$connectionCount ++; |
|
43 | + static::$connectionCount++; |
|
44 | 44 | return $pdo; |
45 | 45 | } catch (PDOException $e) { |
46 | 46 | throw new SQLException( |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function switchDatabase(string $database) |
64 | 64 | { |
65 | - return $this->query(new QueryStatement('USE `' . $database.'`')); |
|
65 | + return $this->query(new QueryStatement('USE `'.$database.'`')); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | $table = $this->connection->rawTableName($this->name); |
106 | 106 | $sql = "CREATE TABLE IF NOT EXISTS `{$table}` (\r\n\t"; |
107 | 107 | $sql .= implode(",\r\n\t", array_filter($content, 'strlen')); |
108 | - $auto = null === $this->auto?'':'AUTO_INCREMENT='.$this->auto; |
|
109 | - $collate = null === $this->collate?'':'COLLATE '.$this->collate; |
|
108 | + $auto = null === $this->auto ? '' : 'AUTO_INCREMENT='.$this->auto; |
|
109 | + $collate = null === $this->collate ? '' : 'COLLATE '.$this->collate; |
|
110 | 110 | $sql .= "\r\n) ENGINE={$this->engine} {$collate} {$auto} DEFAULT CHARSET={$this->charset};"; |
111 | 111 | return $sql; |
112 | 112 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | } |
125 | 125 | } |
126 | 126 | if (count($primary)) { |
127 | - return 'PRIMARY KEY ('. implode(',', $primary).')'; |
|
127 | + return 'PRIMARY KEY ('.implode(',', $primary).')'; |
|
128 | 128 | } |
129 | 129 | return ''; |
130 | 130 | } |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | protected function createField(Field $field) |
218 | 218 | { |
219 | 219 | $type = strtoupper($field->getValueType()).$this->parseLength($field->getLength()); |
220 | - $auto = $field->getAuto() ?'AUTO_INCREMENT':''; |
|
221 | - $null = $field->isNullable() ?'NULL':'NOT NULL'; |
|
222 | - $attr = $field->getAttribute() ?strtoupper($field->getAttribute()):''; |
|
223 | - $comment = $field->getComment() ?('COMMENT \''.addcslashes($field->getComment(), '\'').'\''):''; |
|
220 | + $auto = $field->getAuto() ? 'AUTO_INCREMENT' : ''; |
|
221 | + $null = $field->isNullable() ? 'NULL' : 'NOT NULL'; |
|
222 | + $attr = $field->getAttribute() ?strtoupper($field->getAttribute()) : ''; |
|
223 | + $comment = $field->getComment() ? ('COMMENT \''.addcslashes($field->getComment(), '\'').'\'') : ''; |
|
224 | 224 | // default设置 |
225 | 225 | if ($field->hasDefault()) { |
226 | 226 | if (null === $field->getDefault()) { |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | protected static function fixConfig(Application $application, ?string $module, array $config) |
45 | 45 | { |
46 | 46 | if (!array_key_exists('assets-prefix', $config)) { |
47 | - $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS'): 'assets'; |
|
47 | + $config['assets-prefix'] = defined('SUDA_ASSETS') ? constant('SUDA_ASSETS') : 'assets'; |
|
48 | 48 | } |
49 | 49 | if (!array_key_exists('static', $config)) { |
50 | 50 | $config['static'] = 'static'; |
51 | 51 | } |
52 | 52 | if (!array_key_exists('assets-path', $config)) { |
53 | - $config['assets-path'] = SUDA_PUBLIC. '/'.$config['assets-prefix']; |
|
53 | + $config['assets-path'] = SUDA_PUBLIC.'/'.$config['assets-prefix']; |
|
54 | 54 | } |
55 | 55 | if (!array_key_exists('static-name', $config)) { |
56 | 56 | $config['uri-name'] = static::getSafeUriName($application, $module); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | { |
115 | 115 | $assetRoot = static::getAssetRoot($application, $module); |
116 | 116 | if (in_array($request->getIndex(), $application->conf('index', ['/index.php']))) { |
117 | - $name = static::writableAssets($application, $module) ? dirname($request->getIndex()):$request->getIndex(); |
|
117 | + $name = static::writableAssets($application, $module) ? dirname($request->getIndex()) : $request->getIndex(); |
|
118 | 118 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
119 | 119 | } |
120 | 120 | return rtrim(str_replace('\\', '/', $request->getIndex()), '/').$assetRoot; |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | ?string $module = null |
151 | 151 | ):string { |
152 | 152 | $assetRoot = static::getAssetRoot($application, $module); |
153 | - $name = static::writableAssets($application, $module) ? dirname($request->getIndex()):$request->getIndex(); |
|
153 | + $name = static::writableAssets($application, $module) ? dirname($request->getIndex()) : $request->getIndex(); |
|
154 | 154 | return rtrim(str_replace('\\', '/', $name), '/').$assetRoot; |
155 | 155 | } |
156 | 156 |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | if (array_key_exists('server-port', $this->request->server())) { |
105 | 105 | return $this->request->server()['server-port']; |
106 | 106 | } |
107 | - return $this->getSecure()?443:80; |
|
107 | + return $this->getSecure() ? 443 : 80; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | private function createUribase(RequestWrapper $request) |
150 | 150 | { |
151 | - $scheme = $request->isSecure()?'https':'http'; |
|
151 | + $scheme = $request->isSecure() ? 'https' : 'http'; |
|
152 | 152 | $port = $request->getPort(); |
153 | 153 | if ($port == 80 && $scheme == 'http') { |
154 | 154 | $port = ''; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | } else { |
158 | 158 | $port = ':'.$port; |
159 | 159 | } |
160 | - $base = $scheme.'://'. $request->getHost().$port; |
|
160 | + $base = $scheme.'://'.$request->getHost().$port; |
|
161 | 161 | $request->setUriBase($base); |
162 | 162 | } |
163 | 163 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | bool $allowQuery = true, |
32 | 32 | ?string $default = null, |
33 | 33 | ?string $group = null |
34 | - ):?string { |
|
34 | + ): ?string { |
|
35 | 35 | $group = $group ?? $request->getAttribute('group'); |
36 | 36 | $default = $default ?? $request->getAttribute('module'); |
37 | 37 | $url = $this->route->create($this->getRouteName($name, $default, $group), $parameter, $allowQuery); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected function getUrlIndex(Request $request):string |
48 | 48 | { |
49 | - $indexArray = $this->conf('index') ?? [ 'index.php' ]; |
|
49 | + $indexArray = $this->conf('index') ?? ['index.php']; |
|
50 | 50 | $index = ltrim($request->getIndex(), '/'); |
51 | 51 | if (!in_array($index, $indexArray)) { |
52 | 52 | return $request->getIndex(); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | public function getUriBase(Request $request, bool $beautify = true):string |
134 | 134 | { |
135 | 135 | $index = $beautify ? $this->getUrlIndex($request) : $request->getIndex(); |
136 | - return $request->getUriBase() . $index; |
|
136 | + return $request->getUriBase().$index; |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -144,6 +144,6 @@ discard block |
||
144 | 144 | */ |
145 | 145 | protected function getRouteGroupPrefix(?string $group):string |
146 | 146 | { |
147 | - return $group === null || $group === 'default' ? '': '@'. $group; |
|
147 | + return $group === null || $group === 'default' ? '' : '@'.$group; |
|
148 | 148 | } |
149 | 149 | } |