@@ -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 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | public function __construct(string $object) |
41 | 41 | { |
42 | 42 | parent::__construct($object); |
43 | - $this->classDoc = is_string($this->reflectObject->getDocComment())?$this->reflectObject->getDocComment():''; |
|
43 | + $this->classDoc = is_string($this->reflectObject->getDocComment()) ? $this->reflectObject->getDocComment() : ''; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -63,14 +63,14 @@ discard block |
||
63 | 63 | * @param string $classDoc |
64 | 64 | * @return array|null |
65 | 65 | */ |
66 | - public static function readClassDocField(string $classDoc):?array |
|
66 | + public static function readClassDocField(string $classDoc): ?array |
|
67 | 67 | { |
68 | 68 | if (preg_match_all( |
69 | 69 | '/^.+\s+\@field(?:\-(?:serialize|json))?\s+(\w+)\s+(\w+)(?:\((.+?)\))?(.*?)$/im', |
70 | 70 | $classDoc, |
71 | 71 | $match |
72 | 72 | ) > 0) { |
73 | - return is_array($match)?$match:null; |
|
73 | + return is_array($match) ? $match : null; |
|
74 | 74 | } |
75 | 75 | return null; |
76 | 76 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function field(string $name, string $type, $length = null) |
57 | 57 | { |
58 | - return $this->fields[$name] ?? $this->fields[$name] = ($length?new Field($this->name, $name, $type, $length):new Field($this->name, $name, $type)); |
|
58 | + return $this->fields[$name] ?? $this->fields[$name] = ($length ? new Field($this->name, $name, $type, $length) : new Field($this->name, $name, $type)); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function newField(string $name, string $type, $length = null) |
68 | 68 | { |
69 | - return $this->fields[$name] ?? $this->fields[$name] = ($length?new Field($this->name, $name, $type, $length):new Field($this->name, $name, $type)); |
|
69 | + return $this->fields[$name] ?? $this->fields[$name] = ($length ? new Field($this->name, $name, $type, $length) : new Field($this->name, $name, $type)); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -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 | /** |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public static function index(string $name): string |
51 | 51 | { |
52 | - return '_' . $name . '_' . static::$index; |
|
52 | + return '_'.$name.'_'.static::$index; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -13,11 +13,11 @@ |
||
13 | 13 | { |
14 | 14 | public function __construct(Throwable $exception) |
15 | 15 | { |
16 | - parent::__construct('',[]); |
|
17 | - $this->path = SUDA_RESOURCE. '/error.php'; |
|
16 | + parent::__construct('', []); |
|
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(), |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function __construct(string $source, array $config = []) |
98 | 98 | { |
99 | - parent::__construct('',[]); |
|
99 | + parent::__construct('', []); |
|
100 | 100 | $this->source = $source; |
101 | 101 | $this->name = pathinfo($source, PATHINFO_FILENAME); |
102 | 102 | $this->config = $config; |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | protected function getStaticOutpath() |
111 | 111 | { |
112 | - $path = $this->config['assets-public'] ?? constant('SUDA_PUBLIC').'/assets/'. $this->getStaticName(); |
|
112 | + $path = $this->config['assets-public'] ?? constant('SUDA_PUBLIC').'/assets/'.$this->getStaticName(); |
|
113 | 113 | FileSystem::make($path); |
114 | 114 | return $path; |
115 | 115 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | { |
124 | 124 | $output = $this->config['output'] ?? constant('SUDA_DATA').'/template'; |
125 | 125 | FileSystem::make($output); |
126 | - return $output .'/'. $this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
126 | + return $output.'/'.$this->name.'-'.substr(md5_file($this->getSourcePath()), 10, 8).'.php'; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * |
132 | 132 | * @return string|null |
133 | 133 | */ |
134 | - public function getSourcePath():?string |
|
134 | + public function getSourcePath(): ?string |
|
135 | 135 | { |
136 | 136 | return $this->source ?? null; |
137 | 137 | } |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | * @return void |
155 | 155 | * @throws Exception |
156 | 156 | */ |
157 | - protected function compile(){ |
|
157 | + protected function compile() { |
|
158 | 158 | $sourcePath = $this->getSourcePath(); |
159 | 159 | $destPath = $this->getPath(); |
160 | 160 | if ($sourcePath === null) { |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | public function include(string $path) |
215 | 215 | { |
216 | 216 | $subfix = $this->config['subfix'] ?? ''; |
217 | - $included = new self(Resource::getPathByRelativePath($path. $subfix, dirname($this->source)), $this->config); |
|
217 | + $included = new self(Resource::getPathByRelativePath($path.$subfix, dirname($this->source)), $this->config); |
|
218 | 218 | $included->parent = $this; |
219 | 219 | echo $included->getRenderedString(); |
220 | 220 | } |
@@ -231,13 +231,13 @@ discard block |
||
231 | 231 | { |
232 | 232 | $this->prepareStaticSource(); |
233 | 233 | if (array_key_exists('assets-prefix', $this->config)) { |
234 | - $prefix = $this->config['assets-prefix'] ; |
|
234 | + $prefix = $this->config['assets-prefix']; |
|
235 | 235 | } elseif (defined('SUDA_ASSETS')) { |
236 | 236 | $prefix = constant('SUDA_ASSETS'); |
237 | 237 | } else { |
238 | 238 | $prefix = '/assets'; |
239 | 239 | } |
240 | - return $prefix .'/'.$this->getStaticName(); |
|
240 | + return $prefix.'/'.$this->getStaticName(); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | protected function prepareStaticSource() |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | * @return string|null |
26 | 26 | */ |
27 | - public function getSourcePath():?string |
|
27 | + public function getSourcePath(): ?string |
|
28 | 28 | { |
29 | 29 | $subfix = $this->config['subfix'] ?? '.tpl.html'; |
30 | 30 | return $this->getResource($this->module)->getResourcePath($this->getTemplatePath().'/'.$this->name.$subfix); |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function getPath() |
39 | 39 | { |
40 | - $output = $this->config['output'] ?? constant('SUDA_DATA').'/template/'. $this->uriName; |
|
40 | + $output = $this->config['output'] ?? constant('SUDA_DATA').'/template/'.$this->uriName; |
|
41 | 41 | FileSystem::make($output); |
42 | - return $output .'/'. $this->name.'.php'; |
|
42 | + return $output.'/'.$this->name.'.php'; |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function getRenderedString() |
61 | 61 | { |
62 | 62 | $this->application->debug()->time('render '.$this->name); |
63 | - $code = parent::getRenderedString(); |
|
63 | + $code = parent::getRenderedString(); |
|
64 | 64 | $this->application->debug()->timeEnd('render '.$this->name); |
65 | 65 | return $code; |
66 | 66 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | } |
77 | 77 | return $this->application->getUrl($this->request, $name, $values ?? [], true, $this->module, $this->group); |
78 | 78 | } elseif (is_array($name) && is_string($defaultName)) { |
79 | - return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name) , true, $this->module, $this->group); |
|
79 | + return $this->application->getUrl($this->request, $defaultName, array_merge($this->request->get() ?? [], $name), true, $this->module, $this->group); |
|
80 | 80 | } elseif (is_string($defaultName)) { |
81 | 81 | return $this->application->getUrl($this->request, $defaultName, $this->request->get() ?? [], true, $this->module, $this->group); |
82 | 82 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | if ($this->request->getAttribute('route') === $full) { |
96 | 96 | if (is_array($parameter)) { |
97 | 97 | foreach ($parameter as $key => $value) { |
98 | - if ($this->request->getQuery($key) != $value){ |
|
98 | + if ($this->request->getQuery($key) != $value) { |
|
99 | 99 | return false; |
100 | 100 | } |
101 | 101 | } |