From 1edc849f072a9f31dfed6fca7ef02d9eeff051e8 Mon Sep 17 00:00:00 2001 From: mapogolions Date: Sat, 17 Aug 2019 00:35:28 +0500 Subject: [PATCH 1/2] Simplify prepare of arguments --- Slim/Routing/Route.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Slim/Routing/Route.php b/Slim/Routing/Route.php index 29b2a8478..f16257254 100644 --- a/Slim/Routing/Route.php +++ b/Slim/Routing/Route.php @@ -304,14 +304,7 @@ public function addMiddleware(MiddlewareInterface $middleware): RouteInterface */ public function prepare(array $arguments): RouteInterface { - // Remove temp arguments - $this->setArguments($this->savedArguments); - - // Add the arguments - foreach ($arguments as $k => $v) { - $this->setArgument($k, $v, false); - } - + $this->arguments = array_replace($this->savedArguments, $arguments); return $this; } From 4ddb0a5f6c8feefdac7e91863b7165001d7446cb Mon Sep 17 00:00:00 2001 From: mapogolions Date: Sat, 17 Aug 2019 01:08:59 +0500 Subject: [PATCH 2/2] Add null safety for phpstan --- Slim/Routing/Route.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Slim/Routing/Route.php b/Slim/Routing/Route.php index f16257254..cb60a3721 100644 --- a/Slim/Routing/Route.php +++ b/Slim/Routing/Route.php @@ -304,7 +304,7 @@ public function addMiddleware(MiddlewareInterface $middleware): RouteInterface */ public function prepare(array $arguments): RouteInterface { - $this->arguments = array_replace($this->savedArguments, $arguments); + $this->arguments = array_replace($this->savedArguments, $arguments) ?? []; return $this; }