Merge branch 'qa/cs-fixes' into develop

mezzio · Apr 24, 2020 · 069f2b8 · 069f2b8
2 parents 4ceaf33 + 1c19d23
commit 069f2b8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/AuthenticationMiddleware.php b/src/AuthenticationMiddleware.php
@@ -34,7 +34,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         $user = $this->auth->authenticate($request);
         if (null !== $user) {
-            return $handler->handle($request->withAttribute(UserInterface::class, $user)->withAttribute(\Zend\Expressive\Authentication\UserInterface::class, $user));
+            return $handler->handle(
+                $request
+                    ->withAttribute(UserInterface::class, $user)
+                    ->withAttribute(\Zend\Expressive\Authentication\UserInterface::class, $user)
+            );
         }
         return $this->auth->unauthorizedResponse($request);
     }

diff --git a/test/AuthenticationMiddlewareTest.php b/test/AuthenticationMiddlewareTest.php
@@ -60,14 +60,18 @@ public function testProcessWithAuthenticatedUser()
     {
         $response = $this->prophesize(ResponseInterface::class);
 
-        $this->request->withAttribute(UserInterface::class, $this->authenticatedUser->reveal())
-                      ->willReturn($this->request->reveal());
-        $this->request->withAttribute(\Zend\Expressive\Authentication\UserInterface::class, $this->authenticatedUser->reveal())
-                      ->willReturn($this->request->reveal());
-        $this->authentication->authenticate($this->request->reveal())
-                             ->willReturn($this->authenticatedUser->reveal());
-        $this->handler->handle($this->request->reveal())
-                      ->willReturn($response->reveal());
+        $this->request
+            ->withAttribute(UserInterface::class, $this->authenticatedUser->reveal())
+            ->willReturn($this->request->reveal());
+        $this->request
+            ->withAttribute(\Zend\Expressive\Authentication\UserInterface::class, $this->authenticatedUser->reveal())
+            ->willReturn($this->request->reveal());
+        $this->authentication
+            ->authenticate($this->request->reveal())
+            ->willReturn($this->authenticatedUser->reveal());
+        $this->handler
+            ->handle($this->request->reveal())
+            ->willReturn($response->reveal());
 
         $middleware = new AuthenticationMiddleware($this->authentication->reveal());
         $result = $middleware->process($this->request->reveal(), $this->handler->reveal());