Improve authorization constructor

Author: ilijastuden

src/Authentication.php

@@ -70,7 +70,7 @@ class Authentication implements AuthenticationInterface
      */
     private $on_user_deauthenticated = [];
 
-    public function __construct(array $adapters)
+    public function __construct(AdapterInterface ...$adapters)
     {
         foreach ($adapters as $adapter) {
             if (!($adapter instanceof AdapterInterface)) {

test/src/AuthenticationMiddlewareTest.php

@@ -27,11 +27,9 @@
 use ActiveCollab\Authentication\Token\TokenInterface;
 use ActiveCollab\Cookies\Cookies;
 use ActiveCollab\Cookies\CookiesInterface;
-use LogicException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use stdClass;
 use Zend\Diactoros\ResponseFactory;
 
 class AuthenticationMiddlewareTest extends RequestResponseTestCase
@@ -127,21 +125,11 @@ public function setUp()
         );
     }
 
-    public function testExceptionIfInvalidAdaptersAreSet()
-    {
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('Invalid authentication adapter provided');
-
-        new Authentication([new stdClass()]);
-    }
-
     public function testMiddlewareAcceptsMultipleAdapters()
     {
         $middleware = new Authentication(
-            [
-                $this->browser_session_adapter,
-                $this->token_bearer_adapter
-            ]
+            $this->browser_session_adapter,
+            $this->token_bearer_adapter
         );
 
         $this->assertIsArray($middleware->getAdapters());
@@ -161,9 +149,7 @@ public function testBrowserSessionAuthentication()
         ] = $this->cookies->set($this->request, $this->response, $this->browser_session_cookie_name, 'my-session-id');
 
         $middleware = new Authentication(
-            [
-                $this->browser_session_adapter
-            ]
+            $this->browser_session_adapter
         );
 
         /** @var ServerRequestInterface $modifiedRequest */
@@ -217,9 +203,7 @@ public function testBrowserSessionAuthenticationPsr15()
         $this->assertInstanceOf(ServerRequestInterface::class, $request);
 
         $middleware = new Authentication(
-            [
-                $this->browser_session_adapter
-            ]
+            $this->browser_session_adapter
         );
 
         $requestHandler = new class implements RequestHandlerInterface
@@ -268,7 +252,7 @@ public function testTokenBearerAuthentication()
         /** @var ServerRequestInterface $request */
         $request = $this->request->withHeader('Authorization', 'Bearer awesome-token');
 
-        $middleware = new Authentication([$this->token_bearer_adapter]);
+        $middleware = new Authentication($this->token_bearer_adapter);
 
         /** @var ServerRequestInterface $modifiedRequest */
         $modifiedRequest = null;
@@ -313,7 +297,7 @@ public function testTokenBearerAuthenticationPsr15()
         /** @var ServerRequestInterface $request */
         $request = $this->request->withHeader('Authorization', 'Bearer awesome-token');
 
-        $middleware = new Authentication([$this->token_bearer_adapter]);
+        $middleware = new Authentication($this->token_bearer_adapter);
 
         $requestHandler = new class implements RequestHandlerInterface
         {
@@ -360,11 +344,23 @@ public function testExceptionOnMultipleIds()
 
         /** @var ServerRequestInterface $request */
         /** @var ResponseInterface $response */
-        [$request, $response] = $this->cookies->set($this->request, $this->response, $this->browser_session_cookie_name, 'my-session-id');
+        [
+            $request,
+            $response,
+        ] = $this->cookies->set(
+            $this->request,
+            $this->response,
+            $this->browser_session_cookie_name,
+            'my-session-id'
+        );
 
         /** @var ServerRequestInterface $request */
         $request = $request->withHeader('Authorization', 'Bearer awesome-token');
 
-        call_user_func(new Authentication([$this->browser_session_adapter, $this->token_bearer_adapter]), $request, $response);
+        call_user_func(
+            new Authentication($this->browser_session_adapter, $this->token_bearer_adapter),
+            $request,
+            $response
+        );
     }
 }

test/src/EventsTest.php

@@ -249,9 +249,9 @@ private function prepareForAuthentication($session_id = 'my-session-id')
         ]);
         $session_repository = new SessionRepository([new Session($session_id, '[email protected]')]);
 
-        return new Authentication([
-            new BrowserSessionAdapter($user_repository, $session_repository, $this->cookies),
-        ]);
+        return new Authentication(
+            new BrowserSessionAdapter($user_repository, $session_repository, $this->cookies)
+        );
     }
 
     private function prepareForAuthorization($session_id = 'my-session-id')
@@ -263,7 +263,7 @@ private function prepareForAuthorization($session_id = 'my-session-id')
         $session_repository = new SessionRepository([new Session($session_id, '[email protected]')]);
 
         $browser_session_adapter = new BrowserSessionAdapter($user_repository, $session_repository, $this->cookies);
-        $authentication = new Authentication([$browser_session_adapter]);
+        $authentication = new Authentication($browser_session_adapter);
 
         return [$authentication, $browser_session_adapter, new LocalAuthorizer($user_repository)];
     }