@@ -148,8 +148,8 @@ |
||
148 | 148 | $this->module[$module->getFullName()] = $module; |
149 | 149 | $this->getContext()->getDebugger()->info('register module {name} at {path}', ['name'=>$module->getFullName(), 'path'=>$module->getPath()]); |
150 | 150 | } |
151 | - $this->buildLoadingOrder('alive', 'loadingOrder'); |
|
152 | - $this->buildLoadingOrder('reachable', 'routeLoadingOrder'); |
|
151 | + $this->buildLoadingOrder('alive', 'loadingOrder'); |
|
152 | + $this->buildLoadingOrder('reachable', 'routeLoadingOrder'); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | public function registerModule() |
141 | 141 | { |
142 | 142 | $scan = $this->getContext()->getConfig()->get('app.module.scan-path', []); |
143 | - $cache = $this->getContext()->getApplication()->getDataPath() .'/module-cache'; |
|
143 | + $cache = $this->getContext()->getApplication()->getDataPath().'/module-cache'; |
|
144 | 144 | FileSystem::makes($cache); |
145 | 145 | // 扫描加载 |
146 | 146 | foreach (Builder::scan($scan, $cache) as $module) { |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | * @param string $name |
191 | 191 | * @return Module|null |
192 | 192 | */ |
193 | - public function find(string $name):?Module |
|
193 | + public function find(string $name): ?Module |
|
194 | 194 | { |
195 | 195 | $fullName = $this->finder->getFullName($name); |
196 | 196 | return $this->module[$fullName] ?? null; |
@@ -49,7 +49,7 @@ |
||
49 | 49 | public function loadFromModule(Manager $manager) { |
50 | 50 | $groups = $this->applicaton->getConfig()->get('app.active',['default']); |
51 | 51 | foreach ($groups as $group) { |
52 | - $manager->loadRoute($group, $this); |
|
52 | + $manager->loadRoute($group, $this); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * @return void |
48 | 48 | */ |
49 | 49 | public function loadFromModule(Manager $manager) { |
50 | - $groups = $this->applicaton->getConfig()->get('app.active',['default']); |
|
50 | + $groups = $this->applicaton->getConfig()->get('app.active', ['default']); |
|
51 | 51 | foreach ($groups as $group) { |
52 | 52 | $manager->loadRoute($group, $this); |
53 | 53 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | public function addGroupRoute(string $group, GroupRoutes $route) { |
64 | 64 | if (\array_key_exists($group, $this->routes)) { |
65 | 65 | $this->routes[$group]->merge($route); |
66 | - }else{ |
|
66 | + } else { |
|
67 | 67 | $this->routes[$group] = $route; |
68 | 68 | } |
69 | 69 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | public function addGroupRoute(string $group, GroupRoutes $route) { |
64 | 64 | if (\array_key_exists($group, $this->routes)) { |
65 | 65 | $this->routes[$group]->merge($route); |
66 | - }else{ |
|
66 | + } else{ |
|
67 | 67 | $this->routes[$group] = $route; |
68 | 68 | } |
69 | 69 | } |
@@ -4,15 +4,15 @@ |
||
4 | 4 | use nebula\application\Loader; |
5 | 5 | use nebula\component\request\Request; |
6 | 6 | |
7 | -require_once __DIR__ .'/loader.php'; |
|
7 | +require_once __DIR__.'/loader.php'; |
|
8 | 8 | |
9 | 9 | |
10 | 10 | |
11 | 11 | // 初始化系统加载器 |
12 | 12 | $loader = new Loader; |
13 | 13 | $loader->register(); |
14 | -$loader->addIncludePath(NEBULA_SYSTEM .'/src', 'nebula'); |
|
15 | -$loader->import(NEBULA_SYSTEM .'/src/functions.php'); |
|
14 | +$loader->addIncludePath(NEBULA_SYSTEM.'/src', 'nebula'); |
|
15 | +$loader->import(NEBULA_SYSTEM.'/src/functions.php'); |
|
16 | 16 | // 初始化请求 |
17 | 17 | $request = Request::buildFromServer(); |
18 | 18 | $request->apply(true); |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | |
85 | 85 | public function getRoute(string $groupName): GroupRoutes |
86 | 86 | { |
87 | - $group = $groupName === 'default' ? '': '-'. $groupName; |
|
88 | - $routeConfig = $this->getConfigFrom('route'.$group, ['group' => $group,]); |
|
89 | - $routes = new GroupRoutes($groupName); |
|
87 | + $group = $groupName === 'default' ? '' : '-'.$groupName; |
|
88 | + $routeConfig = $this->getConfigFrom('route'.$group, ['group' => $group, ]); |
|
89 | + $routes = new GroupRoutes($groupName); |
|
90 | 90 | if (\is_array($routeConfig)) { |
91 | 91 | // debug()->debug('load route {group} from {module}',['group'=>$groupName, 'module' => $this->getFullName()]); |
92 | 92 | $prefix = $this->config->get('route.prefix', ''); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | */ |
142 | 142 | public function getFullName() |
143 | 143 | { |
144 | - return $this->name .':'. $this->version; |
|
144 | + return $this->name.':'.$this->version; |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | */ |
89 | 89 | private function initBaseConfig() |
90 | 90 | { |
91 | - $this->initConfigIfNotSet('app.route.active', defined('NEBULA_ROUTE_GROUPS')? \explode(',', \constant('NEBULA_ROUTE_GROUPS')) :['default']); |
|
91 | + $this->initConfigIfNotSet('app.route.active', defined('NEBULA_ROUTE_GROUPS') ? \explode(',', \constant('NEBULA_ROUTE_GROUPS')) : ['default']); |
|
92 | 92 | $this->initConfigIfNotSet('app.import', [\constant('NEBULA_APP').'/'.'share']); |
93 | 93 | $this->initConfigIfNotSet('app.resource', [\constant('NEBULA_APP').'/'.'resource']); |
94 | 94 | $this->initConfigIfNotSet('app.module.scan-path', [\constant('NEBULA_APP').'/'.'modules']); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | */ |
116 | 116 | private function initTimezone() |
117 | 117 | { |
118 | - $timezone = defined('DEFAULT_TIMEZONE')?constant('DEFAULT_TIMEZONE'):'PRC'; |
|
118 | + $timezone = defined('DEFAULT_TIMEZONE') ?constant('DEFAULT_TIMEZONE') : 'PRC'; |
|
119 | 119 | date_default_timezone_set($this->config->get('app.timezone', $timezone)); |
120 | 120 | } |
121 | 121 | |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function run() |
201 | 201 | { |
202 | - $className = $this->config->get('app.application', Application::class); |
|
202 | + $className = $this->config->get('app.application', Application::class); |
|
203 | 203 | $this->application = Runnable::newClassInstance($className); |
204 | 204 | $this->application->setContext($this); |
205 | 205 | $this->application->setPath($this->path); |
@@ -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 Fields 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 Fields 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 | /** |
@@ -12,7 +12,7 @@ |
||
12 | 12 | class Content |
13 | 13 | { |
14 | 14 | protected $types = [ |
15 | - JsonContent::class => ['boolean','bool','integer','int','float','string','array','null', JsonSerializable::class ], |
|
15 | + JsonContent::class => ['boolean', 'bool', 'integer', 'int', 'float', 'string', 'array', 'null', JsonSerializable::class], |
|
16 | 16 | FileContent::class => [SplFileInfo::class], |
17 | 17 | ]; |
18 | 18 |
@@ -13,12 +13,12 @@ discard block |
||
13 | 13 | */ |
14 | 14 | protected static $mimes = [ |
15 | 15 | # Image Type |
16 | - 'jpe' => 'image/jpeg' , |
|
17 | - 'jpeg' => 'image/jpeg' , |
|
18 | - 'jpg' => 'image/jpeg' , |
|
19 | - 'svg' => 'image/svg+xml' , |
|
20 | - 'png' => 'image/png' , |
|
21 | - 'gif' => 'image/gif' , |
|
16 | + 'jpe' => 'image/jpeg', |
|
17 | + 'jpeg' => 'image/jpeg', |
|
18 | + 'jpg' => 'image/jpeg', |
|
19 | + 'svg' => 'image/svg+xml', |
|
20 | + 'png' => 'image/png', |
|
21 | + 'gif' => 'image/gif', |
|
22 | 22 | 'ico' => 'image/x-icon', |
23 | 23 | 'webp' => 'image/webp', |
24 | 24 | |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | 'js' => 'text/javascript', |
27 | 27 | 'css' => 'text/css', |
28 | 28 | 'txt' => 'text/plain', |
29 | - 'html' => 'text/html' , |
|
30 | - 'csv' => 'text/csv' , |
|
29 | + 'html' => 'text/html', |
|
30 | + 'csv' => 'text/csv', |
|
31 | 31 | 'xml' => 'text/xml', |
32 | 32 | |
33 | 33 | # App type |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | # Archive |
41 | 41 | 'zip' => 'application/zip', |
42 | - 'gtar' => 'application/x-gtar' , |
|
43 | - 'gz' => 'application/x-gzip' , |
|
42 | + 'gtar' => 'application/x-gtar', |
|
43 | + 'gz' => 'application/x-gzip', |
|
44 | 44 | '7z' => 'application/x-7z-compressed', |
45 | 45 | 'rar' => 'application/x-rar-compressed', |
46 | 46 |
@@ -91,8 +91,8 @@ |
||
91 | 91 | * @return void |
92 | 92 | */ |
93 | 93 | public function setStatus(int $code) { |
94 | - $this->header->sendHeaderRaw('HTTP/1.1 '.$code.' '. Status::toText($code)); |
|
95 | - $this->header->sendHeader('Status', $code.' '. Status::toText($code)); |
|
94 | + $this->header->sendHeaderRaw('HTTP/1.1 '.$code.' '.Status::toText($code)); |
|
95 | + $this->header->sendHeader('Status', $code.' '.Status::toText($code)); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |