@@ -56,12 +56,14 @@ |
||
| 56 | 56 | */ |
| 57 | 57 | public function callAction(string $controller, string $action, array $parameters = []) |
| 58 | 58 | { |
| 59 | - if ($this->core === null) { |
|
| 59 | + if ($this->core === null) |
|
| 60 | + { |
|
| 60 | 61 | throw new InterceptorException('Unable to invoke pipeline without assigned core'); |
| 61 | 62 | } |
| 62 | 63 | |
| 63 | 64 | $position = $this->position++; |
| 64 | - if (isset($this->interceptors[$position])) { |
|
| 65 | + if (isset($this->interceptors[$position])) |
|
| 66 | + { |
|
| 65 | 67 | return $this->interceptors[$position]->process($controller, $action, $parameters, $this); |
| 66 | 68 | } |
| 67 | 69 | |
@@ -45,9 +45,12 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function callAction(string $controller, string $action, array $parameters = []) |
| 47 | 47 | { |
| 48 | - try { |
|
| 48 | + try |
|
| 49 | + { |
|
| 49 | 50 | $method = new \ReflectionMethod($controller, $action); |
| 50 | - } catch (\ReflectionException $e) { |
|
| 51 | + } |
|
| 52 | + catch (\ReflectionException $e) |
|
| 53 | + { |
|
| 51 | 54 | throw new ControllerException( |
| 52 | 55 | "Invalid action `{$controller}`->`{$action}`", |
| 53 | 56 | ControllerException::BAD_ACTION, |
@@ -55,22 +58,28 @@ discard block |
||
| 55 | 58 | ); |
| 56 | 59 | } |
| 57 | 60 | |
| 58 | - if ($method->isStatic() || !$method->isPublic()) { |
|
| 61 | + if ($method->isStatic() || !$method->isPublic()) |
|
| 62 | + { |
|
| 59 | 63 | throw new ControllerException( |
| 60 | 64 | "Invalid action `{$controller}`->`{$action}`", |
| 61 | 65 | ControllerException::BAD_ACTION |
| 62 | 66 | ); |
| 63 | 67 | } |
| 64 | 68 | |
| 65 | - try { |
|
| 69 | + try |
|
| 70 | + { |
|
| 66 | 71 | // getting the set of arguments should be sent to requested method |
| 67 | 72 | $args = $this->resolver->resolveArguments($method, $parameters); |
| 68 | - } catch (ArgumentException $e) { |
|
| 73 | + } |
|
| 74 | + catch (ArgumentException $e) |
|
| 75 | + { |
|
| 69 | 76 | throw new ControllerException( |
| 70 | 77 | "Missing/invalid parameter '{$e->getParameter()->name}' of `{$controller}`->`{$action}`", |
| 71 | 78 | ControllerException::BAD_ARGUMENT |
| 72 | 79 | ); |
| 73 | - } catch (ContainerExceptionInterface $e) { |
|
| 80 | + } |
|
| 81 | + catch (ContainerExceptionInterface $e) |
|
| 82 | + { |
|
| 74 | 83 | throw new ControllerException( |
| 75 | 84 | $e->getMessage(), |
| 76 | 85 | ControllerException::ERROR, |
@@ -78,7 +87,8 @@ discard block |
||
| 78 | 87 | ); |
| 79 | 88 | } |
| 80 | 89 | |
| 81 | - return ContainerScope::runScope($this->container, function () use ($controller, $method, $args) { |
|
| 90 | + return ContainerScope::runScope($this->container, function () use ($controller, $method, $args) |
|
| 91 | + { |
|
| 82 | 92 | return $method->invokeArgs($this->container->get($controller), $args); |
| 83 | 93 | }); |
| 84 | 94 | } |
@@ -103,9 +103,12 @@ |
||
| 103 | 103 | $this->assertSame('echoed', (string)$response->getBody()); |
| 104 | 104 | |
| 105 | 105 | $e = null; |
| 106 | - try { |
|
| 106 | + try |
|
| 107 | + { |
|
| 107 | 108 | $router->handle(new ServerRequest([], [], new Uri('/test'))); |
| 108 | - } catch (UndefinedRouteException $e) { |
|
| 109 | + } |
|
| 110 | + catch (UndefinedRouteException $e) |
|
| 111 | + { |
|
| 109 | 112 | } |
| 110 | 113 | |
| 111 | 114 | $this->assertNotNull($e, 'Autofill not fired'); |
@@ -37,7 +37,8 @@ |
||
| 37 | 37 | $response = new Response('php://memory', $code, []); |
| 38 | 38 | $response = $response->withStatus($code, $reasonPhrase); |
| 39 | 39 | |
| 40 | - foreach ($this->config->getBaseHeaders() as $header => $value) { |
|
| 40 | + foreach ($this->config->getBaseHeaders() as $header => $value) |
|
| 41 | + { |
|
| 41 | 42 | $response = $response->withAddedHeader($header, $value); |
| 42 | 43 | } |
| 43 | 44 | |
@@ -26,7 +26,8 @@ |
||
| 26 | 26 | string $clientFilename = null, |
| 27 | 27 | string $clientMediaType = null |
| 28 | 28 | ): UploadedFileInterface { |
| 29 | - if ($size === null) { |
|
| 29 | + if ($size === null) |
|
| 30 | + { |
|
| 30 | 31 | $size = $stream->getSize(); |
| 31 | 32 | } |
| 32 | 33 | |
@@ -27,7 +27,8 @@ |
||
| 27 | 27 | $router = $this->makeRouter(); |
| 28 | 28 | $router->setRoute( |
| 29 | 29 | 'action', |
| 30 | - new Route('/something', function () { |
|
| 30 | + new Route('/something', function () |
|
| 31 | + { |
|
| 31 | 32 | return 'hello world'; |
| 32 | 33 | }) |
| 33 | 34 | ); |
@@ -59,9 +59,12 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function __construct(string $pattern, $target, array $defaults = []) |
| 61 | 61 | { |
| 62 | - if ($target instanceof TargetInterface) { |
|
| 62 | + if ($target instanceof TargetInterface) |
|
| 63 | + { |
|
| 63 | 64 | parent::__construct($pattern, array_merge($target->getDefaults(), $defaults)); |
| 64 | - } else { |
|
| 65 | + } |
|
| 66 | + else |
|
| 67 | + { |
|
| 65 | 68 | parent::__construct($pattern, $defaults); |
| 66 | 69 | } |
| 67 | 70 | |
@@ -76,7 +79,8 @@ discard block |
||
| 76 | 79 | { |
| 77 | 80 | /** @var self $route */ |
| 78 | 81 | $route = parent::withUriHandler($uriHandler); |
| 79 | - if ($this->target instanceof TargetInterface) { |
|
| 82 | + if ($this->target instanceof TargetInterface) |
|
| 83 | + { |
|
| 80 | 84 | $route->uriHandler = $route->uriHandler->withConstrains( |
| 81 | 85 | $this->target->getConstrains(), |
| 82 | 86 | $this->defaults |
@@ -97,7 +101,8 @@ discard block |
||
| 97 | 101 | $route = clone $this; |
| 98 | 102 | $route->container = $container; |
| 99 | 103 | |
| 100 | - if ($route->target instanceof TargetInterface) { |
|
| 104 | + if ($route->target instanceof TargetInterface) |
|
| 105 | + { |
|
| 101 | 106 | $route->target = clone $route->target; |
| 102 | 107 | } |
| 103 | 108 | |
@@ -114,7 +119,8 @@ discard block |
||
| 114 | 119 | */ |
| 115 | 120 | public function handle(ServerRequestInterface $request): ResponseInterface |
| 116 | 121 | { |
| 117 | - if (empty($this->requestHandler)) { |
|
| 122 | + if (empty($this->requestHandler)) |
|
| 123 | + { |
|
| 118 | 124 | $this->requestHandler = $this->requestHandler(); |
| 119 | 125 | } |
| 120 | 126 | |
@@ -131,30 +137,41 @@ discard block |
||
| 131 | 137 | */ |
| 132 | 138 | protected function requestHandler(): RequestHandlerInterface |
| 133 | 139 | { |
| 134 | - if (!$this->hasContainer()) { |
|
| 140 | + if (!$this->hasContainer()) |
|
| 141 | + { |
|
| 135 | 142 | throw new RouteException('Unable to configure route pipeline without associated container'); |
| 136 | 143 | } |
| 137 | 144 | |
| 138 | - if ($this->target instanceof TargetInterface) { |
|
| 139 | - try { |
|
| 145 | + if ($this->target instanceof TargetInterface) |
|
| 146 | + { |
|
| 147 | + try |
|
| 148 | + { |
|
| 140 | 149 | return $this->target->getHandler($this->container, $this->matches); |
| 141 | - } catch (TargetException $e) { |
|
| 150 | + } |
|
| 151 | + catch (TargetException $e) |
|
| 152 | + { |
|
| 142 | 153 | throw new RouteException('Invalid target resolution', $e->getCode(), $e); |
| 143 | 154 | } |
| 144 | 155 | } |
| 145 | 156 | |
| 146 | - if ($this->target instanceof RequestHandlerInterface) { |
|
| 157 | + if ($this->target instanceof RequestHandlerInterface) |
|
| 158 | + { |
|
| 147 | 159 | return $this->target; |
| 148 | 160 | } |
| 149 | 161 | |
| 150 | - try { |
|
| 151 | - if (is_object($this->target) || is_array($this->target)) { |
|
| 162 | + try |
|
| 163 | + { |
|
| 164 | + if (is_object($this->target) || is_array($this->target)) |
|
| 165 | + { |
|
| 152 | 166 | $target = $this->target; |
| 153 | - } else { |
|
| 167 | + } |
|
| 168 | + else |
|
| 169 | + { |
|
| 154 | 170 | $target = $this->container->get($this->target); |
| 155 | 171 | } |
| 156 | 172 | |
| 157 | - if ($target instanceof RequestHandlerInterface) { |
|
| 173 | + if ($target instanceof RequestHandlerInterface) |
|
| 174 | + { |
|
| 158 | 175 | return $target; |
| 159 | 176 | } |
| 160 | 177 | |
@@ -162,7 +179,9 @@ discard block |
||
| 162 | 179 | $target, |
| 163 | 180 | $this->container->get(ResponseFactoryInterface::class) |
| 164 | 181 | ); |
| 165 | - } catch (ContainerExceptionInterface $e) { |
|
| 182 | + } |
|
| 183 | + catch (ContainerExceptionInterface $e) |
|
| 184 | + { |
|
| 166 | 185 | throw new RouteException($e->getMessage(), $e->getCode(), $e); |
| 167 | 186 | } |
| 168 | 187 | } |
@@ -39,7 +39,8 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function __construct(string $controller, $action, int $options = 0) |
| 41 | 41 | { |
| 42 | - if (!is_string($action) && !is_array($action)) { |
|
| 42 | + if (!is_string($action) && !is_array($action)) |
|
| 43 | + { |
|
| 43 | 44 | throw new InvalidArgumentException( |
| 44 | 45 | sprintf( |
| 45 | 46 | 'Action parameter must type string or array, `%s` given', |
@@ -51,13 +52,16 @@ discard block |
||
| 51 | 52 | $this->controller = $controller; |
| 52 | 53 | $this->action = $action; |
| 53 | 54 | |
| 54 | - if (is_string($action)) { |
|
| 55 | + if (is_string($action)) |
|
| 56 | + { |
|
| 55 | 57 | parent::__construct( |
| 56 | 58 | ['action' => $action], |
| 57 | 59 | ['action' => new Autofill($action)], |
| 58 | 60 | $options |
| 59 | 61 | ); |
| 60 | - } else { |
|
| 62 | + } |
|
| 63 | + else |
|
| 64 | + { |
|
| 61 | 65 | parent::__construct( |
| 62 | 66 | ['action' => null], |
| 63 | 67 | ['action' => $action], |
@@ -80,7 +84,8 @@ discard block |
||
| 80 | 84 | protected function resolveAction(array $matches): string |
| 81 | 85 | { |
| 82 | 86 | $action = $this->action; |
| 83 | - if (is_string($action)) { |
|
| 87 | + if (is_string($action)) |
|
| 88 | + { |
|
| 84 | 89 | return $action; |
| 85 | 90 | } |
| 86 | 91 | |
@@ -58,7 +58,8 @@ |
||
| 58 | 58 | */ |
| 59 | 59 | protected function resolveController(array $matches): string |
| 60 | 60 | { |
| 61 | - if (preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) { |
|
| 61 | + if (preg_match('/[^a-z_0-9\-]/i', $matches['controller'])) |
|
| 62 | + { |
|
| 62 | 63 | throw new TargetException('Invalid namespace target, controller name not allowed.'); |
| 63 | 64 | } |
| 64 | 65 | |