@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | $this->assertCount(0, $routes->getCollection()); |
| 19 | 19 | |
| 20 | - $routes->import(\dirname(__DIR__, 2) . '/Fixtures/file.php'); |
|
| 20 | + $routes->import(\dirname(__DIR__, 2).'/Fixtures/file.php'); |
|
| 21 | 21 | |
| 22 | 22 | $this->assertCount(3, $routes->getCollection()); |
| 23 | 23 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $this->assertCount(0, $routes->getCollection()); |
| 30 | 30 | |
| 31 | - $routes->import(\dirname(__DIR__, 2) . '/Fixtures/file.php', 'php'); |
|
| 31 | + $routes->import(\dirname(__DIR__, 2).'/Fixtures/file.php', 'php'); |
|
| 32 | 32 | |
| 33 | 33 | $this->assertCount(3, $routes->getCollection()); |
| 34 | 34 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | $this->assertCount(0, $routes->getCollection()); |
| 41 | 41 | |
| 42 | - $routes->import(\dirname(__DIR__, 2) . '/Fixtures/file.php', 'yaml'); |
|
| 42 | + $routes->import(\dirname(__DIR__, 2).'/Fixtures/file.php', 'yaml'); |
|
| 43 | 43 | |
| 44 | 44 | $this->assertCount(0, $routes->getCollection()); |
| 45 | 45 | } |
@@ -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'); |
@@ -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 | |
@@ -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 | |
@@ -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 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | public function __construct( |
| 18 | 18 | private readonly ContainerInterface $container, |
| 19 | 19 | private readonly FactoryInterface $factory |
| 20 | - ) { |
|
| 20 | + ){ |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -26,27 +26,27 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function createWithMiddleware(array $middleware): Pipeline |
| 28 | 28 | { |
| 29 | - if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline) { |
|
| 29 | + if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline){ |
|
| 30 | 30 | return $middleware[0]; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | $pipeline = $this->factory->make(Pipeline::class); |
| 34 | 34 | \assert($pipeline instanceof Pipeline); |
| 35 | 35 | |
| 36 | - foreach ($middleware as $item) { |
|
| 37 | - if ($item instanceof MiddlewareInterface) { |
|
| 36 | + foreach ($middleware as $item){ |
|
| 37 | + if ($item instanceof MiddlewareInterface){ |
|
| 38 | 38 | $pipeline->pushMiddleware($item); |
| 39 | - } elseif (\is_string($item)) { |
|
| 39 | + } elseif (\is_string($item)){ |
|
| 40 | 40 | $item = $this->container->get($item); |
| 41 | 41 | \assert($item instanceof MiddlewareInterface); |
| 42 | 42 | |
| 43 | 43 | $pipeline->pushMiddleware($item); |
| 44 | - } elseif ($item instanceof Autowire) { |
|
| 44 | + } elseif ($item instanceof Autowire){ |
|
| 45 | 45 | $item = $item->resolve($this->factory); |
| 46 | 46 | \assert($item instanceof MiddlewareInterface); |
| 47 | 47 | |
| 48 | 48 | $pipeline->pushMiddleware($item); |
| 49 | - } else { |
|
| 49 | + }else{ |
|
| 50 | 50 | $name = get_debug_type($item); |
| 51 | 51 | throw new RouteException(\sprintf('Invalid middleware `%s`', $name)); |
| 52 | 52 | } |
@@ -26,27 +26,36 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | public function createWithMiddleware(array $middleware): Pipeline |
| 28 | 28 | { |
| 29 | - if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline) { |
|
| 29 | + if (\count($middleware) === 1 && $middleware[0] instanceof Pipeline) |
|
| 30 | + { |
|
| 30 | 31 | return $middleware[0]; |
| 31 | 32 | } |
| 32 | 33 | |
| 33 | 34 | $pipeline = $this->factory->make(Pipeline::class); |
| 34 | 35 | \assert($pipeline instanceof Pipeline); |
| 35 | 36 | |
| 36 | - foreach ($middleware as $item) { |
|
| 37 | - if ($item instanceof MiddlewareInterface) { |
|
| 37 | + foreach ($middleware as $item) |
|
| 38 | + { |
|
| 39 | + if ($item instanceof MiddlewareInterface) |
|
| 40 | + { |
|
| 38 | 41 | $pipeline->pushMiddleware($item); |
| 39 | - } elseif (\is_string($item)) { |
|
| 42 | + } |
|
| 43 | + elseif (\is_string($item)) |
|
| 44 | + { |
|
| 40 | 45 | $item = $this->container->get($item); |
| 41 | 46 | \assert($item instanceof MiddlewareInterface); |
| 42 | 47 | |
| 43 | 48 | $pipeline->pushMiddleware($item); |
| 44 | - } elseif ($item instanceof Autowire) { |
|
| 49 | + } |
|
| 50 | + elseif ($item instanceof Autowire) |
|
| 51 | + { |
|
| 45 | 52 | $item = $item->resolve($this->factory); |
| 46 | 53 | \assert($item instanceof MiddlewareInterface); |
| 47 | 54 | |
| 48 | 55 | $pipeline->pushMiddleware($item); |
| 49 | - } else { |
|
| 56 | + } |
|
| 57 | + else |
|
| 58 | + { |
|
| 50 | 59 | $name = get_debug_type($item); |
| 51 | 60 | throw new RouteException(\sprintf('Invalid middleware `%s`', $name)); |
| 52 | 61 | } |
@@ -19,9 +19,9 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | public function withVerbs(string ...$verbs): RouteInterface |
| 21 | 21 | { |
| 22 | - foreach ($verbs as &$verb) { |
|
| 22 | + foreach ($verbs as &$verb){ |
|
| 23 | 23 | $verb = \strtoupper($verb); |
| 24 | - if (!\in_array($verb, RouteInterface::VERBS, true)) { |
|
| 24 | + if (!\in_array($verb, RouteInterface::VERBS, true)){ |
|
| 25 | 25 | throw new RouteException(\sprintf('Invalid HTTP verb `%s`', $verb)); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -19,9 +19,11 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | public function withVerbs(string ...$verbs): RouteInterface |
| 21 | 21 | { |
| 22 | - foreach ($verbs as &$verb) { |
|
| 22 | + foreach ($verbs as &$verb) |
|
| 23 | + { |
|
| 23 | 24 | $verb = \strtoupper($verb); |
| 24 | - if (!\in_array($verb, RouteInterface::VERBS, true)) { |
|
| 25 | + if (!\in_array($verb, RouteInterface::VERBS, true)) |
|
| 26 | + { |
|
| 25 | 27 | throw new RouteException(\sprintf('Invalid HTTP verb `%s`', $verb)); |
| 26 | 28 | } |
| 27 | 29 | |
@@ -10,6 +10,6 @@ |
||
| 10 | 10 | { |
| 11 | 11 | public function __construct( |
| 12 | 12 | public readonly ServerRequestInterface $request |
| 13 | - ) { |
|
| 13 | + ){ |
|
| 14 | 14 | } |
| 15 | 15 | } |
@@ -12,6 +12,6 @@ |
||
| 12 | 12 | public function __construct( |
| 13 | 13 | public readonly ServerRequestInterface $request, |
| 14 | 14 | public readonly RouteInterface $route, |
| 15 | - ) { |
|
| 15 | + ){ |
|
| 16 | 16 | } |
| 17 | 17 | } |