adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4417 from jeremyharris/3331

Browse source 
Fix for #3331
This commit is contained in:
Mark Story 2014-09-04 20:26:55 -04:00
commit 2311c13f12
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -572,13 +572,18 @@ class AuthComponent extends Component {
* @return void
* @see BaseAuthorize::mapActions()
* @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#mapping-actions-when-using-crudauthorize
* @deprecated 3.0.0 Map actions using `actionMap` config key on authorize objects instead
*/
public function mapActions($map = array()) {
if (empty($this->_authorizeObjects)) {
$this->constructAuthorize();
}
$mappedActions = array();
foreach ($this->_authorizeObjects as $auth) {
$auth->mapActions($map);
$mappedActions = Hash::merge($mappedActions, $auth->mapActions($map));
}
if (empty($map)) {
return $mappedActions;
}
}

39
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
View file

@ -1305,6 +1305,45 @@ class AuthComponentTest extends CakeTestCase {
$this->Auth->logout();
}
/**
* Test mapActions as a getter
*
* @return void
*/
public function testMapActions() {
$MapActionMockAuthorize = $this->getMock(
'BaseAuthorize',
array('authorize'),
array(),
'',
false
);
$this->Auth->authorize = array('MapActionAuthorize');
$this->Auth->setAuthorizeObject(0, $MapActionMockAuthorize);
$actions = array('my_action' => 'create');
$this->Auth->mapActions($actions);
$actions = array(
'create' => array('my_other_action'),
'update' => array('updater')
);
$this->Auth->mapActions($actions);
$actions = $this->Auth->mapActions();
$result = $actions['my_action'];
$expected = 'create';
$this->assertEquals($expected, $result);
$result = $actions['my_other_action'];
$expected = 'create';
$this->assertEquals($expected, $result);
$result = $actions['updater'];
$expected = 'update';
$this->assertEquals($expected, $result);
}
/**
* test mapActions loading and delegating to authorize objects.
*