@@ -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'; |
|
@@ -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()) { |
@@ -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 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | public static $statusTexts = [ |
| 10 | 10 | 100 => 'Continue', |
| 11 | 11 | 101 => 'Switching Protocols', |
| 12 | - 102 => 'Processing', // RFC2518 |
|
| 12 | + 102 => 'Processing', // RFC2518 |
|
| 13 | 13 | 103 => 'Early Hints', |
| 14 | 14 | 200 => 'OK', |
| 15 | 15 | 201 => 'Created', |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | 204 => 'No Content', |
| 19 | 19 | 205 => 'Reset Content', |
| 20 | 20 | 206 => 'Partial Content', |
| 21 | - 207 => 'Multi-Status', // RFC4918 |
|
| 22 | - 208 => 'Already Reported', // RFC5842 |
|
| 23 | - 226 => 'IM Used', // RFC3229 |
|
| 21 | + 207 => 'Multi-Status', // RFC4918 |
|
| 22 | + 208 => 'Already Reported', // RFC5842 |
|
| 23 | + 226 => 'IM Used', // RFC3229 |
|
| 24 | 24 | 300 => 'Multiple Choices', |
| 25 | 25 | 301 => 'Moved Permanently', |
| 26 | 26 | 302 => 'Found', |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | 304 => 'Not Modified', |
| 29 | 29 | 305 => 'Use Proxy', |
| 30 | 30 | 307 => 'Temporary Redirect', |
| 31 | - 308 => 'Permanent Redirect', // RFC7238 |
|
| 31 | + 308 => 'Permanent Redirect', // RFC7238 |
|
| 32 | 32 | 400 => 'Bad Request', |
| 33 | 33 | 401 => 'Unauthorized', |
| 34 | 34 | 402 => 'Payment Required', |
@@ -47,34 +47,34 @@ discard block |
||
| 47 | 47 | 415 => 'Unsupported Media Type', |
| 48 | 48 | 416 => 'Range Not Satisfiable', |
| 49 | 49 | 417 => 'Expectation Failed', |
| 50 | - 418 => 'I\'m a teapot', // RFC2324 |
|
| 51 | - 421 => 'Misdirected Request', // RFC7540 |
|
| 52 | - 422 => 'Unprocessable Entity', // RFC4918 |
|
| 53 | - 423 => 'Locked', // RFC4918 |
|
| 54 | - 424 => 'Failed Dependency', // RFC4918 |
|
| 55 | - 425 => 'Too Early', // RFC-ietf-httpbis-replay-04 |
|
| 56 | - 426 => 'Upgrade Required', // RFC2817 |
|
| 57 | - 428 => 'Precondition Required', // RFC6585 |
|
| 58 | - 429 => 'Too Many Requests', // RFC6585 |
|
| 59 | - 431 => 'Request Header TableStruct Too Large', // RFC6585 |
|
| 60 | - 451 => 'Unavailable For Legal Reasons', // RFC7725 |
|
| 50 | + 418 => 'I\'m a teapot', // RFC2324 |
|
| 51 | + 421 => 'Misdirected Request', // RFC7540 |
|
| 52 | + 422 => 'Unprocessable Entity', // RFC4918 |
|
| 53 | + 423 => 'Locked', // RFC4918 |
|
| 54 | + 424 => 'Failed Dependency', // RFC4918 |
|
| 55 | + 425 => 'Too Early', // RFC-ietf-httpbis-replay-04 |
|
| 56 | + 426 => 'Upgrade Required', // RFC2817 |
|
| 57 | + 428 => 'Precondition Required', // RFC6585 |
|
| 58 | + 429 => 'Too Many Requests', // RFC6585 |
|
| 59 | + 431 => 'Request Header TableStruct Too Large', // RFC6585 |
|
| 60 | + 451 => 'Unavailable For Legal Reasons', // RFC7725 |
|
| 61 | 61 | 500 => 'Internal Server Error', |
| 62 | 62 | 501 => 'Not Implemented', |
| 63 | 63 | 502 => 'Bad Gateway', |
| 64 | 64 | 503 => 'Service Unavailable', |
| 65 | 65 | 504 => 'Gateway Timeout', |
| 66 | 66 | 505 => 'HTTP Version Not Supported', |
| 67 | - 506 => 'Variant Also Negotiates', // RFC2295 |
|
| 68 | - 507 => 'Insufficient Storage', // RFC4918 |
|
| 69 | - 508 => 'Loop Detected', // RFC5842 |
|
| 70 | - 510 => 'Not Extended', // RFC2774 |
|
| 71 | - 511 => 'Network Authentication Required', // RFC6585 |
|
| 67 | + 506 => 'Variant Also Negotiates', // RFC2295 |
|
| 68 | + 507 => 'Insufficient Storage', // RFC4918 |
|
| 69 | + 508 => 'Loop Detected', // RFC5842 |
|
| 70 | + 510 => 'Not Extended', // RFC2774 |
|
| 71 | + 511 => 'Network Authentication Required', // RFC6585 |
|
| 72 | 72 | ]; |
| 73 | 73 | |
| 74 | 74 | const HTTP_CONTINUE = 100; |
| 75 | 75 | const HTTP_SWITCHING_PROTOCOLS = 101; |
| 76 | - const HTTP_PROCESSING = 102; // RFC2518 |
|
| 77 | - const HTTP_EARLY_HINTS = 103; // RFC8297 |
|
| 76 | + const HTTP_PROCESSING = 102; // RFC2518 |
|
| 77 | + const HTTP_EARLY_HINTS = 103; // RFC8297 |
|
| 78 | 78 | const HTTP_OK = 200; |
| 79 | 79 | const HTTP_CREATED = 201; |
| 80 | 80 | const HTTP_ACCEPTED = 202; |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | const HTTP_NO_CONTENT = 204; |
| 83 | 83 | const HTTP_RESET_CONTENT = 205; |
| 84 | 84 | const HTTP_PARTIAL_CONTENT = 206; |
| 85 | - const HTTP_MULTI_STATUS = 207; // RFC4918 |
|
| 86 | - const HTTP_ALREADY_REPORTED = 208; // RFC5842 |
|
| 87 | - const HTTP_IM_USED = 226; // RFC3229 |
|
| 85 | + const HTTP_MULTI_STATUS = 207; // RFC4918 |
|
| 86 | + const HTTP_ALREADY_REPORTED = 208; // RFC5842 |
|
| 87 | + const HTTP_IM_USED = 226; // RFC3229 |
|
| 88 | 88 | const HTTP_MULTIPLE_CHOICES = 300; |
| 89 | 89 | const HTTP_MOVED_PERMANENTLY = 301; |
| 90 | 90 | const HTTP_FOUND = 302; |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | const HTTP_USE_PROXY = 305; |
| 94 | 94 | const HTTP_RESERVED = 306; |
| 95 | 95 | const HTTP_TEMPORARY_REDIRECT = 307; |
| 96 | - const HTTP_PERMANENTLY_REDIRECT = 308; // RFC7238 |
|
| 96 | + const HTTP_PERMANENTLY_REDIRECT = 308; // RFC7238 |
|
| 97 | 97 | const HTTP_BAD_REQUEST = 400; |
| 98 | 98 | const HTTP_UNAUTHORIZED = 401; |
| 99 | 99 | const HTTP_PAYMENT_REQUIRED = 402; |
@@ -112,21 +112,21 @@ discard block |
||
| 112 | 112 | const HTTP_UNSUPPORTED_MEDIA_TYPE = 415; |
| 113 | 113 | const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416; |
| 114 | 114 | const HTTP_EXPECTATION_FAILED = 417; |
| 115 | - const HTTP_I_AM_A_TEAPOT = 418; // RFC2324 |
|
| 116 | - const HTTP_MISDIRECTED_REQUEST = 421; // RFC7540 |
|
| 117 | - const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918 |
|
| 118 | - const HTTP_LOCKED = 423; // RFC4918 |
|
| 119 | - const HTTP_FAILED_DEPENDENCY = 424; // RFC4918 |
|
| 115 | + const HTTP_I_AM_A_TEAPOT = 418; // RFC2324 |
|
| 116 | + const HTTP_MISDIRECTED_REQUEST = 421; // RFC7540 |
|
| 117 | + const HTTP_UNPROCESSABLE_ENTITY = 422; // RFC4918 |
|
| 118 | + const HTTP_LOCKED = 423; // RFC4918 |
|
| 119 | + const HTTP_FAILED_DEPENDENCY = 424; // RFC4918 |
|
| 120 | 120 | |
| 121 | 121 | /** |
| 122 | 122 | * @deprecated |
| 123 | 123 | */ |
| 124 | - const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; // RFC2817 |
|
| 125 | - const HTTP_TOO_EARLY = 425; // RFC-ietf-httpbis-replay-04 |
|
| 126 | - const HTTP_UPGRADE_REQUIRED = 426; // RFC2817 |
|
| 127 | - const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585 |
|
| 128 | - const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585 |
|
| 129 | - const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; // RFC6585 |
|
| 124 | + const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; // RFC2817 |
|
| 125 | + const HTTP_TOO_EARLY = 425; // RFC-ietf-httpbis-replay-04 |
|
| 126 | + const HTTP_UPGRADE_REQUIRED = 426; // RFC2817 |
|
| 127 | + const HTTP_PRECONDITION_REQUIRED = 428; // RFC6585 |
|
| 128 | + const HTTP_TOO_MANY_REQUESTS = 429; // RFC6585 |
|
| 129 | + const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; // RFC6585 |
|
| 130 | 130 | const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451; |
| 131 | 131 | const HTTP_INTERNAL_SERVER_ERROR = 500; |
| 132 | 132 | const HTTP_NOT_IMPLEMENTED = 501; |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | const HTTP_SERVICE_UNAVAILABLE = 503; |
| 135 | 135 | const HTTP_GATEWAY_TIMEOUT = 504; |
| 136 | 136 | const HTTP_VERSION_NOT_SUPPORTED = 505; |
| 137 | - const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506; // RFC2295 |
|
| 138 | - const HTTP_INSUFFICIENT_STORAGE = 507; // RFC4918 |
|
| 139 | - const HTTP_LOOP_DETECTED = 508; // RFC5842 |
|
| 140 | - const HTTP_NOT_EXTENDED = 510; // RFC2774 |
|
| 137 | + const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506; // RFC2295 |
|
| 138 | + const HTTP_INSUFFICIENT_STORAGE = 507; // RFC4918 |
|
| 139 | + const HTTP_LOOP_DETECTED = 508; // RFC5842 |
|
| 140 | + const HTTP_NOT_EXTENDED = 510; // RFC2774 |
|
| 141 | 141 | const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511; |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -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(), |
@@ -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]]); |