Skip to content

Commit

Permalink
Ranaming method for consistency sake
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Jun 6, 2014
1 parent c7adbe6 commit db362f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/Controller/Component/AuthComponent.php
Expand Up @@ -227,7 +227,7 @@ class AuthComponent extends Component {
*
* @var Cake\Auth\BaseAuthenticate
*/
protected $_authenticateProvider;
protected $_authenticationProvider;

/**
* The instance of the Authorize provider that was used to grant
Expand Down Expand Up @@ -740,7 +740,7 @@ public function identify(Request $request, Response $response) {
foreach ($this->_authenticateObjects as $auth) {
$result = $auth->authenticate($request, $response);
if (!empty($result) && is_array($result)) {
$this->_authenticateProvider = $auth;
$this->_authenticationProvider = $auth;
return $result;
}
}
Expand Down Expand Up @@ -809,8 +809,8 @@ public function flash($message, $type = 'error') {
*
* @return \Cake\Auth\BaseAuthenticate|null
*/
public function loginProvider() {
return $this->_authenticateProvider;
public function authenticationProvider() {
return $this->_authenticationProvider;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Controller/Component/AuthComponentTest.php
Expand Up @@ -175,7 +175,7 @@ public function testLogin() {

$this->assertTrue((bool)$this->Auth->user());
$this->assertEquals($user, $this->Auth->user());
$this->assertSame($AuthLoginFormAuthenticate, $this->Auth->loginProvider());
$this->assertSame($AuthLoginFormAuthenticate, $this->Auth->authenticationProvider());
}

/**
Expand Down

0 comments on commit db362f7

Please sign in to comment.