diff options
Diffstat (limited to 'Guard')
| -rw-r--r-- | Guard/Firewall/GuardAuthenticationListener.php | 4 | ||||
| -rw-r--r-- | Guard/GuardAuthenticatorInterface.php | 4 | ||||
| -rw-r--r-- | Guard/Tests/Firewall/GuardAuthenticationListenerTest.php | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Guard/Firewall/GuardAuthenticationListener.php b/Guard/Firewall/GuardAuthenticationListener.php index 5c6de60..9e2a886 100644 --- a/Guard/Firewall/GuardAuthenticationListener.php +++ b/Guard/Firewall/GuardAuthenticationListener.php @@ -74,11 +74,11 @@ class GuardAuthenticationListener implements ListenerInterface $request = $event->getRequest(); try { if (null !== $this->logger) { - $this->logger->info('Calling getCredentialsFromRequest on guard configurator', array('firewall_key' => $this->providerKey, 'authenticator' => get_class($guardAuthenticator))); + $this->logger->info('Calling getCredentials on guard configurator.', array('firewall_key' => $this->providerKey, 'authenticator' => get_class($guardAuthenticator))); } // allow the authenticator to fetch authentication info from the request - $credentials = $guardAuthenticator->getCredentialsFromRequest($request); + $credentials = $guardAuthenticator->getCredentials($request); // allow null to be returned to skip authentication if (null === $credentials) { diff --git a/Guard/GuardAuthenticatorInterface.php b/Guard/GuardAuthenticatorInterface.php index 0b4306c..4b1e407 100644 --- a/Guard/GuardAuthenticatorInterface.php +++ b/Guard/GuardAuthenticatorInterface.php @@ -44,13 +44,13 @@ interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface * * @return mixed|null */ - public function getCredentialsFromRequest(Request $request); + public function getCredentials(Request $request); /** * Return a UserInterface object based on the credentials OR throw * an AuthenticationException. * - * The *credentials* are the return value from getCredentialsFromRequest() + * The *credentials* are the return value from getCredentials() * * @param mixed $credentials * @param UserProviderInterface $userProvider diff --git a/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php index 2de60c1..ab78292 100644 --- a/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php +++ b/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php @@ -38,7 +38,7 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase $credentials = array('username' => 'weaverryan', 'password' => 'all_your_base'); $authenticator ->expects($this->once()) - ->method('getCredentialsFromRequest') + ->method('getCredentials') ->with($this->equalTo($this->request)) ->will($this->returnValue($credentials)); @@ -87,7 +87,7 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase $authenticator ->expects($this->once()) - ->method('getCredentialsFromRequest') + ->method('getCredentials') ->with($this->equalTo($this->request)) ->will($this->returnValue(array('username' => 'anything_not_empty'))); @@ -130,7 +130,7 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase $authException = new AuthenticationException('Get outta here crazy user with a bad password!'); $authenticator ->expects($this->once()) - ->method('getCredentialsFromRequest') + ->method('getCredentials') ->will($this->throwException($authException)); // this is not called @@ -162,11 +162,11 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase $authenticatorA ->expects($this->once()) - ->method('getCredentialsFromRequest') + ->method('getCredentials') ->will($this->returnValue(null)); $authenticatorB ->expects($this->once()) - ->method('getCredentialsFromRequest') + ->method('getCredentials') ->will($this->returnValue(null)); // this is not called |