Merge branch '4.x' into refactor

slimphp · Jul 7, 2022 · 1ce17b7 · 1ce17b7
2 parents da61426 + 484a32a
commit 1ce17b7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/Slim/CallableResolver.php b/Slim/CallableResolver.php
@@ -49,7 +49,7 @@ public function resolve($toResolve): callable
         $resolved = $toResolve;
         if (is_string($toResolve)) {
             $resolved = $this->resolveSlimNotation($toResolve);
-            $resolved[1] = $resolved[1] ?? '__invoke';
+            $resolved[1] ??= '__invoke';
         }
         $callable = $this->assertCallable($resolved, $toResolve);
         return $this->bindToContainer($callable);

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/tests/AppTest.php b/tests/AppTest.php
@@ -1862,9 +1862,7 @@ public function testCanBeReExecutedRecursivelyDuringDispatch(): void
 
             /** @var ResponseInterface $response */
             $response = $app->handle($request->withAddedHeader('X-NESTED', '1'));
-            $response = $response->withAddedHeader('X-TRACE', 'outer');
-
-            return $response;
+            return $response->withAddedHeader('X-TRACE', 'outer');
         });
 
         $middlewareProphecy2 = $this->prophesize(MiddlewareInterface::class);

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -39,16 +39,10 @@
     ],
     RouteCollector::class => [
         'is_readable' => function (string $file): bool {
-            if (stripos($file, 'non-readable.cache') !== false) {
-                return false;
-            }
-            return true;
+            return stripos($file, 'non-readable.cache') === false;
         },
         'is_writable' => function (string $path): bool {
-            if (stripos($path, 'non-writable-directory') !== false) {
-                return false;
-            }
-            return true;
+            return stripos($path, 'non-writable-directory') === false;
         }
     ]
 ]);