@@ -16,11 +16,11 @@ |
||
16 | 16 | */ |
17 | 17 | private function writeJson(ResponseInterface $response, mixed $payload, int $code = 200): ResponseInterface |
18 | 18 | { |
19 | - if ($payload instanceof \JsonSerializable) { |
|
19 | + if ($payload instanceof \JsonSerializable){ |
|
20 | 20 | $payload = $payload->jsonSerialize(); |
21 | 21 | } |
22 | 22 | |
23 | - if (\is_array($payload) && isset($payload['status']) && \is_int($payload['status'])) { |
|
23 | + if (\is_array($payload) && isset($payload['status']) && \is_int($payload['status'])){ |
|
24 | 24 | $code = $payload['status']; |
25 | 25 | } |
26 | 26 |
@@ -16,11 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | private function writeJson(ResponseInterface $response, mixed $payload, int $code = 200): ResponseInterface |
18 | 18 | { |
19 | - if ($payload instanceof \JsonSerializable) { |
|
19 | + if ($payload instanceof \JsonSerializable) |
|
20 | + { |
|
20 | 21 | $payload = $payload->jsonSerialize(); |
21 | 22 | } |
22 | 23 | |
23 | - if (\is_array($payload) && isset($payload['status']) && \is_int($payload['status'])) { |
|
24 | + if (\is_array($payload) && isset($payload['status']) && \is_int($payload['status'])) |
|
25 | + { |
|
24 | 26 | $code = $payload['status']; |
25 | 27 | } |
26 | 28 |
@@ -12,6 +12,6 @@ |
||
12 | 12 | public function __construct( |
13 | 13 | public readonly ServerRequestInterface $request, |
14 | 14 | public readonly MiddlewareInterface $middleware |
15 | - ) { |
|
15 | + ){ |
|
16 | 16 | } |
17 | 17 | } |
@@ -12,6 +12,6 @@ |
||
12 | 12 | public function __construct( |
13 | 13 | public readonly ServerRequestInterface $request, |
14 | 14 | public readonly ResponseInterface $response |
15 | - ) { |
|
15 | + ){ |
|
16 | 16 | } |
17 | 17 | } |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | { |
16 | 16 | public function __construct( |
17 | 17 | private readonly array $data, |
18 | - private readonly int|string $prefix = '' |
|
19 | - ) { |
|
18 | + private readonly int | string $prefix = '' |
|
19 | + ){ |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function __debugInfo(): array |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | |
32 | 32 | public function all(): array |
33 | 33 | { |
34 | - try { |
|
34 | + try{ |
|
35 | 35 | return $this->dotGet(''); |
36 | - } catch (DotNotFoundException) { |
|
36 | + }catch (DotNotFoundException){ |
|
37 | 37 | return []; |
38 | 38 | } |
39 | 39 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | public function fetch(array $keys, bool $fill = false, mixed $filler = null): array |
53 | 53 | { |
54 | 54 | $result = \array_intersect_key($this->all(), \array_flip($keys)); |
55 | - if (!$fill) { |
|
55 | + if (!$fill){ |
|
56 | 56 | return $result; |
57 | 57 | } |
58 | 58 | |
@@ -62,11 +62,11 @@ discard block |
||
62 | 62 | /** |
63 | 63 | * Check if field presented (can be empty) by it's name. Dot notation allowed. |
64 | 64 | */ |
65 | - public function has(int|string $name): bool |
|
65 | + public function has(int | string $name): bool |
|
66 | 66 | { |
67 | - try { |
|
67 | + try{ |
|
68 | 68 | $this->dotGet($name); |
69 | - } catch (DotNotFoundException) { |
|
69 | + }catch (DotNotFoundException){ |
|
70 | 70 | return false; |
71 | 71 | } |
72 | 72 | |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | |
76 | 76 | public function offsetExists(mixed $offset): bool |
77 | 77 | { |
78 | - try { |
|
78 | + try{ |
|
79 | 79 | return !\is_null($this->dotGet($offset)); |
80 | - } catch (DotNotFoundException) { |
|
80 | + }catch (DotNotFoundException){ |
|
81 | 81 | return false; |
82 | 82 | } |
83 | 83 | } |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | /** |
91 | 91 | * Get property or return default value. Dot notation allowed. |
92 | 92 | */ |
93 | - public function get(int|string $name, mixed $default = null): mixed |
|
93 | + public function get(int | string $name, mixed $default = null): mixed |
|
94 | 94 | { |
95 | - try { |
|
95 | + try{ |
|
96 | 96 | return $this->dotGet($name); |
97 | - } catch (DotNotFoundException) { |
|
97 | + }catch (DotNotFoundException){ |
|
98 | 98 | return $default; |
99 | 99 | } |
100 | 100 | } |
@@ -120,20 +120,20 @@ discard block |
||
120 | 120 | * |
121 | 121 | * @throws DotNotFoundException |
122 | 122 | */ |
123 | - private function dotGet(int|string $name): mixed |
|
123 | + private function dotGet(int | string $name): mixed |
|
124 | 124 | { |
125 | 125 | $data = $this->data; |
126 | 126 | |
127 | 127 | //Generating path relative to a given name and prefix |
128 | - $path = (empty($this->prefix) ? '' : $this->prefix . '.') . $name; |
|
129 | - if (empty($path)) { |
|
128 | + $path = (empty($this->prefix) ? '' : $this->prefix.'.').$name; |
|
129 | + if (empty($path)){ |
|
130 | 130 | return $data; |
131 | 131 | } |
132 | 132 | |
133 | 133 | $path = \explode('.', \rtrim($path, '.')); |
134 | 134 | |
135 | - foreach ($path as $step) { |
|
136 | - if (!\is_array($data) || !\array_key_exists($step, $data)) { |
|
135 | + foreach ($path as $step){ |
|
136 | + if (!\is_array($data) || !\array_key_exists($step, $data)){ |
|
137 | 137 | throw new DotNotFoundException(\sprintf("Unable to find requested element '%s'.", $name)); |
138 | 138 | } |
139 | 139 |
@@ -31,9 +31,12 @@ discard block |
||
31 | 31 | |
32 | 32 | public function all(): array |
33 | 33 | { |
34 | - try { |
|
34 | + try |
|
35 | + { |
|
35 | 36 | return $this->dotGet(''); |
36 | - } catch (DotNotFoundException) { |
|
37 | + } |
|
38 | + catch (DotNotFoundException) |
|
39 | + { |
|
37 | 40 | return []; |
38 | 41 | } |
39 | 42 | } |
@@ -52,7 +55,8 @@ discard block |
||
52 | 55 | public function fetch(array $keys, bool $fill = false, mixed $filler = null): array |
53 | 56 | { |
54 | 57 | $result = \array_intersect_key($this->all(), \array_flip($keys)); |
55 | - if (!$fill) { |
|
58 | + if (!$fill) |
|
59 | + { |
|
56 | 60 | return $result; |
57 | 61 | } |
58 | 62 | |
@@ -64,9 +68,12 @@ discard block |
||
64 | 68 | */ |
65 | 69 | public function has(int|string $name): bool |
66 | 70 | { |
67 | - try { |
|
71 | + try |
|
72 | + { |
|
68 | 73 | $this->dotGet($name); |
69 | - } catch (DotNotFoundException) { |
|
74 | + } |
|
75 | + catch (DotNotFoundException) |
|
76 | + { |
|
70 | 77 | return false; |
71 | 78 | } |
72 | 79 | |
@@ -75,9 +82,12 @@ discard block |
||
75 | 82 | |
76 | 83 | public function offsetExists(mixed $offset): bool |
77 | 84 | { |
78 | - try { |
|
85 | + try |
|
86 | + { |
|
79 | 87 | return !\is_null($this->dotGet($offset)); |
80 | - } catch (DotNotFoundException) { |
|
88 | + } |
|
89 | + catch (DotNotFoundException) |
|
90 | + { |
|
81 | 91 | return false; |
82 | 92 | } |
83 | 93 | } |
@@ -92,9 +102,12 @@ discard block |
||
92 | 102 | */ |
93 | 103 | public function get(int|string $name, mixed $default = null): mixed |
94 | 104 | { |
95 | - try { |
|
105 | + try |
|
106 | + { |
|
96 | 107 | return $this->dotGet($name); |
97 | - } catch (DotNotFoundException) { |
|
108 | + } |
|
109 | + catch (DotNotFoundException) |
|
110 | + { |
|
98 | 111 | return $default; |
99 | 112 | } |
100 | 113 | } |
@@ -126,14 +139,17 @@ discard block |
||
126 | 139 | |
127 | 140 | //Generating path relative to a given name and prefix |
128 | 141 | $path = (empty($this->prefix) ? '' : $this->prefix . '.') . $name; |
129 | - if (empty($path)) { |
|
142 | + if (empty($path)) |
|
143 | + { |
|
130 | 144 | return $data; |
131 | 145 | } |
132 | 146 | |
133 | 147 | $path = \explode('.', \rtrim($path, '.')); |
134 | 148 | |
135 | - foreach ($path as $step) { |
|
136 | - if (!\is_array($data) || !\array_key_exists($step, $data)) { |
|
149 | + foreach ($path as $step) |
|
150 | + { |
|
151 | + if (!\is_array($data) || !\array_key_exists($step, $data)) |
|
152 | + { |
|
137 | 153 | throw new DotNotFoundException(\sprintf("Unable to find requested element '%s'.", $name)); |
138 | 154 | } |
139 | 155 |
@@ -10,14 +10,14 @@ |
||
10 | 10 | */ |
11 | 11 | final class ServerBag extends InputBag |
12 | 12 | { |
13 | - public function has(int|string $name): bool |
|
13 | + public function has(int | string $name): bool |
|
14 | 14 | { |
15 | - return parent::has($this->normalize((string) $name)); |
|
15 | + return parent::has($this->normalize((string)$name)); |
|
16 | 16 | } |
17 | 17 | |
18 | - public function get(int|string $name, mixed $default = null): mixed |
|
18 | + public function get(int | string $name, mixed $default = null): mixed |
|
19 | 19 | { |
20 | - return parent::get($this->normalize((string) $name), $default); |
|
20 | + return parent::get($this->normalize((string)$name), $default); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | public function fetch(array $keys, bool $fill = false, mixed $filler = null): array |
@@ -20,9 +20,9 @@ |
||
20 | 20 | /** |
21 | 21 | * Locale local filename (virtual filename) associated with UploadedFile resource. |
22 | 22 | */ |
23 | - public function getFilename(int|string $name): ?string |
|
23 | + public function getFilename(int | string $name): ?string |
|
24 | 24 | { |
25 | - if (!empty($file = $this->get($name)) && !$file->getError()) { |
|
25 | + if (!empty($file = $this->get($name)) && !$file->getError()){ |
|
26 | 26 | return StreamWrapper::getFilename($file->getStream()); |
27 | 27 | } |
28 | 28 |
@@ -22,7 +22,8 @@ |
||
22 | 22 | */ |
23 | 23 | public function getFilename(int|string $name): ?string |
24 | 24 | { |
25 | - if (!empty($file = $this->get($name)) && !$file->getError()) { |
|
25 | + if (!empty($file = $this->get($name)) && !$file->getError()) |
|
26 | + { |
|
26 | 27 | return StreamWrapper::getFilename($file->getStream()); |
27 | 28 | } |
28 | 29 |
@@ -10,19 +10,19 @@ discard block |
||
10 | 10 | */ |
11 | 11 | final class HeadersBag extends InputBag |
12 | 12 | { |
13 | - public function has(int|string $name): bool |
|
13 | + public function has(int | string $name): bool |
|
14 | 14 | { |
15 | - return parent::has($this->normalize((string) $name)); |
|
15 | + return parent::has($this->normalize((string)$name)); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @param false|string $implode Implode header lines, false to return header as array. |
20 | 20 | */ |
21 | - public function get(int|string $name, mixed $default = null, bool|string $implode = ','): array|string|null |
|
21 | + public function get(int | string $name, mixed $default = null, bool | string $implode = ','): array | string | null |
|
22 | 22 | { |
23 | - $value = parent::get($this->normalize((string) $name), $default); |
|
23 | + $value = parent::get($this->normalize((string)$name), $default); |
|
24 | 24 | |
25 | - if (\is_string($implode) && !empty($implode) && \is_array($value)) { |
|
25 | + if (\is_string($implode) && !empty($implode) && \is_array($value)){ |
|
26 | 26 | return \implode($implode, $value); |
27 | 27 | } |
28 | 28 | |
@@ -34,12 +34,12 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function fetch(array $keys, bool $fill = false, mixed $filler = null, ?string $implode = ','): array |
36 | 36 | { |
37 | - $keys = \array_map(fn (string $header): string => $this->normalize($header), $keys); |
|
37 | + $keys = \array_map(fn (string $header) : string => $this->normalize($header), $keys); |
|
38 | 38 | |
39 | 39 | $values = parent::fetch($keys, $fill, $filler); |
40 | 40 | |
41 | - if (!empty($implode)) { |
|
42 | - foreach ($values as &$value) { |
|
41 | + if (!empty($implode)){ |
|
42 | + foreach ($values as &$value){ |
|
43 | 43 | $value = \implode($implode, $value); |
44 | 44 | unset($value); |
45 | 45 | } |
@@ -22,7 +22,8 @@ discard block |
||
22 | 22 | { |
23 | 23 | $value = parent::get($this->normalize((string) $name), $default); |
24 | 24 | |
25 | - if (\is_string($implode) && !empty($implode) && \is_array($value)) { |
|
25 | + if (\is_string($implode) && !empty($implode) && \is_array($value)) |
|
26 | + { |
|
26 | 27 | return \implode($implode, $value); |
27 | 28 | } |
28 | 29 | |
@@ -38,8 +39,10 @@ discard block |
||
38 | 39 | |
39 | 40 | $values = parent::fetch($keys, $fill, $filler); |
40 | 41 | |
41 | - if (!empty($implode)) { |
|
42 | - foreach ($values as &$value) { |
|
42 | + if (!empty($implode)) |
|
43 | + { |
|
44 | + foreach ($values as &$value) |
|
45 | + { |
|
43 | 46 | $value = \implode($implode, $value); |
44 | 47 | unset($value); |
45 | 48 | } |
@@ -21,16 +21,16 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function __construct( |
23 | 23 | private readonly JsonPayloadConfig $config |
24 | - ) { |
|
24 | + ){ |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
28 | 28 | { |
29 | - if ($this->isJsonPayload($request)) { |
|
29 | + if ($this->isJsonPayload($request)){ |
|
30 | 30 | $body = (string)$request->getBody(); |
31 | - if ($body !== '') { |
|
31 | + if ($body !== ''){ |
|
32 | 32 | $request = $request->withParsedBody(\json_decode($body, true)); |
33 | - if (\json_last_error() !== 0) { |
|
33 | + if (\json_last_error() !== 0){ |
|
34 | 34 | throw new ClientException(400, 'invalid json payload'); |
35 | 35 | } |
36 | 36 | } |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | { |
44 | 44 | $contentType = $request->getHeaderLine('Content-Type'); |
45 | 45 | |
46 | - foreach ($this->config->getContentTypes() as $allowedType) { |
|
47 | - if (\stripos($contentType, $allowedType) === 0) { |
|
46 | + foreach ($this->config->getContentTypes() as $allowedType){ |
|
47 | + if (\stripos($contentType, $allowedType) === 0){ |
|
48 | 48 | return true; |
49 | 49 | } |
50 | 50 | } |
@@ -26,11 +26,14 @@ discard block |
||
26 | 26 | |
27 | 27 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
28 | 28 | { |
29 | - if ($this->isJsonPayload($request)) { |
|
29 | + if ($this->isJsonPayload($request)) |
|
30 | + { |
|
30 | 31 | $body = (string)$request->getBody(); |
31 | - if ($body !== '') { |
|
32 | + if ($body !== '') |
|
33 | + { |
|
32 | 34 | $request = $request->withParsedBody(\json_decode($body, true)); |
33 | - if (\json_last_error() !== 0) { |
|
35 | + if (\json_last_error() !== 0) |
|
36 | + { |
|
34 | 37 | throw new ClientException(400, 'invalid json payload'); |
35 | 38 | } |
36 | 39 | } |
@@ -43,8 +46,10 @@ discard block |
||
43 | 46 | { |
44 | 47 | $contentType = $request->getHeaderLine('Content-Type'); |
45 | 48 | |
46 | - foreach ($this->config->getContentTypes() as $allowedType) { |
|
47 | - if (\stripos($contentType, $allowedType) === 0) { |
|
49 | + foreach ($this->config->getContentTypes() as $allowedType) |
|
50 | + { |
|
51 | + if (\stripos($contentType, $allowedType) === 0) |
|
52 | + { |
|
48 | 53 | return true; |
49 | 54 | } |
50 | 55 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | public function __construct( |
25 | 25 | callable $callable, |
26 | 26 | private readonly ResponseFactoryInterface $responseFactory |
27 | - ) { |
|
27 | + ){ |
|
28 | 28 | $this->callable = $callable; |
29 | 29 | } |
30 | 30 | |
@@ -39,21 +39,21 @@ discard block |
||
39 | 39 | $output = $result = null; |
40 | 40 | |
41 | 41 | $response = $this->responseFactory->createResponse(200); |
42 | - try { |
|
42 | + try{ |
|
43 | 43 | $result = \call_user_func($this->callable, $request, $response); |
44 | - } catch (\Throwable $e) { |
|
44 | + }catch (\Throwable $e){ |
|
45 | 45 | \ob_get_clean(); |
46 | 46 | throw $e; |
47 | - } finally { |
|
48 | - while (\ob_get_level() > $outputLevel + 1) { |
|
49 | - $output = \ob_get_clean() . $output; |
|
47 | + }finally{ |
|
48 | + while (\ob_get_level() > $outputLevel + 1){ |
|
49 | + $output = \ob_get_clean().$output; |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | 53 | return $this->wrapResponse( |
54 | 54 | $response, |
55 | 55 | $result, |
56 | - \ob_get_clean() . $output |
|
56 | + \ob_get_clean().$output |
|
57 | 57 | ); |
58 | 58 | } |
59 | 59 | |
@@ -66,17 +66,17 @@ discard block |
||
66 | 66 | */ |
67 | 67 | private function wrapResponse(Response $response, mixed $result = null, string $output = ''): Response |
68 | 68 | { |
69 | - if ($result instanceof Response) { |
|
70 | - if (!empty($output) && $result->getBody()->isWritable()) { |
|
69 | + if ($result instanceof Response){ |
|
70 | + if (!empty($output) && $result->getBody()->isWritable()){ |
|
71 | 71 | $result->getBody()->write($output); |
72 | 72 | } |
73 | 73 | |
74 | 74 | return $result; |
75 | 75 | } |
76 | 76 | |
77 | - if (\is_array($result) || $result instanceof \JsonSerializable) { |
|
77 | + if (\is_array($result) || $result instanceof \JsonSerializable){ |
|
78 | 78 | $response = $this->writeJson($response, $result); |
79 | - } else { |
|
79 | + }else{ |
|
80 | 80 | $response->getBody()->write((string)$result); |
81 | 81 | } |
82 | 82 |
@@ -39,13 +39,19 @@ discard block |
||
39 | 39 | $output = $result = null; |
40 | 40 | |
41 | 41 | $response = $this->responseFactory->createResponse(200); |
42 | - try { |
|
42 | + try |
|
43 | + { |
|
43 | 44 | $result = \call_user_func($this->callable, $request, $response); |
44 | - } catch (\Throwable $e) { |
|
45 | + } |
|
46 | + catch (\Throwable $e) |
|
47 | + { |
|
45 | 48 | \ob_get_clean(); |
46 | 49 | throw $e; |
47 | - } finally { |
|
48 | - while (\ob_get_level() > $outputLevel + 1) { |
|
50 | + } |
|
51 | + finally |
|
52 | + { |
|
53 | + while (\ob_get_level() > $outputLevel + 1) |
|
54 | + { |
|
49 | 55 | $output = \ob_get_clean() . $output; |
50 | 56 | } |
51 | 57 | } |
@@ -66,17 +72,22 @@ discard block |
||
66 | 72 | */ |
67 | 73 | private function wrapResponse(Response $response, mixed $result = null, string $output = ''): Response |
68 | 74 | { |
69 | - if ($result instanceof Response) { |
|
70 | - if (!empty($output) && $result->getBody()->isWritable()) { |
|
75 | + if ($result instanceof Response) |
|
76 | + { |
|
77 | + if (!empty($output) && $result->getBody()->isWritable()) |
|
78 | + { |
|
71 | 79 | $result->getBody()->write($output); |
72 | 80 | } |
73 | 81 | |
74 | 82 | return $result; |
75 | 83 | } |
76 | 84 | |
77 | - if (\is_array($result) || $result instanceof \JsonSerializable) { |
|
85 | + if (\is_array($result) || $result instanceof \JsonSerializable) |
|
86 | + { |
|
78 | 87 | $response = $this->writeJson($response, $result); |
79 | - } else { |
|
88 | + } |
|
89 | + else |
|
90 | + { |
|
80 | 91 | $response->getBody()->write((string)$result); |
81 | 92 | } |
82 | 93 |