@@ -46,24 +46,24 @@ discard block |
||
46 | 46 | public function trimValue(): array |
47 | 47 | { |
48 | 48 | $value = $this->value; |
49 | - if ($value instanceof Nil) { |
|
49 | + if ($value instanceof Nil){ |
|
50 | 50 | return []; |
51 | 51 | } |
52 | 52 | |
53 | - if (is_string($value)) { |
|
53 | + if (is_string($value)){ |
|
54 | 54 | return [new Raw(trim($value, '\'"'))]; |
55 | 55 | } |
56 | 56 | |
57 | - if (!$value instanceof Mixin) { |
|
57 | + if (!$value instanceof Mixin){ |
|
58 | 58 | return [$value]; |
59 | 59 | } |
60 | 60 | |
61 | 61 | // trim mixin quotes |
62 | 62 | $nodes = $value->nodes; |
63 | 63 | |
64 | - if (count($nodes) >= 3 && $nodes[0] instanceof Raw && $nodes[count($nodes) - 1] instanceof Raw) { |
|
64 | + if (count($nodes) >= 3 && $nodes[0] instanceof Raw && $nodes[count($nodes) - 1] instanceof Raw){ |
|
65 | 65 | $quote = $nodes[0]->content[0]; |
66 | - if (!in_array($quote, ['"', '\''])) { |
|
66 | + if (!in_array($quote, ['"', '\''])){ |
|
67 | 67 | return $nodes; |
68 | 68 | } |
69 | 69 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | ); |
74 | 74 | } |
75 | 75 | |
76 | - foreach ($nodes as $index => $node) { |
|
77 | - if ($node instanceof Raw && $node->content === '') { |
|
76 | + foreach ($nodes as $index => $node){ |
|
77 | + if ($node instanceof Raw && $node->content === ''){ |
|
78 | 78 | unset($nodes[$index]); |
79 | 79 | } |
80 | 80 | } |
@@ -46,24 +46,29 @@ discard block |
||
46 | 46 | public function trimValue(): array |
47 | 47 | { |
48 | 48 | $value = $this->value; |
49 | - if ($value instanceof Nil) { |
|
49 | + if ($value instanceof Nil) |
|
50 | + { |
|
50 | 51 | return []; |
51 | 52 | } |
52 | 53 | |
53 | - if (is_string($value)) { |
|
54 | + if (is_string($value)) |
|
55 | + { |
|
54 | 56 | return [new Raw(trim($value, '\'"'))]; |
55 | 57 | } |
56 | 58 | |
57 | - if (!$value instanceof Mixin) { |
|
59 | + if (!$value instanceof Mixin) |
|
60 | + { |
|
58 | 61 | return [$value]; |
59 | 62 | } |
60 | 63 | |
61 | 64 | // trim mixin quotes |
62 | 65 | $nodes = $value->nodes; |
63 | 66 | |
64 | - if (count($nodes) >= 3 && $nodes[0] instanceof Raw && $nodes[count($nodes) - 1] instanceof Raw) { |
|
67 | + if (count($nodes) >= 3 && $nodes[0] instanceof Raw && $nodes[count($nodes) - 1] instanceof Raw) |
|
68 | + { |
|
65 | 69 | $quote = $nodes[0]->content[0]; |
66 | - if (!in_array($quote, ['"', '\''])) { |
|
70 | + if (!in_array($quote, ['"', '\''])) |
|
71 | + { |
|
67 | 72 | return $nodes; |
68 | 73 | } |
69 | 74 | |
@@ -73,8 +78,10 @@ discard block |
||
73 | 78 | ); |
74 | 79 | } |
75 | 80 | |
76 | - foreach ($nodes as $index => $node) { |
|
77 | - if ($node instanceof Raw && $node->content === '') { |
|
81 | + foreach ($nodes as $index => $node) |
|
82 | + { |
|
83 | + if ($node instanceof Raw && $node->content === '') |
|
84 | + { |
|
78 | 85 | unset($nodes[$index]); |
79 | 86 | } |
80 | 87 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | UriFactoryInterface $uriFactory, |
78 | 78 | StreamFactoryInterface $streamFactory, |
79 | 79 | UploadedFileFactoryInterface $uploadedFileFactory |
80 | - ) { |
|
80 | + ){ |
|
81 | 81 | $this->requestFactory = $requestFactory; |
82 | 82 | $this->uriFactory = $uriFactory; |
83 | 83 | $this->streamFactory = $streamFactory; |
@@ -124,12 +124,12 @@ discard block |
||
124 | 124 | $uri = $this->getUri($server); |
125 | 125 | |
126 | 126 | $request = $this->requestFactory->createServerRequest($method, $uri, $server); |
127 | - foreach ($headers as $name => $value) { |
|
127 | + foreach ($headers as $name => $value){ |
|
128 | 128 | $request = $request->withAddedHeader($name, $value); |
129 | 129 | } |
130 | 130 | |
131 | 131 | $protocol = '1.1'; |
132 | - if (!empty($_SERVER['SERVER_PROTOCOL'])) { |
|
132 | + if (!empty($_SERVER['SERVER_PROTOCOL'])){ |
|
133 | 133 | $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']); |
134 | 134 | } |
135 | 135 | |
@@ -140,15 +140,15 @@ discard block |
||
140 | 140 | ->withCookieParams($cookies) |
141 | 141 | ->withUploadedFiles($this->getUploadedFilesArray($files)); |
142 | 142 | |
143 | - if ($body === null) { |
|
143 | + if ($body === null){ |
|
144 | 144 | return $request; |
145 | 145 | } |
146 | 146 | |
147 | - if (\is_resource($body)) { |
|
147 | + if (\is_resource($body)){ |
|
148 | 148 | $body = $this->streamFactory->createStreamFromResource($body); |
149 | - } elseif (\is_string($body)) { |
|
149 | + } elseif (\is_string($body)){ |
|
150 | 150 | $body = $this->streamFactory->createStream($body); |
151 | - } elseif (!$body instanceof StreamInterface) { |
|
151 | + } elseif (!$body instanceof StreamInterface){ |
|
152 | 152 | throw new \InvalidArgumentException( |
153 | 153 | 'Body parameter for ServerRequestFactory::createFromParameters() ' |
154 | 154 | . 'must be instance of StreamInterface, resource or null.' |
@@ -165,29 +165,29 @@ discard block |
||
165 | 165 | private function getUri(array $server): UriInterface |
166 | 166 | { |
167 | 167 | $uri = $this->uriFactory->createUri(); |
168 | - if (isset($server['HTTPS'])) { |
|
168 | + if (isset($server['HTTPS'])){ |
|
169 | 169 | $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http'); |
170 | 170 | } |
171 | 171 | |
172 | - if (isset($server['HTTP_HOST'])) { |
|
173 | - if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) { |
|
172 | + if (isset($server['HTTP_HOST'])){ |
|
173 | + if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)){ |
|
174 | 174 | $uri = $uri->withHost($matches[1])->withPort($matches[2]); |
175 | - } else { |
|
175 | + }else{ |
|
176 | 176 | $uri = $uri->withHost($server['HTTP_HOST']); |
177 | 177 | } |
178 | - } elseif (isset($server['SERVER_NAME'])) { |
|
178 | + } elseif (isset($server['SERVER_NAME'])){ |
|
179 | 179 | $uri = $uri->withHost($server['SERVER_NAME']); |
180 | 180 | } |
181 | 181 | |
182 | - if (isset($server['SERVER_PORT'])) { |
|
182 | + if (isset($server['SERVER_PORT'])){ |
|
183 | 183 | $uri = $uri->withPort($server['SERVER_PORT']); |
184 | 184 | } |
185 | 185 | |
186 | - if (isset($server['REQUEST_URI'])) { |
|
186 | + if (isset($server['REQUEST_URI'])){ |
|
187 | 187 | $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]); |
188 | 188 | } |
189 | 189 | |
190 | - if (isset($server['QUERY_STRING'])) { |
|
190 | + if (isset($server['QUERY_STRING'])){ |
|
191 | 191 | $uri = $uri->withQuery($server['QUERY_STRING']); |
192 | 192 | } |
193 | 193 | |
@@ -199,12 +199,12 @@ discard block |
||
199 | 199 | */ |
200 | 200 | private static function getHeadersFromGlobals(): array |
201 | 201 | { |
202 | - if (\function_exists('getallheaders')) { |
|
202 | + if (\function_exists('getallheaders')){ |
|
203 | 203 | $headers = getallheaders(); |
204 | - } else { |
|
204 | + }else{ |
|
205 | 205 | $headers = []; |
206 | - foreach ($_SERVER as $name => $value) { |
|
207 | - if (strncmp($name, 'HTTP_', 5) === 0) { |
|
206 | + foreach ($_SERVER as $name => $value){ |
|
207 | + if (strncmp($name, 'HTTP_', 5) === 0){ |
|
208 | 208 | $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5))))); |
209 | 209 | $headers[$name] = $value; |
210 | 210 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | private function getUploadedFilesArray(array $filesArray): array |
222 | 222 | { |
223 | 223 | $files = []; |
224 | - foreach ($filesArray as $class => $info) { |
|
224 | + foreach ($filesArray as $class => $info){ |
|
225 | 225 | $files[$class] = []; |
226 | 226 | $this->populateUploadedFileRecursive( |
227 | 227 | $files[$class], |
@@ -249,8 +249,8 @@ discard block |
||
249 | 249 | */ |
250 | 250 | private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void |
251 | 251 | { |
252 | - if (\is_array($names)) { |
|
253 | - foreach ($names as $i => $name) { |
|
252 | + if (\is_array($names)){ |
|
253 | + foreach ($names as $i => $name){ |
|
254 | 254 | $files[$i] = []; |
255 | 255 | $this->populateUploadedFileRecursive( |
256 | 256 | $files[$i], |
@@ -261,10 +261,10 @@ discard block |
||
261 | 261 | $errors[$i] |
262 | 262 | ); |
263 | 263 | } |
264 | - } else { |
|
265 | - try { |
|
264 | + }else{ |
|
265 | + try{ |
|
266 | 266 | $stream = $this->streamFactory->createStreamFromFile($tempNames); |
267 | - } catch (\RuntimeException $e) { |
|
267 | + }catch (\RuntimeException $e){ |
|
268 | 268 | $stream = $this->streamFactory->createStream(); |
269 | 269 | } |
270 | 270 |
@@ -124,12 +124,14 @@ discard block |
||
124 | 124 | $uri = $this->getUri($server); |
125 | 125 | |
126 | 126 | $request = $this->requestFactory->createServerRequest($method, $uri, $server); |
127 | - foreach ($headers as $name => $value) { |
|
127 | + foreach ($headers as $name => $value) |
|
128 | + { |
|
128 | 129 | $request = $request->withAddedHeader($name, $value); |
129 | 130 | } |
130 | 131 | |
131 | 132 | $protocol = '1.1'; |
132 | - if (!empty($_SERVER['SERVER_PROTOCOL'])) { |
|
133 | + if (!empty($_SERVER['SERVER_PROTOCOL'])) |
|
134 | + { |
|
133 | 135 | $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']); |
134 | 136 | } |
135 | 137 | |
@@ -140,15 +142,21 @@ discard block |
||
140 | 142 | ->withCookieParams($cookies) |
141 | 143 | ->withUploadedFiles($this->getUploadedFilesArray($files)); |
142 | 144 | |
143 | - if ($body === null) { |
|
145 | + if ($body === null) |
|
146 | + { |
|
144 | 147 | return $request; |
145 | 148 | } |
146 | 149 | |
147 | - if (\is_resource($body)) { |
|
150 | + if (\is_resource($body)) |
|
151 | + { |
|
148 | 152 | $body = $this->streamFactory->createStreamFromResource($body); |
149 | - } elseif (\is_string($body)) { |
|
153 | + } |
|
154 | + elseif (\is_string($body)) |
|
155 | + { |
|
150 | 156 | $body = $this->streamFactory->createStream($body); |
151 | - } elseif (!$body instanceof StreamInterface) { |
|
157 | + } |
|
158 | + elseif (!$body instanceof StreamInterface) |
|
159 | + { |
|
152 | 160 | throw new \InvalidArgumentException( |
153 | 161 | 'Body parameter for ServerRequestFactory::createFromParameters() ' |
154 | 162 | . 'must be instance of StreamInterface, resource or null.' |
@@ -165,29 +173,39 @@ discard block |
||
165 | 173 | private function getUri(array $server): UriInterface |
166 | 174 | { |
167 | 175 | $uri = $this->uriFactory->createUri(); |
168 | - if (isset($server['HTTPS'])) { |
|
176 | + if (isset($server['HTTPS'])) |
|
177 | + { |
|
169 | 178 | $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http'); |
170 | 179 | } |
171 | 180 | |
172 | - if (isset($server['HTTP_HOST'])) { |
|
173 | - if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) { |
|
181 | + if (isset($server['HTTP_HOST'])) |
|
182 | + { |
|
183 | + if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) |
|
184 | + { |
|
174 | 185 | $uri = $uri->withHost($matches[1])->withPort($matches[2]); |
175 | - } else { |
|
186 | + } |
|
187 | + else |
|
188 | + { |
|
176 | 189 | $uri = $uri->withHost($server['HTTP_HOST']); |
177 | 190 | } |
178 | - } elseif (isset($server['SERVER_NAME'])) { |
|
191 | + } |
|
192 | + elseif (isset($server['SERVER_NAME'])) |
|
193 | + { |
|
179 | 194 | $uri = $uri->withHost($server['SERVER_NAME']); |
180 | 195 | } |
181 | 196 | |
182 | - if (isset($server['SERVER_PORT'])) { |
|
197 | + if (isset($server['SERVER_PORT'])) |
|
198 | + { |
|
183 | 199 | $uri = $uri->withPort($server['SERVER_PORT']); |
184 | 200 | } |
185 | 201 | |
186 | - if (isset($server['REQUEST_URI'])) { |
|
202 | + if (isset($server['REQUEST_URI'])) |
|
203 | + { |
|
187 | 204 | $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]); |
188 | 205 | } |
189 | 206 | |
190 | - if (isset($server['QUERY_STRING'])) { |
|
207 | + if (isset($server['QUERY_STRING'])) |
|
208 | + { |
|
191 | 209 | $uri = $uri->withQuery($server['QUERY_STRING']); |
192 | 210 | } |
193 | 211 | |
@@ -199,12 +217,17 @@ discard block |
||
199 | 217 | */ |
200 | 218 | private static function getHeadersFromGlobals(): array |
201 | 219 | { |
202 | - if (\function_exists('getallheaders')) { |
|
220 | + if (\function_exists('getallheaders')) |
|
221 | + { |
|
203 | 222 | $headers = getallheaders(); |
204 | - } else { |
|
223 | + } |
|
224 | + else |
|
225 | + { |
|
205 | 226 | $headers = []; |
206 | - foreach ($_SERVER as $name => $value) { |
|
207 | - if (strncmp($name, 'HTTP_', 5) === 0) { |
|
227 | + foreach ($_SERVER as $name => $value) |
|
228 | + { |
|
229 | + if (strncmp($name, 'HTTP_', 5) === 0) |
|
230 | + { |
|
208 | 231 | $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5))))); |
209 | 232 | $headers[$name] = $value; |
210 | 233 | } |
@@ -221,7 +244,8 @@ discard block |
||
221 | 244 | private function getUploadedFilesArray(array $filesArray): array |
222 | 245 | { |
223 | 246 | $files = []; |
224 | - foreach ($filesArray as $class => $info) { |
|
247 | + foreach ($filesArray as $class => $info) |
|
248 | + { |
|
225 | 249 | $files[$class] = []; |
226 | 250 | $this->populateUploadedFileRecursive( |
227 | 251 | $files[$class], |
@@ -249,8 +273,10 @@ discard block |
||
249 | 273 | */ |
250 | 274 | private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void |
251 | 275 | { |
252 | - if (\is_array($names)) { |
|
253 | - foreach ($names as $i => $name) { |
|
276 | + if (\is_array($names)) |
|
277 | + { |
|
278 | + foreach ($names as $i => $name) |
|
279 | + { |
|
254 | 280 | $files[$i] = []; |
255 | 281 | $this->populateUploadedFileRecursive( |
256 | 282 | $files[$i], |
@@ -261,10 +287,15 @@ discard block |
||
261 | 287 | $errors[$i] |
262 | 288 | ); |
263 | 289 | } |
264 | - } else { |
|
265 | - try { |
|
290 | + } |
|
291 | + else |
|
292 | + { |
|
293 | + try |
|
294 | + { |
|
266 | 295 | $stream = $this->streamFactory->createStreamFromFile($tempNames); |
267 | - } catch (\RuntimeException $e) { |
|
296 | + } |
|
297 | + catch (\RuntimeException $e) |
|
298 | + { |
|
268 | 299 | $stream = $this->streamFactory->createStream(); |
269 | 300 | } |
270 | 301 |
@@ -46,17 +46,17 @@ discard block |
||
46 | 46 | $entities = $this->getDeclaredEntities($controller, $action); |
47 | 47 | |
48 | 48 | $contextCandidates = []; |
49 | - foreach ($entities as $parameter => $role) { |
|
49 | + foreach ($entities as $parameter => $role){ |
|
50 | 50 | $value = $this->getParameter($parameter, $parameters, count($entities) === 1); |
51 | - if ($value === null) { |
|
51 | + if ($value === null){ |
|
52 | 52 | throw new ControllerException( |
53 | 53 | "Entity `{$parameter}` can not be found", |
54 | 54 | ControllerException::NOT_FOUND |
55 | 55 | ); |
56 | 56 | } |
57 | 57 | |
58 | - if (is_object($value)) { |
|
59 | - if ($this->orm->getHeap()->has($value)) { |
|
58 | + if (is_object($value)){ |
|
59 | + if ($this->orm->getHeap()->has($value)){ |
|
60 | 60 | $contextCandidates[] = $value; |
61 | 61 | } |
62 | 62 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | $entity = $this->resolveEntity($role, $value); |
68 | - if ($entity === null) { |
|
68 | + if ($entity === null){ |
|
69 | 69 | throw new ControllerException( |
70 | 70 | "Entity `{$parameter}` can not be found", |
71 | 71 | ControllerException::NOT_FOUND |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $contextCandidates[] = $entity; |
77 | 77 | } |
78 | 78 | |
79 | - if (!isset($parameters['@context']) && count($contextCandidates) === 1) { |
|
79 | + if (!isset($parameters['@context']) && count($contextCandidates) === 1){ |
|
80 | 80 | $parameters['@context'] = current($contextCandidates); |
81 | 81 | } |
82 | 82 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | */ |
92 | 92 | protected function getParameter(string $role, array $parameters, bool $useDefault = false) |
93 | 93 | { |
94 | - if (!$useDefault) { |
|
94 | + if (!$useDefault){ |
|
95 | 95 | return $parameters[$role] ?? null; |
96 | 96 | } |
97 | 97 | |
@@ -116,25 +116,25 @@ discard block |
||
116 | 116 | private function getDeclaredEntities(string $controller, string $action): array |
117 | 117 | { |
118 | 118 | $key = sprintf('%s:%s', $controller, $action); |
119 | - if (array_key_exists($key, $this->cache)) { |
|
119 | + if (array_key_exists($key, $this->cache)){ |
|
120 | 120 | return $this->cache[$key]; |
121 | 121 | } |
122 | 122 | |
123 | 123 | $this->cache[$key] = []; |
124 | - try { |
|
124 | + try{ |
|
125 | 125 | $method = new \ReflectionMethod($controller, $action); |
126 | - } catch (\ReflectionException $e) { |
|
126 | + }catch (\ReflectionException $e){ |
|
127 | 127 | return []; |
128 | 128 | } |
129 | 129 | |
130 | - foreach ($method->getParameters() as $parameter) { |
|
130 | + foreach ($method->getParameters() as $parameter){ |
|
131 | 131 | $class = $this->getParameterClass($parameter); |
132 | 132 | |
133 | - if ($class === null) { |
|
133 | + if ($class === null){ |
|
134 | 134 | continue; |
135 | 135 | } |
136 | 136 | |
137 | - if ($this->orm->getSchema()->defines($class->getName())) { |
|
137 | + if ($this->orm->getSchema()->defines($class->getName())){ |
|
138 | 138 | $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($class->getName()); |
139 | 139 | } |
140 | 140 | } |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | { |
151 | 151 | $type = $parameter->getType(); |
152 | 152 | |
153 | - if (!$type instanceof \ReflectionNamedType) { |
|
153 | + if (!$type instanceof \ReflectionNamedType){ |
|
154 | 154 | return null; |
155 | 155 | } |
156 | 156 | |
157 | - if ($type->isBuiltin()) { |
|
157 | + if ($type->isBuiltin()){ |
|
158 | 158 | return null; |
159 | 159 | } |
160 | 160 |
@@ -46,17 +46,21 @@ discard block |
||
46 | 46 | $entities = $this->getDeclaredEntities($controller, $action); |
47 | 47 | |
48 | 48 | $contextCandidates = []; |
49 | - foreach ($entities as $parameter => $role) { |
|
49 | + foreach ($entities as $parameter => $role) |
|
50 | + { |
|
50 | 51 | $value = $this->getParameter($parameter, $parameters, count($entities) === 1); |
51 | - if ($value === null) { |
|
52 | + if ($value === null) |
|
53 | + { |
|
52 | 54 | throw new ControllerException( |
53 | 55 | "Entity `{$parameter}` can not be found", |
54 | 56 | ControllerException::NOT_FOUND |
55 | 57 | ); |
56 | 58 | } |
57 | 59 | |
58 | - if (is_object($value)) { |
|
59 | - if ($this->orm->getHeap()->has($value)) { |
|
60 | + if (is_object($value)) |
|
61 | + { |
|
62 | + if ($this->orm->getHeap()->has($value)) |
|
63 | + { |
|
60 | 64 | $contextCandidates[] = $value; |
61 | 65 | } |
62 | 66 | |
@@ -65,7 +69,8 @@ discard block |
||
65 | 69 | } |
66 | 70 | |
67 | 71 | $entity = $this->resolveEntity($role, $value); |
68 | - if ($entity === null) { |
|
72 | + if ($entity === null) |
|
73 | + { |
|
69 | 74 | throw new ControllerException( |
70 | 75 | "Entity `{$parameter}` can not be found", |
71 | 76 | ControllerException::NOT_FOUND |
@@ -76,7 +81,8 @@ discard block |
||
76 | 81 | $contextCandidates[] = $entity; |
77 | 82 | } |
78 | 83 | |
79 | - if (!isset($parameters['@context']) && count($contextCandidates) === 1) { |
|
84 | + if (!isset($parameters['@context']) && count($contextCandidates) === 1) |
|
85 | + { |
|
80 | 86 | $parameters['@context'] = current($contextCandidates); |
81 | 87 | } |
82 | 88 | |
@@ -91,7 +97,8 @@ discard block |
||
91 | 97 | */ |
92 | 98 | protected function getParameter(string $role, array $parameters, bool $useDefault = false) |
93 | 99 | { |
94 | - if (!$useDefault) { |
|
100 | + if (!$useDefault) |
|
101 | + { |
|
95 | 102 | return $parameters[$role] ?? null; |
96 | 103 | } |
97 | 104 | |
@@ -116,25 +123,32 @@ discard block |
||
116 | 123 | private function getDeclaredEntities(string $controller, string $action): array |
117 | 124 | { |
118 | 125 | $key = sprintf('%s:%s', $controller, $action); |
119 | - if (array_key_exists($key, $this->cache)) { |
|
126 | + if (array_key_exists($key, $this->cache)) |
|
127 | + { |
|
120 | 128 | return $this->cache[$key]; |
121 | 129 | } |
122 | 130 | |
123 | 131 | $this->cache[$key] = []; |
124 | - try { |
|
132 | + try |
|
133 | + { |
|
125 | 134 | $method = new \ReflectionMethod($controller, $action); |
126 | - } catch (\ReflectionException $e) { |
|
135 | + } |
|
136 | + catch (\ReflectionException $e) |
|
137 | + { |
|
127 | 138 | return []; |
128 | 139 | } |
129 | 140 | |
130 | - foreach ($method->getParameters() as $parameter) { |
|
141 | + foreach ($method->getParameters() as $parameter) |
|
142 | + { |
|
131 | 143 | $class = $this->getParameterClass($parameter); |
132 | 144 | |
133 | - if ($class === null) { |
|
145 | + if ($class === null) |
|
146 | + { |
|
134 | 147 | continue; |
135 | 148 | } |
136 | 149 | |
137 | - if ($this->orm->getSchema()->defines($class->getName())) { |
|
150 | + if ($this->orm->getSchema()->defines($class->getName())) |
|
151 | + { |
|
138 | 152 | $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($class->getName()); |
139 | 153 | } |
140 | 154 | } |
@@ -150,11 +164,13 @@ discard block |
||
150 | 164 | { |
151 | 165 | $type = $parameter->getType(); |
152 | 166 | |
153 | - if (!$type instanceof \ReflectionNamedType) { |
|
167 | + if (!$type instanceof \ReflectionNamedType) |
|
168 | + { |
|
154 | 169 | return null; |
155 | 170 | } |
156 | 171 | |
157 | - if ($type->isBuiltin()) { |
|
172 | + if ($type->isBuiltin()) |
|
173 | + { |
|
158 | 174 | return null; |
159 | 175 | } |
160 | 176 |
@@ -49,20 +49,20 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function process(string $controller, string $action, array $parameters, CoreInterface $core) |
51 | 51 | { |
52 | - foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) { |
|
53 | - if (isset($parameters[$parameter])) { |
|
52 | + foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass){ |
|
53 | + if (isset($parameters[$parameter])){ |
|
54 | 54 | continue; |
55 | 55 | } |
56 | 56 | |
57 | 57 | /** @var FilterInterface $filter */ |
58 | 58 | $filter = $this->container->get($filterClass); |
59 | 59 | |
60 | - if (isset($parameters['@context'])) { |
|
60 | + if (isset($parameters['@context'])){ |
|
61 | 61 | // other interceptors can define the validation contex |
62 | 62 | $filter->setContext($parameters['@context']); |
63 | 63 | } |
64 | 64 | |
65 | - if (!$filter->isValid()) { |
|
65 | + if (!$filter->isValid()){ |
|
66 | 66 | return $this->renderInvalid($filter); |
67 | 67 | } |
68 | 68 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | protected function renderInvalid(FilterInterface $filter) |
82 | 82 | { |
83 | - switch ($this->strategy) { |
|
83 | + switch ($this->strategy){ |
|
84 | 84 | case self::STRATEGY_JSON_RESPONSE: |
85 | 85 | return [ |
86 | 86 | 'status' => 400, |
@@ -99,25 +99,25 @@ discard block |
||
99 | 99 | private function getDeclaredFilters(string $controller, string $action): array |
100 | 100 | { |
101 | 101 | $key = sprintf('%s:%s', $controller, $action); |
102 | - if (array_key_exists($key, $this->cache)) { |
|
102 | + if (array_key_exists($key, $this->cache)){ |
|
103 | 103 | return $this->cache[$key]; |
104 | 104 | } |
105 | 105 | |
106 | 106 | $this->cache[$key] = []; |
107 | - try { |
|
107 | + try{ |
|
108 | 108 | $method = new \ReflectionMethod($controller, $action); |
109 | - } catch (\ReflectionException $e) { |
|
109 | + }catch (\ReflectionException $e){ |
|
110 | 110 | return []; |
111 | 111 | } |
112 | 112 | |
113 | - foreach ($method->getParameters() as $parameter) { |
|
113 | + foreach ($method->getParameters() as $parameter){ |
|
114 | 114 | $class = $this->getParameterClass($parameter); |
115 | 115 | |
116 | - if ($class === null) { |
|
116 | + if ($class === null){ |
|
117 | 117 | continue; |
118 | 118 | } |
119 | 119 | |
120 | - if ($class->implementsInterface(FilterInterface::class)) { |
|
120 | + if ($class->implementsInterface(FilterInterface::class)){ |
|
121 | 121 | $this->cache[$key][$parameter->getName()] = $class->getName(); |
122 | 122 | } |
123 | 123 | } |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | { |
135 | 135 | $type = $parameter->getType(); |
136 | 136 | |
137 | - if (!$type instanceof \ReflectionNamedType) { |
|
137 | + if (!$type instanceof \ReflectionNamedType){ |
|
138 | 138 | return null; |
139 | 139 | } |
140 | 140 | |
141 | - if ($type->isBuiltin()) { |
|
141 | + if ($type->isBuiltin()){ |
|
142 | 142 | return null; |
143 | 143 | } |
144 | 144 |
@@ -49,20 +49,24 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function process(string $controller, string $action, array $parameters, CoreInterface $core) |
51 | 51 | { |
52 | - foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) { |
|
53 | - if (isset($parameters[$parameter])) { |
|
52 | + foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) |
|
53 | + { |
|
54 | + if (isset($parameters[$parameter])) |
|
55 | + { |
|
54 | 56 | continue; |
55 | 57 | } |
56 | 58 | |
57 | 59 | /** @var FilterInterface $filter */ |
58 | 60 | $filter = $this->container->get($filterClass); |
59 | 61 | |
60 | - if (isset($parameters['@context'])) { |
|
62 | + if (isset($parameters['@context'])) |
|
63 | + { |
|
61 | 64 | // other interceptors can define the validation contex |
62 | 65 | $filter->setContext($parameters['@context']); |
63 | 66 | } |
64 | 67 | |
65 | - if (!$filter->isValid()) { |
|
68 | + if (!$filter->isValid()) |
|
69 | + { |
|
66 | 70 | return $this->renderInvalid($filter); |
67 | 71 | } |
68 | 72 | |
@@ -80,7 +84,8 @@ discard block |
||
80 | 84 | */ |
81 | 85 | protected function renderInvalid(FilterInterface $filter) |
82 | 86 | { |
83 | - switch ($this->strategy) { |
|
87 | + switch ($this->strategy) |
|
88 | + { |
|
84 | 89 | case self::STRATEGY_JSON_RESPONSE: |
85 | 90 | return [ |
86 | 91 | 'status' => 400, |
@@ -99,25 +104,32 @@ discard block |
||
99 | 104 | private function getDeclaredFilters(string $controller, string $action): array |
100 | 105 | { |
101 | 106 | $key = sprintf('%s:%s', $controller, $action); |
102 | - if (array_key_exists($key, $this->cache)) { |
|
107 | + if (array_key_exists($key, $this->cache)) |
|
108 | + { |
|
103 | 109 | return $this->cache[$key]; |
104 | 110 | } |
105 | 111 | |
106 | 112 | $this->cache[$key] = []; |
107 | - try { |
|
113 | + try |
|
114 | + { |
|
108 | 115 | $method = new \ReflectionMethod($controller, $action); |
109 | - } catch (\ReflectionException $e) { |
|
116 | + } |
|
117 | + catch (\ReflectionException $e) |
|
118 | + { |
|
110 | 119 | return []; |
111 | 120 | } |
112 | 121 | |
113 | - foreach ($method->getParameters() as $parameter) { |
|
122 | + foreach ($method->getParameters() as $parameter) |
|
123 | + { |
|
114 | 124 | $class = $this->getParameterClass($parameter); |
115 | 125 | |
116 | - if ($class === null) { |
|
126 | + if ($class === null) |
|
127 | + { |
|
117 | 128 | continue; |
118 | 129 | } |
119 | 130 | |
120 | - if ($class->implementsInterface(FilterInterface::class)) { |
|
131 | + if ($class->implementsInterface(FilterInterface::class)) |
|
132 | + { |
|
121 | 133 | $this->cache[$key][$parameter->getName()] = $class->getName(); |
122 | 134 | } |
123 | 135 | } |
@@ -134,11 +146,13 @@ discard block |
||
134 | 146 | { |
135 | 147 | $type = $parameter->getType(); |
136 | 148 | |
137 | - if (!$type instanceof \ReflectionNamedType) { |
|
149 | + if (!$type instanceof \ReflectionNamedType) |
|
150 | + { |
|
138 | 151 | return null; |
139 | 152 | } |
140 | 153 | |
141 | - if ($type->isBuiltin()) { |
|
154 | + if ($type->isBuiltin()) |
|
155 | + { |
|
142 | 156 | return null; |
143 | 157 | } |
144 | 158 |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | FilesInterface $files, |
53 | 53 | DirectoriesInterface $directories |
54 | 54 | ): void { |
55 | - switch ($this->argument('type')) { |
|
55 | + switch ($this->argument('type')){ |
|
56 | 56 | case 'replace': |
57 | 57 | case 'follow': |
58 | - if ($this->isDirectory()) { |
|
58 | + if ($this->isDirectory()){ |
|
59 | 59 | $this->sprintf( |
60 | 60 | '<fg=cyan>•</fg=cyan> publish directory <comment>%s</comment> to <comment>%s</comment>', |
61 | 61 | $this->getSource($files), |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $this->getMergeMode(), |
69 | 69 | $this->getFileMode() |
70 | 70 | ); |
71 | - } else { |
|
71 | + }else{ |
|
72 | 72 | $this->sprintf( |
73 | 73 | '<fg=cyan>•</fg=cyan> publish file <comment>%s</comment> to <comment>%s</comment>', |
74 | 74 | $this->getSource($files), |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | private function getSource(FilesInterface $files): ?string |
109 | 109 | { |
110 | - if (!$this->isDirectory()) { |
|
110 | + if (!$this->isDirectory()){ |
|
111 | 111 | return $files->normalizePath($this->argument('source')); |
112 | 112 | } |
113 | 113 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | private function getTarget(FilesInterface $files, DirectoriesInterface $directories): ?string |
123 | 123 | { |
124 | 124 | $target = $this->argument('target'); |
125 | - foreach ($directories->getAll() as $alias => $value) { |
|
125 | + foreach ($directories->getAll() as $alias => $value){ |
|
126 | 126 | $target = str_replace("@{$alias}", $value, $target); |
127 | 127 | } |
128 | 128 | |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | */ |
135 | 135 | private function isDirectory(): bool |
136 | 136 | { |
137 | - if ($this->argument('type') == 'ensure') { |
|
137 | + if ($this->argument('type') == 'ensure'){ |
|
138 | 138 | return true; |
139 | 139 | } |
140 | 140 | |
141 | - if (strpos($this->argument('source'), '*') !== false) { |
|
141 | + if (strpos($this->argument('source'), '*') !== false){ |
|
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | */ |
151 | 151 | private function getMergeMode(): string |
152 | 152 | { |
153 | - switch ($this->argument('type')) { |
|
153 | + switch ($this->argument('type')){ |
|
154 | 154 | case 'follow': |
155 | 155 | return PublisherInterface::FOLLOW; |
156 | 156 | case 'replace': |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | */ |
166 | 166 | private function getFileMode(): int |
167 | 167 | { |
168 | - switch ($this->argument('mode')) { |
|
168 | + switch ($this->argument('mode')){ |
|
169 | 169 | case 'readonly': |
170 | 170 | return FilesInterface::READONLY; |
171 | 171 | case 'runtime': |
@@ -52,10 +52,12 @@ discard block |
||
52 | 52 | FilesInterface $files, |
53 | 53 | DirectoriesInterface $directories |
54 | 54 | ): void { |
55 | - switch ($this->argument('type')) { |
|
55 | + switch ($this->argument('type')) |
|
56 | + { |
|
56 | 57 | case 'replace': |
57 | 58 | case 'follow': |
58 | - if ($this->isDirectory()) { |
|
59 | + if ($this->isDirectory()) |
|
60 | + { |
|
59 | 61 | $this->sprintf( |
60 | 62 | '<fg=cyan>•</fg=cyan> publish directory <comment>%s</comment> to <comment>%s</comment>', |
61 | 63 | $this->getSource($files), |
@@ -68,7 +70,9 @@ discard block |
||
68 | 70 | $this->getMergeMode(), |
69 | 71 | $this->getFileMode() |
70 | 72 | ); |
71 | - } else { |
|
73 | + } |
|
74 | + else |
|
75 | + { |
|
72 | 76 | $this->sprintf( |
73 | 77 | '<fg=cyan>•</fg=cyan> publish file <comment>%s</comment> to <comment>%s</comment>', |
74 | 78 | $this->getSource($files), |
@@ -107,7 +111,8 @@ discard block |
||
107 | 111 | */ |
108 | 112 | private function getSource(FilesInterface $files): ?string |
109 | 113 | { |
110 | - if (!$this->isDirectory()) { |
|
114 | + if (!$this->isDirectory()) |
|
115 | + { |
|
111 | 116 | return $files->normalizePath($this->argument('source')); |
112 | 117 | } |
113 | 118 | |
@@ -122,7 +127,8 @@ discard block |
||
122 | 127 | private function getTarget(FilesInterface $files, DirectoriesInterface $directories): ?string |
123 | 128 | { |
124 | 129 | $target = $this->argument('target'); |
125 | - foreach ($directories->getAll() as $alias => $value) { |
|
130 | + foreach ($directories->getAll() as $alias => $value) |
|
131 | + { |
|
126 | 132 | $target = str_replace("@{$alias}", $value, $target); |
127 | 133 | } |
128 | 134 | |
@@ -134,11 +140,13 @@ discard block |
||
134 | 140 | */ |
135 | 141 | private function isDirectory(): bool |
136 | 142 | { |
137 | - if ($this->argument('type') == 'ensure') { |
|
143 | + if ($this->argument('type') == 'ensure') |
|
144 | + { |
|
138 | 145 | return true; |
139 | 146 | } |
140 | 147 | |
141 | - if (strpos($this->argument('source'), '*') !== false) { |
|
148 | + if (strpos($this->argument('source'), '*') !== false) |
|
149 | + { |
|
142 | 150 | return true; |
143 | 151 | } |
144 | 152 | |
@@ -150,7 +158,8 @@ discard block |
||
150 | 158 | */ |
151 | 159 | private function getMergeMode(): string |
152 | 160 | { |
153 | - switch ($this->argument('type')) { |
|
161 | + switch ($this->argument('type')) |
|
162 | + { |
|
154 | 163 | case 'follow': |
155 | 164 | return PublisherInterface::FOLLOW; |
156 | 165 | case 'replace': |
@@ -165,7 +174,8 @@ discard block |
||
165 | 174 | */ |
166 | 175 | private function getFileMode(): int |
167 | 176 | { |
168 | - switch ($this->argument('mode')) { |
|
177 | + switch ($this->argument('mode')) |
|
178 | + { |
|
169 | 179 | case 'readonly': |
170 | 180 | return FilesInterface::READONLY; |
171 | 181 | case 'runtime': |
@@ -41,17 +41,17 @@ discard block |
||
41 | 41 | string $mergeMode = self::FOLLOW, |
42 | 42 | int $mode = FilesInterface::READONLY |
43 | 43 | ): void { |
44 | - if (!$this->files->isFile($filename)) { |
|
44 | + if (!$this->files->isFile($filename)){ |
|
45 | 45 | throw new PublishException("Given '{$filename}' is not valid file"); |
46 | 46 | } |
47 | 47 | |
48 | - if ($this->files->exists($destination)) { |
|
49 | - if ($this->files->md5($destination) === $this->files->md5($filename)) { |
|
48 | + if ($this->files->exists($destination)){ |
|
49 | + if ($this->files->md5($destination) === $this->files->md5($filename)){ |
|
50 | 50 | //Nothing to do |
51 | 51 | return; |
52 | 52 | } |
53 | 53 | |
54 | - if ($mergeMode === self::FOLLOW) { |
|
54 | + if ($mergeMode === self::FOLLOW){ |
|
55 | 55 | return; |
56 | 56 | } |
57 | 57 | } |
@@ -73,17 +73,17 @@ discard block |
||
73 | 73 | string $mergeMode = self::REPLACE, |
74 | 74 | int $mode = FilesInterface::READONLY |
75 | 75 | ): void { |
76 | - if (!$this->files->isDirectory($directory)) { |
|
76 | + if (!$this->files->isDirectory($directory)){ |
|
77 | 77 | throw new PublishException("Given '{$directory}' is not valid directory"); |
78 | 78 | } |
79 | 79 | |
80 | 80 | $finder = new Finder(); |
81 | 81 | $finder->files()->in($directory); |
82 | 82 | |
83 | - foreach ($finder->getIterator() as $file) { |
|
83 | + foreach ($finder->getIterator() as $file){ |
|
84 | 84 | $this->publish( |
85 | 85 | (string)$file, |
86 | - $destination . '/' . $file->getRelativePathname(), |
|
86 | + $destination.'/'.$file->getRelativePathname(), |
|
87 | 87 | $mergeMode, |
88 | 88 | $mode |
89 | 89 | ); |
@@ -41,17 +41,21 @@ discard block |
||
41 | 41 | string $mergeMode = self::FOLLOW, |
42 | 42 | int $mode = FilesInterface::READONLY |
43 | 43 | ): void { |
44 | - if (!$this->files->isFile($filename)) { |
|
44 | + if (!$this->files->isFile($filename)) |
|
45 | + { |
|
45 | 46 | throw new PublishException("Given '{$filename}' is not valid file"); |
46 | 47 | } |
47 | 48 | |
48 | - if ($this->files->exists($destination)) { |
|
49 | - if ($this->files->md5($destination) === $this->files->md5($filename)) { |
|
49 | + if ($this->files->exists($destination)) |
|
50 | + { |
|
51 | + if ($this->files->md5($destination) === $this->files->md5($filename)) |
|
52 | + { |
|
50 | 53 | //Nothing to do |
51 | 54 | return; |
52 | 55 | } |
53 | 56 | |
54 | - if ($mergeMode === self::FOLLOW) { |
|
57 | + if ($mergeMode === self::FOLLOW) |
|
58 | + { |
|
55 | 59 | return; |
56 | 60 | } |
57 | 61 | } |
@@ -73,14 +77,16 @@ discard block |
||
73 | 77 | string $mergeMode = self::REPLACE, |
74 | 78 | int $mode = FilesInterface::READONLY |
75 | 79 | ): void { |
76 | - if (!$this->files->isDirectory($directory)) { |
|
80 | + if (!$this->files->isDirectory($directory)) |
|
81 | + { |
|
77 | 82 | throw new PublishException("Given '{$directory}' is not valid directory"); |
78 | 83 | } |
79 | 84 | |
80 | 85 | $finder = new Finder(); |
81 | 86 | $finder->files()->in($directory); |
82 | 87 | |
83 | - foreach ($finder->getIterator() as $file) { |
|
88 | + foreach ($finder->getIterator() as $file) |
|
89 | + { |
|
84 | 90 | $this->publish( |
85 | 91 | (string)$file, |
86 | 92 | $destination . '/' . $file->getRelativePathname(), |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | ScopeInterface $scope, |
51 | 51 | ResolverInterface $resolver, |
52 | 52 | ResponseFactoryInterface $responseFactory |
53 | - ) { |
|
53 | + ){ |
|
54 | 54 | $this->config = $config; |
55 | 55 | $this->scope = $scope; |
56 | 56 | $this->resolver = $resolver; |
@@ -67,13 +67,13 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
69 | 69 | { |
70 | - if ($request->getUri()->getPath() !== $this->config->getPath()) { |
|
70 | + if ($request->getUri()->getPath() !== $this->config->getPath()){ |
|
71 | 71 | return $handler->handle($request); |
72 | 72 | } |
73 | 73 | |
74 | 74 | // server authorization |
75 | - if ($request->getAttribute('ws:joinServer', null) !== null) { |
|
76 | - if (!$this->authorizeServer($request)) { |
|
75 | + if ($request->getAttribute('ws:joinServer', null) !== null){ |
|
76 | + if (!$this->authorizeServer($request)){ |
|
77 | 77 | return $this->responseFactory->createResponse(403); |
78 | 78 | } |
79 | 79 | |
@@ -81,10 +81,10 @@ discard block |
||
81 | 81 | } |
82 | 82 | |
83 | 83 | // topic authorization |
84 | - if (is_string($request->getAttribute('ws:joinTopics', null))) { |
|
84 | + if (is_string($request->getAttribute('ws:joinTopics', null))){ |
|
85 | 85 | $topics = explode(',', $request->getAttribute('ws:joinTopics')); |
86 | - foreach ($topics as $topic) { |
|
87 | - if (!$this->authorizeTopic($request, $topic)) { |
|
86 | + foreach ($topics as $topic){ |
|
87 | + if (!$this->authorizeTopic($request, $topic)){ |
|
88 | 88 | return $this->responseFactory->createResponse(403); |
89 | 89 | } |
90 | 90 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | private function authorizeServer(ServerRequestInterface $request): bool |
105 | 105 | { |
106 | 106 | $callback = $this->config->getServerCallback(); |
107 | - if ($callback === null) { |
|
107 | + if ($callback === null){ |
|
108 | 108 | return true; |
109 | 109 | } |
110 | 110 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | { |
123 | 123 | $parameters = []; |
124 | 124 | $callback = $this->config->findTopicCallback($topic, $parameters); |
125 | - if ($callback === null) { |
|
125 | + if ($callback === null){ |
|
126 | 126 | return false; |
127 | 127 | } |
128 | 128 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | private function invoke(ServerRequestInterface $request, callable $callback, array $parameters = []): bool |
141 | 141 | { |
142 | - switch (true) { |
|
142 | + switch (true){ |
|
143 | 143 | case $callback instanceof \Closure || is_string($callback): |
144 | 144 | $reflection = new \ReflectionFunction($callback); |
145 | 145 | break; |
@@ -67,13 +67,16 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
69 | 69 | { |
70 | - if ($request->getUri()->getPath() !== $this->config->getPath()) { |
|
70 | + if ($request->getUri()->getPath() !== $this->config->getPath()) |
|
71 | + { |
|
71 | 72 | return $handler->handle($request); |
72 | 73 | } |
73 | 74 | |
74 | 75 | // server authorization |
75 | - if ($request->getAttribute('ws:joinServer', null) !== null) { |
|
76 | - if (!$this->authorizeServer($request)) { |
|
76 | + if ($request->getAttribute('ws:joinServer', null) !== null) |
|
77 | + { |
|
78 | + if (!$this->authorizeServer($request)) |
|
79 | + { |
|
77 | 80 | return $this->responseFactory->createResponse(403); |
78 | 81 | } |
79 | 82 | |
@@ -81,10 +84,13 @@ discard block |
||
81 | 84 | } |
82 | 85 | |
83 | 86 | // topic authorization |
84 | - if (is_string($request->getAttribute('ws:joinTopics', null))) { |
|
87 | + if (is_string($request->getAttribute('ws:joinTopics', null))) |
|
88 | + { |
|
85 | 89 | $topics = explode(',', $request->getAttribute('ws:joinTopics')); |
86 | - foreach ($topics as $topic) { |
|
87 | - if (!$this->authorizeTopic($request, $topic)) { |
|
90 | + foreach ($topics as $topic) |
|
91 | + { |
|
92 | + if (!$this->authorizeTopic($request, $topic)) |
|
93 | + { |
|
88 | 94 | return $this->responseFactory->createResponse(403); |
89 | 95 | } |
90 | 96 | } |
@@ -104,7 +110,8 @@ discard block |
||
104 | 110 | private function authorizeServer(ServerRequestInterface $request): bool |
105 | 111 | { |
106 | 112 | $callback = $this->config->getServerCallback(); |
107 | - if ($callback === null) { |
|
113 | + if ($callback === null) |
|
114 | + { |
|
108 | 115 | return true; |
109 | 116 | } |
110 | 117 | |
@@ -122,7 +129,8 @@ discard block |
||
122 | 129 | { |
123 | 130 | $parameters = []; |
124 | 131 | $callback = $this->config->findTopicCallback($topic, $parameters); |
125 | - if ($callback === null) { |
|
132 | + if ($callback === null) |
|
133 | + { |
|
126 | 134 | return false; |
127 | 135 | } |
128 | 136 | |
@@ -139,7 +147,8 @@ discard block |
||
139 | 147 | */ |
140 | 148 | private function invoke(ServerRequestInterface $request, callable $callback, array $parameters = []): bool |
141 | 149 | { |
142 | - switch (true) { |
|
150 | + switch (true) |
|
151 | + { |
|
143 | 152 | case $callback instanceof \Closure || is_string($callback): |
144 | 153 | $reflection = new \ReflectionFunction($callback); |
145 | 154 | break; |
@@ -160,7 +169,8 @@ discard block |
||
160 | 169 | [ |
161 | 170 | ServerRequestInterface::class => $request, |
162 | 171 | ], |
163 | - function () use ($reflection, $parameters, $callback) { |
|
172 | + function () use ($reflection, $parameters, $callback) |
|
173 | + { |
|
164 | 174 | return call_user_func_array( |
165 | 175 | $callback, |
166 | 176 | $this->resolver->resolveArguments($reflection, $parameters) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | parent::__construct($config); |
36 | 36 | |
37 | - foreach ($config['authorizeTopics'] as $topic => $callback) { |
|
37 | + foreach ($config['authorizeTopics'] as $topic => $callback){ |
|
38 | 38 | $this->patterns[$this->compilePattern($topic)] = $callback; |
39 | 39 | } |
40 | 40 | } |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function findTopicCallback(string $topic, array &$matches): ?callable |
64 | 64 | { |
65 | - foreach ($this->patterns as $pattern => $callback) { |
|
66 | - if (preg_match($pattern, $topic, $matches)) { |
|
65 | + foreach ($this->patterns as $pattern => $callback){ |
|
66 | + if (preg_match($pattern, $topic, $matches)){ |
|
67 | 67 | return $callback; |
68 | 68 | } |
69 | 69 | } |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | private function compilePattern(string $topic): string |
79 | 79 | { |
80 | 80 | $replaces = []; |
81 | - if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) { |
|
81 | + if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)){ |
|
82 | 82 | $variables = array_combine($matches[1], $matches[2]); |
83 | - foreach ($variables as $key => $_) { |
|
84 | - $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)'; |
|
83 | + foreach ($variables as $key => $_){ |
|
84 | + $replaces['{'.$key.'}'] = '(?P<'.$key.'>[^\/\.]+)'; |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - return '/^' . strtr($topic, $replaces + ['/' => '\\/', '[' => '(?:', ']' => ')?', '.' => '\.']) . '$/iu'; |
|
88 | + return '/^'.strtr($topic, $replaces + ['/' => '\\/', '[' => '(?:', ']' => ')?', '.' => '\.']).'$/iu'; |
|
89 | 89 | } |
90 | 90 | } |
@@ -34,7 +34,8 @@ discard block |
||
34 | 34 | { |
35 | 35 | parent::__construct($config); |
36 | 36 | |
37 | - foreach ($config['authorizeTopics'] as $topic => $callback) { |
|
37 | + foreach ($config['authorizeTopics'] as $topic => $callback) |
|
38 | + { |
|
38 | 39 | $this->patterns[$this->compilePattern($topic)] = $callback; |
39 | 40 | } |
40 | 41 | } |
@@ -62,8 +63,10 @@ discard block |
||
62 | 63 | */ |
63 | 64 | public function findTopicCallback(string $topic, array &$matches): ?callable |
64 | 65 | { |
65 | - foreach ($this->patterns as $pattern => $callback) { |
|
66 | - if (preg_match($pattern, $topic, $matches)) { |
|
66 | + foreach ($this->patterns as $pattern => $callback) |
|
67 | + { |
|
68 | + if (preg_match($pattern, $topic, $matches)) |
|
69 | + { |
|
67 | 70 | return $callback; |
68 | 71 | } |
69 | 72 | } |
@@ -78,9 +81,11 @@ discard block |
||
78 | 81 | private function compilePattern(string $topic): string |
79 | 82 | { |
80 | 83 | $replaces = []; |
81 | - if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) { |
|
84 | + if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) |
|
85 | + { |
|
82 | 86 | $variables = array_combine($matches[1], $matches[2]); |
83 | - foreach ($variables as $key => $_) { |
|
87 | + foreach ($variables as $key => $_) |
|
88 | + { |
|
84 | 89 | $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)'; |
85 | 90 | } |
86 | 91 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getLocales(): array |
50 | 50 | { |
51 | - if (!is_dir($this->config->getLocalesDirectory())) { |
|
51 | + if (!is_dir($this->config->getLocalesDirectory())){ |
|
52 | 52 | return []; |
53 | 53 | } |
54 | 54 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | $locales = []; |
59 | 59 | |
60 | - foreach ($finder->directories() as $directory) { |
|
60 | + foreach ($finder->directories() as $directory){ |
|
61 | 61 | $locales[] = $directory->getFilename(); |
62 | 62 | } |
63 | 63 | |
@@ -72,14 +72,14 @@ discard block |
||
72 | 72 | $locale = preg_replace('/[^a-zA-Z_]/', '', mb_strtolower($locale)); |
73 | 73 | $catalogue = new Catalogue($locale); |
74 | 74 | |
75 | - if (!$this->hasLocale($locale)) { |
|
75 | + if (!$this->hasLocale($locale)){ |
|
76 | 76 | return $catalogue; |
77 | 77 | } |
78 | 78 | |
79 | 79 | $finder = new Finder(); |
80 | 80 | $finder->in($this->config->getLocaleDirectory($locale)); |
81 | 81 | |
82 | - foreach ($finder->getIterator() as $file) { |
|
82 | + foreach ($finder->getIterator() as $file){ |
|
83 | 83 | $this->getLogger()->info( |
84 | 84 | sprintf( |
85 | 85 | "found locale domain file '%s'", |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | //Per application agreement domain name must present in filename |
92 | 92 | $domain = strstr($file->getFilename(), '.', true); |
93 | 93 | |
94 | - if (!$this->config->hasLoader($file->getExtension())) { |
|
94 | + if (!$this->config->hasLoader($file->getExtension())){ |
|
95 | 95 | $this->getLogger()->warning( |
96 | 96 | sprintf( |
97 | 97 | "unable to load domain file '%s', no loader found", |
@@ -48,7 +48,8 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getLocales(): array |
50 | 50 | { |
51 | - if (!is_dir($this->config->getLocalesDirectory())) { |
|
51 | + if (!is_dir($this->config->getLocalesDirectory())) |
|
52 | + { |
|
52 | 53 | return []; |
53 | 54 | } |
54 | 55 | |
@@ -57,7 +58,8 @@ discard block |
||
57 | 58 | |
58 | 59 | $locales = []; |
59 | 60 | |
60 | - foreach ($finder->directories() as $directory) { |
|
61 | + foreach ($finder->directories() as $directory) |
|
62 | + { |
|
61 | 63 | $locales[] = $directory->getFilename(); |
62 | 64 | } |
63 | 65 | |
@@ -72,14 +74,16 @@ discard block |
||
72 | 74 | $locale = preg_replace('/[^a-zA-Z_]/', '', mb_strtolower($locale)); |
73 | 75 | $catalogue = new Catalogue($locale); |
74 | 76 | |
75 | - if (!$this->hasLocale($locale)) { |
|
77 | + if (!$this->hasLocale($locale)) |
|
78 | + { |
|
76 | 79 | return $catalogue; |
77 | 80 | } |
78 | 81 | |
79 | 82 | $finder = new Finder(); |
80 | 83 | $finder->in($this->config->getLocaleDirectory($locale)); |
81 | 84 | |
82 | - foreach ($finder->getIterator() as $file) { |
|
85 | + foreach ($finder->getIterator() as $file) |
|
86 | + { |
|
83 | 87 | $this->getLogger()->info( |
84 | 88 | sprintf( |
85 | 89 | "found locale domain file '%s'", |
@@ -91,7 +95,8 @@ discard block |
||
91 | 95 | //Per application agreement domain name must present in filename |
92 | 96 | $domain = strstr($file->getFilename(), '.', true); |
93 | 97 | |
94 | - if (!$this->config->hasLoader($file->getExtension())) { |
|
98 | + if (!$this->config->hasLoader($file->getExtension())) |
|
99 | + { |
|
95 | 100 | $this->getLogger()->warning( |
96 | 101 | sprintf( |
97 | 102 | "unable to load domain file '%s', no loader found", |