@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Spiral\Router\Loader\Configurator\RoutingConfigurator; |
| 4 | 4 | |
| 5 | -return function (RoutingConfigurator $routes) { |
|
| 5 | +return function (RoutingConfigurator $routes){ |
|
| 6 | 6 | $routes->add('index', '/')->callable(static fn () => null); |
| 7 | 7 | $routes->add('posts', '/posts')->callable(static fn () => null); |
| 8 | 8 | $routes->add('post', '/post/<id>')->callable(static fn () => null); |
@@ -2,7 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Spiral\Router\Loader\Configurator\RoutingConfigurator; |
| 4 | 4 | |
| 5 | -return function (RoutingConfigurator $routes) { |
|
| 5 | +return function (RoutingConfigurator $routes) |
|
| 6 | +{ |
|
| 6 | 7 | $routes->add('index', '/')->callable(static fn () => null); |
| 7 | 8 | $routes->add('posts', '/posts')->callable(static fn () => null); |
| 8 | 9 | $routes->add('post', '/post/<id>')->callable(static fn () => null); |
@@ -96,9 +96,9 @@ |
||
| 96 | 96 | $this->assertSame('echoed', (string)$response->getBody()); |
| 97 | 97 | |
| 98 | 98 | $e = null; |
| 99 | - try { |
|
| 99 | + try{ |
|
| 100 | 100 | $router->handle(new ServerRequest('GET', new Uri('/test'))); |
| 101 | - } catch (UndefinedRouteException $e) { |
|
| 101 | + }catch (UndefinedRouteException $e){ |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | $this->assertNotNull($e, 'Autofill not fired'); |
@@ -96,9 +96,12 @@ |
||
| 96 | 96 | $this->assertSame('echoed', (string)$response->getBody()); |
| 97 | 97 | |
| 98 | 98 | $e = null; |
| 99 | - try { |
|
| 99 | + try |
|
| 100 | + { |
|
| 100 | 101 | $router->handle(new ServerRequest('GET', new Uri('/test'))); |
| 101 | - } catch (UndefinedRouteException $e) { |
|
| 102 | + } |
|
| 103 | + catch (UndefinedRouteException $e) |
|
| 104 | + { |
|
| 102 | 105 | } |
| 103 | 106 | |
| 104 | 107 | $this->assertNotNull($e, 'Autofill not fired'); |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | $dispatcher |
| 51 | 51 | ->expects(self::exactly(2)) |
| 52 | 52 | ->method('dispatch') |
| 53 | - ->with($this->callback(static fn (Routing|RouteMatched $event): bool => $event->request instanceof ServerRequest)); |
|
| 53 | + ->with($this->callback(static fn (Routing | RouteMatched $event): bool => $event->request instanceof ServerRequest)); |
|
| 54 | 54 | |
| 55 | 55 | $router = $this->makeRouter('', $dispatcher); |
| 56 | 56 | $router->setDefault($route); |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | $response = new Response($code); |
| 34 | 34 | $response = $response->withStatus($code, $reasonPhrase); |
| 35 | 35 | |
| 36 | - foreach ($this->config->getBaseHeaders() as $header => $value) { |
|
| 36 | + foreach ($this->config->getBaseHeaders() as $header => $value){ |
|
| 37 | 37 | $response = $response->withAddedHeader($header, $value); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -33,7 +33,8 @@ |
||
| 33 | 33 | $response = new Response($code); |
| 34 | 34 | $response = $response->withStatus($code, $reasonPhrase); |
| 35 | 35 | |
| 36 | - foreach ($this->config->getBaseHeaders() as $header => $value) { |
|
| 36 | + foreach ($this->config->getBaseHeaders() as $header => $value) |
|
| 37 | + { |
|
| 37 | 38 | $response = $response->withAddedHeader($header, $value); |
| 38 | 39 | } |
| 39 | 40 | |
@@ -14,19 +14,19 @@ |
||
| 14 | 14 | public function __construct( |
| 15 | 15 | private readonly RouteCollection $collection, |
| 16 | 16 | private readonly LoaderInterface $loader |
| 17 | - ) { |
|
| 17 | + ){ |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function import(string|array $resource, string $type = null): ImportConfigurator |
|
| 20 | + public function import(string | array $resource, string $type = null): ImportConfigurator |
|
| 21 | 21 | { |
| 22 | 22 | $imported = $this->loader->load($resource, $type) ?: []; |
| 23 | 23 | |
| 24 | - if (!\is_array($imported)) { |
|
| 24 | + if (!\is_array($imported)){ |
|
| 25 | 25 | return new ImportConfigurator($this->collection, $imported); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $mergedCollection = new RouteCollection(); |
| 29 | - foreach ($imported as $subCollection) { |
|
| 29 | + foreach ($imported as $subCollection){ |
|
| 30 | 30 | $mergedCollection->addCollection($subCollection); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -21,12 +21,14 @@ |
||
| 21 | 21 | { |
| 22 | 22 | $imported = $this->loader->load($resource, $type) ?: []; |
| 23 | 23 | |
| 24 | - if (!\is_array($imported)) { |
|
| 24 | + if (!\is_array($imported)) |
|
| 25 | + { |
|
| 25 | 26 | return new ImportConfigurator($this->collection, $imported); |
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | $mergedCollection = new RouteCollection(); |
| 29 | - foreach ($imported as $subCollection) { |
|
| 30 | + foreach ($imported as $subCollection) |
|
| 31 | + { |
|
| 30 | 32 | $mergedCollection->addCollection($subCollection); |
| 31 | 33 | } |
| 32 | 34 | |
@@ -31,12 +31,12 @@ discard block |
||
| 31 | 31 | private readonly string $name, |
| 32 | 32 | private readonly string $pattern, |
| 33 | 33 | private readonly RouteCollection $collection |
| 34 | - ) { |
|
| 34 | + ){ |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function __destruct() |
| 38 | 38 | { |
| 39 | - if ($this->target === null) { |
|
| 39 | + if ($this->target === null){ |
|
| 40 | 40 | throw new TargetException( |
| 41 | 41 | \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`, |
| 42 | 42 | `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name) |
@@ -87,21 +87,21 @@ discard block |
||
| 87 | 87 | return $this; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - public function action(string $controller, string|array $action, int $options = 0): self |
|
| 90 | + public function action(string $controller, string | array $action, int $options = 0): self |
|
| 91 | 91 | { |
| 92 | 92 | $this->target = new Action($controller, $action, $options); |
| 93 | 93 | |
| 94 | 94 | return $this; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - public function callable(array|\Closure $callable): self |
|
| 97 | + public function callable(array | \Closure $callable): self |
|
| 98 | 98 | { |
| 99 | 99 | $this->target = $callable; |
| 100 | 100 | |
| 101 | 101 | return $this; |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - public function handler(TargetInterface|string $target): self |
|
| 104 | + public function handler(TargetInterface | string $target): self |
|
| 105 | 105 | { |
| 106 | 106 | $this->target = $target; |
| 107 | 107 | |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | return $this; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - public function middleware(MiddlewareInterface|string|array $middleware): self |
|
| 139 | + public function middleware(MiddlewareInterface | string | array $middleware): self |
|
| 140 | 140 | { |
| 141 | - if (!\is_array($middleware)) { |
|
| 141 | + if (!\is_array($middleware)){ |
|
| 142 | 142 | $middleware = [$middleware]; |
| 143 | 143 | } |
| 144 | 144 | |
@@ -147,9 +147,9 @@ discard block |
||
| 147 | 147 | return $this; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - public function methods(string|array $methods): self |
|
| 150 | + public function methods(string | array $methods): self |
|
| 151 | 151 | { |
| 152 | - $this->methods = (array) $methods; |
|
| 152 | + $this->methods = (array)$methods; |
|
| 153 | 153 | |
| 154 | 154 | return $this; |
| 155 | 155 | } |
@@ -36,7 +36,8 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function __destruct() |
| 38 | 38 | { |
| 39 | - if ($this->target === null) { |
|
| 39 | + if ($this->target === null) |
|
| 40 | + { |
|
| 40 | 41 | throw new TargetException( |
| 41 | 42 | \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`, |
| 42 | 43 | `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name) |
@@ -138,7 +139,8 @@ discard block |
||
| 138 | 139 | |
| 139 | 140 | public function middleware(MiddlewareInterface|string|array $middleware): self |
| 140 | 141 | { |
| 141 | - if (!\is_array($middleware)) { |
|
| 142 | + if (!\is_array($middleware)) |
|
| 143 | + { |
|
| 142 | 144 | $middleware = [$middleware]; |
| 143 | 145 | } |
| 144 | 146 | |
@@ -10,12 +10,12 @@ |
||
| 10 | 10 | { |
| 11 | 11 | public function __construct( |
| 12 | 12 | private readonly LoaderRegistryInterface $registry |
| 13 | - ) { |
|
| 13 | + ){ |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | public function load(mixed $resource, string $type = null): mixed |
| 17 | 17 | { |
| 18 | - if (false === $loader = $this->registry->resolve($resource, $type)) { |
|
| 18 | + if (false === $loader = $this->registry->resolve($resource, $type)){ |
|
| 19 | 19 | throw new LoaderLoadException(\sprintf('Loader for type [%s] not found.', $type)); |
| 20 | 20 | } |
| 21 | 21 | |
@@ -15,7 +15,8 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function load(mixed $resource, string $type = null): mixed |
| 17 | 17 | { |
| 18 | - if (false === $loader = $this->registry->resolve($resource, $type)) { |
|
| 18 | + if (false === $loader = $this->registry->resolve($resource, $type)) |
|
| 19 | + { |
|
| 19 | 20 | throw new LoaderLoadException(\sprintf('Loader for type [%s] not found.', $type)); |
| 20 | 21 | } |
| 21 | 22 | |
@@ -11,5 +11,5 @@ |
||
| 11 | 11 | * |
| 12 | 12 | * @param string|null $type The resource type or null if unknown |
| 13 | 13 | */ |
| 14 | - public function resolve(mixed $resource, string $type = null): LoaderInterface|false; |
|
| 14 | + public function resolve(mixed $resource, string $type = null): LoaderInterface | false; |
|
| 15 | 15 | } |
@@ -16,15 +16,15 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | public function __construct(array $loaders = []) |
| 18 | 18 | { |
| 19 | - foreach ($loaders as $loader) { |
|
| 19 | + foreach ($loaders as $loader){ |
|
| 20 | 20 | $this->addLoader($loader); |
| 21 | 21 | } |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function resolve(mixed $resource, string $type = null): LoaderInterface|false |
|
| 24 | + public function resolve(mixed $resource, string $type = null): LoaderInterface | false |
|
| 25 | 25 | { |
| 26 | - foreach ($this->loaders as $loader) { |
|
| 27 | - if ($loader->supports($resource, $type)) { |
|
| 26 | + foreach ($this->loaders as $loader){ |
|
| 27 | + if ($loader->supports($resource, $type)){ |
|
| 28 | 28 | return $loader; |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -16,15 +16,18 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | public function __construct(array $loaders = []) |
| 18 | 18 | { |
| 19 | - foreach ($loaders as $loader) { |
|
| 19 | + foreach ($loaders as $loader) |
|
| 20 | + { |
|
| 20 | 21 | $this->addLoader($loader); |
| 21 | 22 | } |
| 22 | 23 | } |
| 23 | 24 | |
| 24 | 25 | public function resolve(mixed $resource, string $type = null): LoaderInterface|false |
| 25 | 26 | { |
| 26 | - foreach ($this->loaders as $loader) { |
|
| 27 | - if ($loader->supports($resource, $type)) { |
|
| 27 | + foreach ($this->loaders as $loader) |
|
| 28 | + { |
|
| 29 | + if ($loader->supports($resource, $type)) |
|
| 30 | + { |
|
| 28 | 31 | return $loader; |
| 29 | 32 | } |
| 30 | 33 | } |