mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 11:06:15 +00:00
Changing AuthComponent::deny to accepts same param as AuthComponent::allow, tests added
This commit is contained in:
parent
2484245c68
commit
c84b4cf36d
2 changed files with 15 additions and 3 deletions
|
@ -591,7 +591,7 @@ class AuthComponent extends Object {
|
|||
* Takes a list of actions in the current controller for which authentication is not required, or
|
||||
* no parameters to allow all actions.
|
||||
*
|
||||
* @param string $action Controller action name
|
||||
* @param mixed $action Controller action name or array of actions
|
||||
* @param string $action Controller action name
|
||||
* @param string ... etc.
|
||||
* @return void
|
||||
|
@ -612,7 +612,7 @@ class AuthComponent extends Object {
|
|||
/**
|
||||
* Removes items from the list of allowed actions.
|
||||
*
|
||||
* @param string $action Controller action name
|
||||
* @param mixed $action Controller action name or array of actions
|
||||
* @param string $action Controller action name
|
||||
* @param string ... etc.
|
||||
* @return void
|
||||
|
@ -621,6 +621,9 @@ class AuthComponent extends Object {
|
|||
*/
|
||||
function deny() {
|
||||
$args = func_get_args();
|
||||
if (isset($args[0]) && is_array($args[0])) {
|
||||
$args = $args[0];
|
||||
}
|
||||
foreach ($args as $arg) {
|
||||
$i = array_search($arg, $this->allowedActions);
|
||||
if (is_int($i)) {
|
||||
|
|
|
@ -777,7 +777,7 @@ class AuthTest extends CakeTestCase {
|
|||
$this->Controller->Auth->initialize($this->Controller);
|
||||
|
||||
$this->Controller->Auth->allow('*');
|
||||
$this->Controller->Auth->deny('add');
|
||||
$this->Controller->Auth->deny('add', 'camelcase');
|
||||
|
||||
$this->Controller->params['action'] = 'delete';
|
||||
$this->assertTrue($this->Controller->Auth->startup($this->Controller));
|
||||
|
@ -787,6 +787,15 @@ class AuthTest extends CakeTestCase {
|
|||
|
||||
$this->Controller->params['action'] = 'Add';
|
||||
$this->assertFalse($this->Controller->Auth->startup($this->Controller));
|
||||
|
||||
$this->Controller->params['action'] = 'camelCase';
|
||||
$this->assertFalse($this->Controller->Auth->startup($this->Controller));
|
||||
|
||||
$this->Controller->Auth->allow('*');
|
||||
$this->Controller->Auth->deny(array('add', 'camelcase'));
|
||||
|
||||
$this->Controller->params['action'] = 'camelCase';
|
||||
$this->assertFalse($this->Controller->Auth->startup($this->Controller));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue