Changing the security middleware

cakephp · Apr 4, 2017 · 3f61fcf · 3f61fcf
1 parent bc2495a
commit 3f61fcf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/Routing/Middleware/SecurityMiddleware.php b/src/Routing/Middleware/SecurityMiddleware.php
@@ -170,11 +170,10 @@ protected function checkValues($value, array $allowed)
     {
         if (!in_array($value, $allowed)) {
             throw new InvalidArgumentException(sprintf(
-                    'Invalid arg `%s`, use one of these: %s',
-                    $value,
-                    implode(', ', $allowed)
-                )
-            );
+                'Invalid arg `%s`, use one of these: %s',
+                $value,
+                implode(', ', $allowed)
+            ));
         }
     }
 
@@ -188,10 +187,11 @@ protected function checkValues($value, array $allowed)
      */
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, $next)
     {
+        $response = $next($request, $response);
         foreach ($this->headers as $header => $value) {
             $response = $response->withHeader($header, $value);
         }
 
-        return $next($request, $response);
+        return $response;
     }
 }
diff --git a/tests/TestCase/Routing/Middleware/SecurityMiddlewareTest.php b/tests/TestCase/Routing/Middleware/SecurityMiddlewareTest.php
@@ -22,7 +22,8 @@
 /**
  * Test for SecurityMiddleware
  */
-class SecurityMiddlewareTest extends TestCase {
+class SecurityMiddlewareTest extends TestCase
+{
 
     /**
      * Test adding the security headers