Merge branch '4.x' into 0-assign-null-coalescing-to-coalesce-equal

slimphp · Jul 7, 2022 · beef649 · beef649
2 parents 399e84a + fbb442e
commit beef649
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Slim/Middleware/BodyParsingMiddleware.php b/Slim/Middleware/BodyParsingMiddleware.php
@@ -154,7 +154,7 @@ protected function parseBody(ServerRequestInterface $request)
             $body = (string)$request->getBody();
             $parsed = $this->bodyParsers[$mediaType]($body);
 
-            if (!is_null($parsed) && !is_object($parsed) && !is_array($parsed)) {
+            if ($parsed !== null && !is_object($parsed) && !is_array($parsed)) {
                 throw new RuntimeException(
                     'Request body media type parser return value must be an array, an object, or null'
                 );

diff --git a/Slim/Routing/Dispatcher.php b/Slim/Routing/Dispatcher.php
@@ -27,7 +27,7 @@ protected function createDispatcher(): FastRouteDispatcher
             return $this->dispatcher;
         }
 
-        $routeDefinitionCallback = function (FastRouteCollector $r) {
+        $routeDefinitionCallback = function (FastRouteCollector $r): void {
             $basePath = $this->routeCollector->getBasePath();
 
             foreach ($this->routeCollector->getRoutes() as $route) {