@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | protected function whereStringArray(string $where, array $whereBinder) |
172 | 172 | { |
173 | 173 | list($where, $whereBinder) = $this->prepareWhereString($where, $whereBinder); |
174 | - $this->where = 'WHERE ' . $where; |
|
174 | + $this->where = 'WHERE '.$where; |
|
175 | 175 | $this->binder = $this->mergeBinder($this->binder, $whereBinder); |
176 | 176 | } |
177 | 177 | |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | */ |
184 | 184 | public function groupBy(string $what) |
185 | 185 | { |
186 | - $this->groupBy = 'GROUP BY `' . $what.'`'; |
|
186 | + $this->groupBy = 'GROUP BY `'.$what.'`'; |
|
187 | 187 | return $this; |
188 | 188 | } |
189 | 189 | |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | { |
228 | 228 | |
229 | 229 | list($having, $havingBinder) = $this->prepareWhereString($having, $havingBinder); |
230 | - $this->having = 'HAVING ' . $having; |
|
230 | + $this->having = 'HAVING '.$having; |
|
231 | 231 | $this->binder = $this->mergeBinder($this->binder, $havingBinder); |
232 | 232 | } |
233 | 233 | |
@@ -242,9 +242,9 @@ discard block |
||
242 | 242 | { |
243 | 243 | $order = strtoupper($order); |
244 | 244 | if (strlen($this->orderBy) > 0) { |
245 | - $this->orderBy .= ',`' . $what . '` ' . $order; |
|
245 | + $this->orderBy .= ',`'.$what.'` '.$order; |
|
246 | 246 | } else { |
247 | - $this->orderBy = 'ORDER BY `' . $what . '` ' . $order; |
|
247 | + $this->orderBy = 'ORDER BY `'.$what.'` '.$order; |
|
248 | 248 | } |
249 | 249 | return $this; |
250 | 250 | } |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | */ |
259 | 259 | public function limit(int $start, int $length = null) |
260 | 260 | { |
261 | - $this->limit = 'LIMIT ' . $start . ($length !== null ? ',' . $length : ''); |
|
261 | + $this->limit = 'LIMIT '.$start.($length !== null ? ','.$length : ''); |
|
262 | 262 | return $this; |
263 | 263 | } |
264 | 264 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $fields = $reads; |
26 | 26 | } else { |
27 | 27 | $field = []; |
28 | - $prefix = strlen($table) ?"`{$table}`." :''; |
|
28 | + $prefix = strlen($table) ? "`{$table}`." : ''; |
|
29 | 29 | foreach ($reads as $want) { |
30 | 30 | $field[] = $prefix."`$want`"; |
31 | 31 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | { |
103 | 103 | list($inSQL, $binders) = $this->prepareInParameter($values, $name); |
104 | 104 | $sql = '`'.$name.'` IN ('.$inSQL.')'; |
105 | - return [$sql,$binders]; |
|
105 | + return [$sql, $binders]; |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | protected function prepareQueryMark(string $sql, array $parameter) |
155 | 155 | { |
156 | 156 | $binders = []; |
157 | - $query = preg_replace_callback('/\?/', function ($match) use (&$binders, $parameter) { |
|
157 | + $query = preg_replace_callback('/\?/', function($match) use (&$binders, $parameter) { |
|
158 | 158 | $index = count($binders); |
159 | 159 | if (array_key_exists($index, $parameter)) { |
160 | 160 | $name = Binder::index($index); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | protected function mergeBinder(array $binderArray, array $parameter) |
184 | 184 | { |
185 | 185 | foreach ($parameter as $key => $value) { |
186 | - if (! ($value instanceof Binder)) { |
|
186 | + if (!($value instanceof Binder)) { |
|
187 | 187 | $value = new Binder($key, $value); |
188 | 188 | } |
189 | 189 | if (!in_array($value, $binderArray)) { |
@@ -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 | public static 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 | return $base; |
162 | 162 | } |
163 | 163 | } |
@@ -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'; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | public function loadVendorIfExist() |
86 | 86 | { |
87 | - $vendorAutoload = $this->application->getPath() . '/vendor/autoload.php'; |
|
87 | + $vendorAutoload = $this->application->getPath().'/vendor/autoload.php'; |
|
88 | 88 | if (FileSystem::exist($vendorAutoload)) { |
89 | 89 | Loader::requireOnce($vendorAutoload); |
90 | 90 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | protected function registerModule() |
123 | 123 | { |
124 | - $extractPath = $this->application->getDataPath() . '/extract-module'; |
|
124 | + $extractPath = $this->application->getDataPath().'/extract-module'; |
|
125 | 125 | FileSystem::make($extractPath); |
126 | 126 | foreach ($this->application->getModulePaths() as $path) { |
127 | 127 | $this->registerModuleFrom($path, $extractPath); |
@@ -68,13 +68,13 @@ |
||
68 | 68 | ); |
69 | 69 | $exported = []; |
70 | 70 | foreach ($props as $value) { |
71 | - $name = dechex($value->getModifiers()) . '$' . $value->getName(); |
|
71 | + $name = dechex($value->getModifiers()).'$'.$value->getName(); |
|
72 | 72 | $value->setAccessible(true); |
73 | 73 | $exported[$name] = new DebugObject($value->getValue($object), $this->context); |
74 | 74 | } |
75 | 75 | return $exported; |
76 | 76 | } catch (\ReflectionException $e) { |
77 | - return 'Err:' . $e->getMessage(); |
|
77 | + return 'Err:'.$e->getMessage(); |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 |
@@ -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)) { |
@@ -7,12 +7,12 @@ |
||
7 | 7 | use suda\framework\http\HTTPResponse; |
8 | 8 | use suda\application\builder\ApplicationBuilder; |
9 | 9 | |
10 | -require_once __DIR__ .'/loader.php'; |
|
10 | +require_once __DIR__.'/loader.php'; |
|
11 | 11 | |
12 | 12 | // 初始化系统加载器 |
13 | 13 | $loader = new Loader; |
14 | 14 | $loader->register(); |
15 | -$loader->addIncludePath(SUDA_SYSTEM .'/src', 'suda'); |
|
15 | +$loader->addIncludePath(SUDA_SYSTEM.'/src', 'suda'); |
|
16 | 16 | // 初始化数据目录 |
17 | 17 | defined('SUDA_DATA') or define('SUDA_DATA', Path::toAbsolutePath('~/data')); |
18 | 18 | defined('SUDA_APP_MANIFEST') or define('SUDA_APP_MANIFEST', SUDA_APP.'/manifest'); |