Merge pull request #217 from cakephp/move-checks

Move Authentication service checks for early failures.

Author: markstory

src/Controller/Component/AuthenticationComponent.php

@@ -85,6 +85,14 @@ public function initialize(array $config)
      */
     public function beforeFilter()
     {
+        if ($this->_authentication === null) {
+            throw new Exception('The request object does not contain the required `authentication` attribute');
+        }
+
+        if (!($this->_authentication instanceof AuthenticationServiceInterface)) {
+            throw new Exception('Authentication service does not implement ' . AuthenticationServiceInterface::class);
+        }
+
         $provider = $this->_authentication->getAuthenticationProvider();
 
         if ($provider === null ||
@@ -110,14 +118,6 @@ public function beforeFilter()
      */
     public function startup()
     {
-        if ($this->_authentication === null) {
-            throw new Exception('The request object does not contain the required `authentication` attribute');
-        }
-
-        if (!($this->_authentication instanceof AuthenticationServiceInterface)) {
-            throw new Exception('Authentication service does not implement ' . AuthenticationServiceInterface::class);
-        }
-
         if (!$this->getConfig('requireIdentity')) {
             return;
         }

tests/TestCase/Controller/Component/AuthenticationComponentTest.php

@@ -82,7 +82,7 @@ public function testInitializeMissingServiceAttribute()
         $controller = new Controller($this->request, $this->response);
         $registry = new ComponentRegistry($controller);
         $component = new AuthenticationComponent($registry);
-        $component->startup();
+        $component->beforeFilter();
     }
 
     /**
@@ -98,7 +98,7 @@ public function testInitializeInvalidServiceObject()
         $controller = new Controller($request, $this->response);
         $registry = new ComponentRegistry($controller);
         $component = new AuthenticationComponent($registry);
-        $component->startup();
+        $component->beforeFilter();
     }
 
     /**