diff --git a/phpstan.neon.dist b/phpstan.neon.dist index f554d85..5d63dbb 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -19,6 +19,15 @@ parameters: - src/Configuration.php - src/Mapping/Annotation/Router.php - src/Route/RouteResolver.php + # Slim's invokation strategy + - message: '/^Parameter #1 \$callable \(callable\(Psr\\Http\\Message\\ServerRequestInterface\): mixed\) of method Jgut\\Slim\\Routing\\Strategy\\RequestHandler::__invoke\(\) should be contravariant with parameter \$callable \(callable\(\): mixed\) of method Slim\\Interfaces\\InvocationStrategyInterface::__invoke\(\)$/' + path: src/Strategy/RequestHandler.php + - message: '/^Parameter #1 \$callable \(callable\(Psr\\Http\\Message\\ServerRequestInterface, Psr\\Http\\Message\\ResponseInterface, array\): mixed\) of method Jgut\\Slim\\Routing\\Strategy\\RequestResponse::__invoke\(\) should be contravariant with parameter \$callable \(callable\(\): mixed\) of method Slim\\Interfaces\\InvocationStrategyInterface::__invoke\(\)$/' + path: src/Strategy/RequestResponse.php + - message: '/^Parameter #1 \$callable \(callable\(Psr\\Http\\Message\\ServerRequestInterface, Psr\\Http\\Message\\ResponseInterface\): mixed\) of method Jgut\\Slim\\Routing\\Strategy\\RequestResponseArgs::__invoke\(\) should be contravariant with parameter \$callable \(callable\(\): mixed\) of method Slim\\Interfaces\\InvocationStrategyInterface::__invoke\(\)$/' + path: src/Strategy/RequestResponseArgs.php + - message: '/^Parameter #1 \$callable \(callable\(Psr\\Http\\Message\\ServerRequestInterface, Psr\\Http\\Message\\ResponseInterface\): mixed\) of method Jgut\\Slim\\Routing\\Strategy\\RequestResponseNamedArgs::__invoke\(\) should be contravariant with parameter \$callable \(callable\(\): mixed\) of method Slim\\Interfaces\\InvocationStrategyInterface::__invoke\(\)$/' + path: src/Strategy/RequestResponseNamedArgs.php # Slim's route - message: '/^Parameter #3 \$callable of method Slim\\Routing\\Route::__construct\(\) expects \(callable\(\): mixed\)\|string, array{string, string}\|\(callable\(\): mixed\)\|string given\.$/' path: src/Route/Route.php diff --git a/src/Console/AbstractRoutingCommand.php b/src/Console/AbstractRoutingCommand.php index 3dec637..a02b90a 100644 --- a/src/Console/AbstractRoutingCommand.php +++ b/src/Console/AbstractRoutingCommand.php @@ -26,7 +26,7 @@ abstract class AbstractRoutingCommand extends Command */ final protected function getTableRows(array $routes): array { - return array_values(array_map( + return array_map( static function (RouteInterface $route): array { $xmlHttpRequest = false; if ($route instanceof Route) { @@ -50,6 +50,6 @@ static function (RouteInterface $route): array { ]; }, $routes, - )); + ); } } diff --git a/src/Mapping/Driver/AnnotationDriver.php b/src/Mapping/Driver/AnnotationDriver.php index aeaa1ed..c725c71 100644 --- a/src/Mapping/Driver/AnnotationDriver.php +++ b/src/Mapping/Driver/AnnotationDriver.php @@ -42,7 +42,7 @@ public function getMetadata(): array $routes[] = $this->getRoutesMetadata($class, $groups); } - return \count($routes) > 0 ? array_values(array_merge(...$routes)) : []; + return \count($routes) > 0 ? array_merge(...$routes) : []; } /** diff --git a/src/Mapping/Driver/AttributeDriver.php b/src/Mapping/Driver/AttributeDriver.php index d38239c..221257c 100644 --- a/src/Mapping/Driver/AttributeDriver.php +++ b/src/Mapping/Driver/AttributeDriver.php @@ -47,7 +47,7 @@ public function getMetadata(): array $routes[] = $this->getRoutesMetadata($class, $groups); } - return \count($routes) > 0 ? array_values(array_merge(...$routes)) : []; + return \count($routes) > 0 ? array_merge(...$routes) : []; } /** @@ -245,7 +245,7 @@ private function populateTransformer( } $metadata->setParameters($parameters); - $metadata->setTransformers(array_values($transformers)); + $metadata->setTransformers($transformers); } /** diff --git a/src/Mapping/Driver/FileMappingTrait.php b/src/Mapping/Driver/FileMappingTrait.php index 69181ae..e0e6664 100644 --- a/src/Mapping/Driver/FileMappingTrait.php +++ b/src/Mapping/Driver/FileMappingTrait.php @@ -70,7 +70,7 @@ protected function getRoutesMetadata(array $mappingData, ?GroupMetadata $group = } } - return \count($routes) > 0 ? array_values(array_merge(...$routes)) : []; + return \count($routes) > 0 ? array_merge(...$routes) : []; } /** diff --git a/src/Route/RouteResolver.php b/src/Route/RouteResolver.php index 8f9303d..3a11f59 100644 --- a/src/Route/RouteResolver.php +++ b/src/Route/RouteResolver.php @@ -51,7 +51,7 @@ public function getMiddleware(RouteMetadata $route): array )); array_unshift($middleware, $route->getMiddlewares()); - return array_values(array_merge(...$middleware)); + return array_merge(...$middleware); } /** @@ -249,9 +249,9 @@ static function (array $itemA, array $itemB) use ($sortFunction): int { }, ); - return array_values(array_map( + return array_map( static fn(array $item): RouteMetadata => $item[1], $sortArray, - )); + ); } }