@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function populate(StateInterface $state): void |
41 | 41 | { |
42 | - if ($this->request === null) { |
|
42 | + if ($this->request === null){ |
|
43 | 43 | return; |
44 | 44 | } |
45 | 45 | |
@@ -48,11 +48,11 @@ discard block |
||
48 | 48 | |
49 | 49 | $state->setVariable('headers', $this->request->getHeaders()); |
50 | 50 | |
51 | - if ($this->request->getQueryParams() !== []) { |
|
51 | + if ($this->request->getQueryParams() !== []){ |
|
52 | 52 | $state->setVariable('query', $this->request->getQueryParams()); |
53 | 53 | } |
54 | 54 | |
55 | - if ($this->request->getParsedBody() !== null) { |
|
55 | + if ($this->request->getParsedBody() !== null){ |
|
56 | 56 | $state->setVariable('data', $this->request->getParsedBody()); |
57 | 57 | } |
58 | 58 | } |
@@ -39,7 +39,8 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function populate(StateInterface $state): void |
41 | 41 | { |
42 | - if ($this->request === null) { |
|
42 | + if ($this->request === null) |
|
43 | + { |
|
43 | 44 | return; |
44 | 45 | } |
45 | 46 | |
@@ -48,11 +49,13 @@ discard block |
||
48 | 49 | |
49 | 50 | $state->setVariable('headers', $this->request->getHeaders()); |
50 | 51 | |
51 | - if ($this->request->getQueryParams() !== []) { |
|
52 | + if ($this->request->getQueryParams() !== []) |
|
53 | + { |
|
52 | 54 | $state->setVariable('query', $this->request->getQueryParams()); |
53 | 55 | } |
54 | 56 | |
55 | - if ($this->request->getParsedBody() !== null) { |
|
57 | + if ($this->request->getParsedBody() !== null) |
|
58 | + { |
|
56 | 59 | $state->setVariable('data', $this->request->getParsedBody()); |
57 | 60 | } |
58 | 61 | } |
@@ -43,29 +43,29 @@ |
||
43 | 43 | */ |
44 | 44 | protected function mapDirectories(array $directories): array |
45 | 45 | { |
46 | - if (!isset($directories['root'])) { |
|
46 | + if (!isset($directories['root'])){ |
|
47 | 47 | throw new BootException('Missing required directory `root`'); |
48 | 48 | } |
49 | 49 | |
50 | - if (!isset($directories['app'])) { |
|
51 | - $directories['app'] = $directories['root'] . '/app/'; |
|
50 | + if (!isset($directories['app'])){ |
|
51 | + $directories['app'] = $directories['root'].'/app/'; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | return array_merge( |
55 | 55 | [ |
56 | 56 | // public root |
57 | - 'public' => $directories['root'] . '/public/', |
|
57 | + 'public' => $directories['root'].'/public/', |
|
58 | 58 | |
59 | 59 | // vendor libraries |
60 | - 'vendor' => $directories['root'] . '/vendor/', |
|
60 | + 'vendor' => $directories['root'].'/vendor/', |
|
61 | 61 | |
62 | 62 | // data directories |
63 | - 'runtime' => $directories['root'] . '/runtime/', |
|
64 | - 'cache' => $directories['root'] . '/runtime/cache/', |
|
63 | + 'runtime' => $directories['root'].'/runtime/', |
|
64 | + 'cache' => $directories['root'].'/runtime/cache/', |
|
65 | 65 | |
66 | 66 | // application directories |
67 | - 'config' => $directories['app'] . '/config/', |
|
68 | - 'resources' => $directories['app'] . '/resources/', |
|
67 | + 'config' => $directories['app'].'/config/', |
|
68 | + 'resources' => $directories['app'].'/resources/', |
|
69 | 69 | ], |
70 | 70 | $directories |
71 | 71 | ); |
@@ -43,11 +43,13 @@ |
||
43 | 43 | */ |
44 | 44 | protected function mapDirectories(array $directories): array |
45 | 45 | { |
46 | - if (!isset($directories['root'])) { |
|
46 | + if (!isset($directories['root'])) |
|
47 | + { |
|
47 | 48 | throw new BootException('Missing required directory `root`'); |
48 | 49 | } |
49 | 50 | |
50 | - if (!isset($directories['app'])) { |
|
51 | + if (!isset($directories['app'])) |
|
52 | + { |
|
51 | 53 | $directories['app'] = $directories['root'] . '/app/'; |
52 | 54 | } |
53 | 55 |
@@ -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 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | /** @var \ReflectionFunctionAbstract $reflection */ |
143 | 143 | $reflection = null; |
144 | - switch (true) { |
|
144 | + switch (true){ |
|
145 | 145 | case $callback instanceof \Closure || is_string($callback): |
146 | 146 | $reflection = new \ReflectionFunction($callback); |
147 | 147 | 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 | |
@@ -141,7 +149,8 @@ discard block |
||
141 | 149 | { |
142 | 150 | /** @var \ReflectionFunctionAbstract $reflection */ |
143 | 151 | $reflection = null; |
144 | - switch (true) { |
|
152 | + switch (true) |
|
153 | + { |
|
145 | 154 | case $callback instanceof \Closure || is_string($callback): |
146 | 155 | $reflection = new \ReflectionFunction($callback); |
147 | 156 | break; |
@@ -159,7 +168,8 @@ discard block |
||
159 | 168 | [ |
160 | 169 | ServerRequestInterface::class => $request |
161 | 170 | ], |
162 | - function () use ($reflection, $parameters, $callback) { |
|
171 | + function () use ($reflection, $parameters, $callback) |
|
172 | + { |
|
163 | 173 | return call_user_func_array( |
164 | 174 | $callback, |
165 | 175 | $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 => $segment) { |
|
84 | - $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)'; |
|
83 | + foreach ($variables as $key => $segment){ |
|
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 => $segment) { |
|
87 | + foreach ($variables as $key => $segment) |
|
88 | + { |
|
84 | 89 | $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)'; |
85 | 90 | } |
86 | 91 | } |
@@ -174,9 +174,9 @@ discard block |
||
174 | 174 | */ |
175 | 175 | private function getRequest(): ServerRequestInterface |
176 | 176 | { |
177 | - try { |
|
177 | + try{ |
|
178 | 178 | return $this->container->get(ServerRequestInterface::class); |
179 | - } catch (NotFoundExceptionInterface $e) { |
|
179 | + }catch (NotFoundExceptionInterface $e){ |
|
180 | 180 | throw new ScopeException('Unable to receive active request', $e->getCode(), $e); |
181 | 181 | } |
182 | 182 | } |
@@ -188,9 +188,9 @@ discard block |
||
188 | 188 | */ |
189 | 189 | private function getCookieQueue(): CookieQueue |
190 | 190 | { |
191 | - try { |
|
191 | + try{ |
|
192 | 192 | return $this->container->get(CookieQueue::class); |
193 | - } catch (NotFoundExceptionInterface $e) { |
|
193 | + }catch (NotFoundExceptionInterface $e){ |
|
194 | 194 | throw new ScopeException('Unable to receive cookie queue, invalid request scope', $e->getCode(), $e); |
195 | 195 | } |
196 | 196 | } |
@@ -169,9 +169,12 @@ discard block |
||
169 | 169 | */ |
170 | 170 | private function getRequest(): ServerRequestInterface |
171 | 171 | { |
172 | - try { |
|
172 | + try |
|
173 | + { |
|
173 | 174 | return $this->container->get(ServerRequestInterface::class); |
174 | - } catch (NotFoundExceptionInterface $e) { |
|
175 | + } |
|
176 | + catch (NotFoundExceptionInterface $e) |
|
177 | + { |
|
175 | 178 | throw new ScopeException('Unable to receive active request', $e->getCode(), $e); |
176 | 179 | } |
177 | 180 | } |
@@ -183,9 +186,12 @@ discard block |
||
183 | 186 | */ |
184 | 187 | private function getCookieQueue(): CookieQueue |
185 | 188 | { |
186 | - try { |
|
189 | + try |
|
190 | + { |
|
187 | 191 | return $this->container->get(CookieQueue::class); |
188 | - } catch (NotFoundExceptionInterface $e) { |
|
192 | + } |
|
193 | + catch (NotFoundExceptionInterface $e) |
|
194 | + { |
|
189 | 195 | throw new ScopeException('Unable to receive cookie queue, invalid request scope', $e->getCode(), $e); |
190 | 196 | } |
191 | 197 | } |
@@ -40,21 +40,21 @@ discard block |
||
40 | 40 | { |
41 | 41 | $conn = $env->get('RR_RPC', static::RPC_DEFAULT); |
42 | 42 | |
43 | - if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) { |
|
43 | + if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)){ |
|
44 | 44 | throw new BootException( |
45 | 45 | "Unable to configure RPC connection, invalid DSN given `{$conn}`." |
46 | 46 | ); |
47 | 47 | } |
48 | 48 | |
49 | - if (!in_array($parts[1], ['tcp', 'unix'])) { |
|
49 | + if (!in_array($parts[1], ['tcp', 'unix'])){ |
|
50 | 50 | throw new BootException( |
51 | 51 | "Unable to configure RPC connection, invalid DSN given `{$conn}`." |
52 | 52 | ); |
53 | 53 | } |
54 | 54 | |
55 | - if ($parts[1] == 'unix') { |
|
55 | + if ($parts[1] == 'unix'){ |
|
56 | 56 | $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX); |
57 | - } else { |
|
57 | + }else{ |
|
58 | 58 | $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP); |
59 | 59 | } |
60 | 60 | |
@@ -69,25 +69,25 @@ discard block |
||
69 | 69 | { |
70 | 70 | $conn = $env->get('RR_RELAY', static::WORKER_DEFAULT); |
71 | 71 | |
72 | - if ($conn === 'pipes' || empty($conn)) { |
|
72 | + if ($conn === 'pipes' || empty($conn)){ |
|
73 | 73 | return new Worker(new StreamRelay(STDIN, STDOUT)); |
74 | 74 | } |
75 | 75 | |
76 | - if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) { |
|
76 | + if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)){ |
|
77 | 77 | throw new BootException( |
78 | 78 | "Unable to configure Worker connection, invalid DSN given `{$conn}`." |
79 | 79 | ); |
80 | 80 | } |
81 | 81 | |
82 | - if (!in_array($parts[1], ['tcp', 'unix'])) { |
|
82 | + if (!in_array($parts[1], ['tcp', 'unix'])){ |
|
83 | 83 | throw new BootException( |
84 | 84 | "Unable to configure Worker connection, invalid DSN given `{$conn}`." |
85 | 85 | ); |
86 | 86 | } |
87 | 87 | |
88 | - if ($parts[1] == 'unix') { |
|
88 | + if ($parts[1] == 'unix'){ |
|
89 | 89 | $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX); |
90 | - } else { |
|
90 | + }else{ |
|
91 | 91 | $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP); |
92 | 92 | } |
93 | 93 |
@@ -40,21 +40,26 @@ discard block |
||
40 | 40 | { |
41 | 41 | $conn = $env->get('RR_RPC', static::RPC_DEFAULT); |
42 | 42 | |
43 | - if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) { |
|
43 | + if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) |
|
44 | + { |
|
44 | 45 | throw new BootException( |
45 | 46 | "Unable to configure RPC connection, invalid DSN given `{$conn}`." |
46 | 47 | ); |
47 | 48 | } |
48 | 49 | |
49 | - if (!in_array($parts[1], ['tcp', 'unix'])) { |
|
50 | + if (!in_array($parts[1], ['tcp', 'unix'])) |
|
51 | + { |
|
50 | 52 | throw new BootException( |
51 | 53 | "Unable to configure RPC connection, invalid DSN given `{$conn}`." |
52 | 54 | ); |
53 | 55 | } |
54 | 56 | |
55 | - if ($parts[1] == 'unix') { |
|
57 | + if ($parts[1] == 'unix') |
|
58 | + { |
|
56 | 59 | $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX); |
57 | - } else { |
|
60 | + } |
|
61 | + else |
|
62 | + { |
|
58 | 63 | $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP); |
59 | 64 | } |
60 | 65 | |
@@ -69,25 +74,31 @@ discard block |
||
69 | 74 | { |
70 | 75 | $conn = $env->get('RR_RELAY', static::WORKER_DEFAULT); |
71 | 76 | |
72 | - if ($conn === 'pipes' || empty($conn)) { |
|
77 | + if ($conn === 'pipes' || empty($conn)) |
|
78 | + { |
|
73 | 79 | return new Worker(new StreamRelay(STDIN, STDOUT)); |
74 | 80 | } |
75 | 81 | |
76 | - if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) { |
|
82 | + if (!preg_match('#^([a-z]+)://([^:]+):?(\d+)?$#i', $conn, $parts)) |
|
83 | + { |
|
77 | 84 | throw new BootException( |
78 | 85 | "Unable to configure Worker connection, invalid DSN given `{$conn}`." |
79 | 86 | ); |
80 | 87 | } |
81 | 88 | |
82 | - if (!in_array($parts[1], ['tcp', 'unix'])) { |
|
89 | + if (!in_array($parts[1], ['tcp', 'unix'])) |
|
90 | + { |
|
83 | 91 | throw new BootException( |
84 | 92 | "Unable to configure Worker connection, invalid DSN given `{$conn}`." |
85 | 93 | ); |
86 | 94 | } |
87 | 95 | |
88 | - if ($parts[1] == 'unix') { |
|
96 | + if ($parts[1] == 'unix') |
|
97 | + { |
|
89 | 98 | $relay = new SocketRelay($parts[2], null, SocketRelay::SOCK_UNIX); |
90 | - } else { |
|
99 | + } |
|
100 | + else |
|
101 | + { |
|
91 | 102 | $relay = new SocketRelay($parts[2], (int)$parts[3], SocketRelay::SOCK_TCP); |
92 | 103 | } |
93 | 104 |
@@ -78,35 +78,35 @@ discard block |
||
78 | 78 | */ |
79 | 79 | private function configureExtensions(ConsoleBootloader $console, Container $container): void |
80 | 80 | { |
81 | - if ($container->has(DatabaseProviderInterface::class)) { |
|
81 | + if ($container->has(DatabaseProviderInterface::class)){ |
|
82 | 82 | $this->configureDatabase($console); |
83 | 83 | } |
84 | 84 | |
85 | - if ($container->has(ORMInterface::class)) { |
|
85 | + if ($container->has(ORMInterface::class)){ |
|
86 | 86 | $this->configureCycle($console, $container); |
87 | 87 | } |
88 | 88 | |
89 | - if ($container->has(TranslatorInterface::class)) { |
|
89 | + if ($container->has(TranslatorInterface::class)){ |
|
90 | 90 | $this->configureTranslator($console); |
91 | 91 | } |
92 | 92 | |
93 | - if ($container->has(ViewsInterface::class)) { |
|
93 | + if ($container->has(ViewsInterface::class)){ |
|
94 | 94 | $this->configureViews($console); |
95 | 95 | } |
96 | 96 | |
97 | - if ($container->has(Migrator::class)) { |
|
97 | + if ($container->has(Migrator::class)){ |
|
98 | 98 | $this->configureMigrations($console); |
99 | 99 | } |
100 | 100 | |
101 | - if ($container->has(InvokerInterface::class)) { |
|
101 | + if ($container->has(InvokerInterface::class)){ |
|
102 | 102 | $this->configureGRPC($console); |
103 | 103 | } |
104 | 104 | |
105 | - if ($container->has(EncryptionInterface::class)) { |
|
105 | + if ($container->has(EncryptionInterface::class)){ |
|
106 | 106 | $this->configureEncrypter($console); |
107 | 107 | } |
108 | 108 | |
109 | - if ($container->has(RouterInterface::class)) { |
|
109 | + if ($container->has(RouterInterface::class)){ |
|
110 | 110 | $console->addCommand(Router\ListCommand::class); |
111 | 111 | } |
112 | 112 | } |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | |
136 | 136 | $console->addCommand(Cycle\SyncCommand::class); |
137 | 137 | |
138 | - if ($container->has(Migrator::class)) { |
|
138 | + if ($container->has(Migrator::class)){ |
|
139 | 139 | $console->addCommand(Cycle\MigrateCommand::class); |
140 | 140 | } |
141 | 141 | } |
@@ -78,35 +78,43 @@ discard block |
||
78 | 78 | */ |
79 | 79 | private function configureExtensions(ConsoleBootloader $console, Container $container): void |
80 | 80 | { |
81 | - if ($container->has(DatabaseProviderInterface::class)) { |
|
81 | + if ($container->has(DatabaseProviderInterface::class)) |
|
82 | + { |
|
82 | 83 | $this->configureDatabase($console); |
83 | 84 | } |
84 | 85 | |
85 | - if ($container->has(ORMInterface::class)) { |
|
86 | + if ($container->has(ORMInterface::class)) |
|
87 | + { |
|
86 | 88 | $this->configureCycle($console, $container); |
87 | 89 | } |
88 | 90 | |
89 | - if ($container->has(TranslatorInterface::class)) { |
|
91 | + if ($container->has(TranslatorInterface::class)) |
|
92 | + { |
|
90 | 93 | $this->configureTranslator($console); |
91 | 94 | } |
92 | 95 | |
93 | - if ($container->has(ViewsInterface::class)) { |
|
96 | + if ($container->has(ViewsInterface::class)) |
|
97 | + { |
|
94 | 98 | $this->configureViews($console); |
95 | 99 | } |
96 | 100 | |
97 | - if ($container->has(Migrator::class)) { |
|
101 | + if ($container->has(Migrator::class)) |
|
102 | + { |
|
98 | 103 | $this->configureMigrations($console); |
99 | 104 | } |
100 | 105 | |
101 | - if ($container->has(InvokerInterface::class)) { |
|
106 | + if ($container->has(InvokerInterface::class)) |
|
107 | + { |
|
102 | 108 | $this->configureGRPC($console); |
103 | 109 | } |
104 | 110 | |
105 | - if ($container->has(EncryptionInterface::class)) { |
|
111 | + if ($container->has(EncryptionInterface::class)) |
|
112 | + { |
|
106 | 113 | $this->configureEncrypter($console); |
107 | 114 | } |
108 | 115 | |
109 | - if ($container->has(RouterInterface::class)) { |
|
116 | + if ($container->has(RouterInterface::class)) |
|
117 | + { |
|
110 | 118 | $console->addCommand(Router\ListCommand::class); |
111 | 119 | } |
112 | 120 | } |
@@ -135,7 +143,8 @@ discard block |
||
135 | 143 | |
136 | 144 | $console->addCommand(Cycle\SyncCommand::class); |
137 | 145 | |
138 | - if ($container->has(Migrator::class)) { |
|
146 | + if ($container->has(Migrator::class)) |
|
147 | + { |
|
139 | 148 | $console->addCommand(Cycle\MigrateCommand::class); |
140 | 149 | } |
141 | 150 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | function () use ($container): void { |
32 | 32 | /** @var DatabaseManager $dbal */ |
33 | 33 | $dbal = $container->get(DatabaseManager::class); |
34 | - foreach ($dbal->getDrivers() as $driver) { |
|
34 | + foreach ($dbal->getDrivers() as $driver){ |
|
35 | 35 | $driver->disconnect(); |
36 | 36 | } |
37 | 37 | } |
@@ -31,7 +31,8 @@ |
||
31 | 31 | function () use ($container): void { |
32 | 32 | /** @var DatabaseManager $dbal */ |
33 | 33 | $dbal = $container->get(DatabaseManager::class); |
34 | - foreach ($dbal->getDrivers() as $driver) { |
|
34 | + foreach ($dbal->getDrivers() as $driver) |
|
35 | + { |
|
35 | 36 | $driver->disconnect(); |
36 | 37 | } |
37 | 38 | } |
@@ -42,8 +42,8 @@ |
||
42 | 42 | EnvironmentInterface $env, |
43 | 43 | DirectoriesInterface $dirs |
44 | 44 | ): void { |
45 | - if (!$dirs->has('migrations')) { |
|
46 | - $dirs->set('migrations', $dirs->get('app') . 'migrations'); |
|
45 | + if (!$dirs->has('migrations')){ |
|
46 | + $dirs->set('migrations', $dirs->get('app').'migrations'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | $config->setDefaults( |
@@ -40,7 +40,8 @@ |
||
40 | 40 | EnvironmentInterface $env, |
41 | 41 | DirectoriesInterface $dirs |
42 | 42 | ): void { |
43 | - if (!$dirs->has('migrations')) { |
|
43 | + if (!$dirs->has('migrations')) |
|
44 | + { |
|
44 | 45 | $dirs->set('migrations', $dirs->get('app') . 'migrations'); |
45 | 46 | } |
46 | 47 |