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

Merge branch '2.0' into 2.1

Browse source
This commit is contained in:
mark_story 2012-01-27 20:58:24 -05:00
commit d904ab00fa
3 changed files with 61 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Model/AclNode.php
View file

@ -120,11 +120,12 @@ class AclNode extends AppModel {
return false;
}
} elseif (is_object($ref) && is_a($ref, 'Model')) {
$ref = array('model' => $ref->alias, 'foreign_key' => $ref->id);
$ref = array('model' => $ref->name, 'foreign_key' => $ref->id);
} elseif (is_array($ref) && !(isset($ref['model']) && isset($ref['foreign_key']))) {
$name = key($ref);
list($plugin, $alias) = pluginSplit($name);
$model = ClassRegistry::init(array('class' => $name, 'alias' => $name));
$model = ClassRegistry::init(array('class' => $name, 'alias' => $alias));
if (empty($model)) {
trigger_error(__d('cake_dev', "Model class '%s' not found in AclNode::node() when trying to bind %s object", $type, $this->alias), E_USER_WARNING);
@ -136,7 +137,7 @@ class AclNode extends AppModel {
$tmpRef = $model->bindNode($ref);
}
if (empty($tmpRef)) {
$ref = array('model' => $name, 'foreign_key' => $ref[$name][$model->primaryKey]);
$ref = array('model' => $alias, 'foreign_key' => $ref[$name][$model->primaryKey]);
} else {
if (is_string($tmpRef)) {
return $this->node($tmpRef);

30
lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
View file

@ -110,6 +110,36 @@ class ActionsAuthorizeTest extends CakeTestCase {
$this->assertTrue($this->auth->authorize($user['User'], $request));
}
/**
* testAuthorizeSettings
*
* @return void
*/
public function testAuthorizeSettings() {
$request = new CakeRequest('/posts/index', false);
$request->addParams(array(
'plugin' => null,
'controller' => 'posts',
'action' => 'index'
));
$this->_mockAcl();
$this->auth->settings['userModel'] = 'TestPlugin.TestPluginAuthUser';
$user = array(
'id' => 1,
'user' => 'mariano'
);
$expected = array('TestPlugin.TestPluginAuthUser' => array('id' => 1, 'user' => 'mariano'));
$this->Acl->expects($this->once())
->method('check')
->with($expected, '/controllers/Posts/index')
->will($this->returnValue(true));
$this->assertTrue($this->auth->authorize($user, $request));
}
/**
* test action()
*

28
lib/Cake/Test/Case/Model/DbAclTest.php
View file

@ -316,7 +316,8 @@ class AclNodeTest extends CakeTestCase {
$expected = array(4);
$this->assertEquals($expected, $result);
}
/**
/**
* testNodeObjectFind method
*
* @return void
@ -359,4 +360,29 @@ class AclNodeTest extends CakeTestCase {
);
$this->assertEquals($expected, $result);
}
/**
* testNodeActionAuthorize method
*
* @return void
*/
public function testNodeActionAuthorize() {
App::build(array(
'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
$Aro = new DbAroTest();
$Aro->create();
$Aro->save(array('model' => 'TestPluginAuthUser', 'foreign_key' => 1));
$result = $Aro->id;
$expected = 5;
$this->assertEquals($expected, $result);
$node = $Aro->node(array('TestPlugin.TestPluginAuthUser' => array('id' => 1, 'user' => 'mariano')));
$result = Set::extract($node, '0.DbAroTest.id');
$expected = $Aro->id;
$this->assertEquals($expected, $result);
CakePlugin::unload('TestPlugin');
}
}