adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deprecating AclComponent::revoke() and AclComponent::grant() they were simply aliases that create a larger API with no real benefit.

Browse source
This commit is contained in:
Mark Story 2010-04-23 23:14:55 -04:00
parent 62982c57b4
commit 523eda018e
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/libs/controller/components/acl.php
View file

@ -96,13 +96,6 @@ class AclComponent extends Object {
return true; return true;
} }
/**
* Empty class defintion, to be overridden in subclasses.
*
*/
protected function _initACL() {
}
/** /**
* Pass-thru function for ACL check instance. Check methods * Pass-thru function for ACL check instance. Check methods
* are used to check whether or not an ARO can access an ACO * are used to check whether or not an ARO can access an ACO
@ -164,6 +157,7 @@ class AclComponent extends Object {
* @return boolean Success * @return boolean Success
*/ */
public function grant($aro, $aco, $action = "*") { public function grant($aro, $aco, $action = "*") {
trigger_error(__('AclComponent::grant() is deprecated, use allow() instead'), E_USER_WARNING);
return $this->_Instance->grant($aro, $aco, $action); return $this->_Instance->grant($aro, $aco, $action);
} }
@ -176,6 +170,7 @@ class AclComponent extends Object {
* @return boolean Success * @return boolean Success
*/ */
public function revoke($aro, $aco, $action = "*") { public function revoke($aro, $aco, $action = "*") {
trigger_error(__('AclComponent::revoke() is deprecated, use deny() instead'), E_USER_WARNING);
return $this->_Instance->revoke($aro, $aco, $action); return $this->_Instance->revoke($aro, $aco, $action);
} }
} }

10
cake/tests/cases/libs/controller/components/acl.test.php
View file

@ -483,18 +483,18 @@ class AclComponentTest extends CakeTestCase {
*/ */
function testDbGrant() { function testDbGrant() {
$this->assertFalse($this->Acl->check('Samir', 'tpsReports', 'create')); $this->assertFalse($this->Acl->check('Samir', 'tpsReports', 'create'));
$this->Acl->grant('Samir', 'tpsReports', 'create'); $this->Acl->allow('Samir', 'tpsReports', 'create');
$this->assertTrue($this->Acl->check('Samir', 'tpsReports', 'create')); $this->assertTrue($this->Acl->check('Samir', 'tpsReports', 'create'));
$this->assertFalse($this->Acl->check('Micheal', 'view', 'read')); $this->assertFalse($this->Acl->check('Micheal', 'view', 'read'));
$this->Acl->grant('Micheal', 'view', array('read', 'create', 'update')); $this->Acl->allow('Micheal', 'view', array('read', 'create', 'update'));
$this->assertTrue($this->Acl->check('Micheal', 'view', 'read')); $this->assertTrue($this->Acl->check('Micheal', 'view', 'read'));
$this->assertTrue($this->Acl->check('Micheal', 'view', 'create')); $this->assertTrue($this->Acl->check('Micheal', 'view', 'create'));
$this->assertTrue($this->Acl->check('Micheal', 'view', 'update')); $this->assertTrue($this->Acl->check('Micheal', 'view', 'update'));
$this->assertFalse($this->Acl->check('Micheal', 'view', 'delete')); $this->assertFalse($this->Acl->check('Micheal', 'view', 'delete'));
$this->expectError('DbAcl::allow() - Invalid node'); $this->expectError('DbAcl::allow() - Invalid node');
$this->assertFalse($this->Acl->grant('Peter', 'ROOT/tpsReports/DoesNotExist', 'create')); $this->assertFalse($this->Acl->allow('Peter', 'ROOT/tpsReports/DoesNotExist', 'create'));
} }
/** /**
@ -505,11 +505,11 @@ class AclComponentTest extends CakeTestCase {
*/ */
function testDbRevoke() { function testDbRevoke() {
$this->assertTrue($this->Acl->check('Bobs', 'tpsReports', 'read')); $this->assertTrue($this->Acl->check('Bobs', 'tpsReports', 'read'));
$this->Acl->revoke('Bobs', 'tpsReports', 'read'); $this->Acl->deny('Bobs', 'tpsReports', 'read');
$this->assertFalse($this->Acl->check('Bobs', 'tpsReports', 'read')); $this->assertFalse($this->Acl->check('Bobs', 'tpsReports', 'read'));
$this->assertTrue($this->Acl->check('users', 'printers', 'read')); $this->assertTrue($this->Acl->check('users', 'printers', 'read'));
$this->Acl->revoke('users', 'printers', 'read'); $this->Acl->deny('users', 'printers', 'read');
$this->assertFalse($this->Acl->check('users', 'printers', 'read')); $this->assertFalse($this->Acl->check('users', 'printers', 'read'));
$this->assertFalse($this->Acl->check('Samir', 'printers', 'read')); $this->assertFalse($this->Acl->check('Samir', 'printers', 'read'));
$this->assertFalse($this->Acl->check('Peter', 'printers', 'read')); $this->assertFalse($this->Acl->check('Peter', 'printers', 'read'));