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

Controller::loadModel() now returns true when model is succesfully instantiated as stated in docblock. Added test case.

Browse source
This commit is contained in:
ADmad 2010-05-02 05:32:53 +05:30
parent 257665eb5b
commit f386dca6d8
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/controller/controller.php
View file

@ -607,7 +607,7 @@ class Controller extends Object {
*
* @param string $modelClass Name of model class to load
* @param mixed $id Initial ID the instanced model class should have
* @return mixed true when single model found and instance created error returned if models not found.
* @return mixed true when single model found and instance created, error returned if model not found.
* @access public
*/
function loadModel($modelClass = null, $id = null) {
@ -657,6 +657,8 @@ class Controller extends Object {
$this->_persist($modelClass, true, $object);
$this->modelNames[] = $modelClass;
}
return true;
}
/**
@ -733,7 +735,7 @@ class Controller extends Object {
}
/**
* Convenience and object wrapper method for header(). Useful when doing tests and
* Convenience and object wrapper method for header(). Useful when doing tests and
* asserting that particular headers have been set.
*
* @param string $status The header message that is being set.

20
cake/tests/cases/libs/controller/controller.test.php
View file

@ -442,6 +442,26 @@ class ControllerTest extends CakeTestCase {
App::build();
}
/**
* testLoadModel method
*
* @access public
* @return void
*/
function testLoadModel() {
$Controller =& new Controller();
$this->assertFalse(isset($Controller->ControllerPost));
$result = $Controller->loadModel('ControllerPost');
$this->assertTrue($result);
$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
$this->assertTrue(in_array('ControllerPost', $Controller->modelNames));
ClassRegistry::flush();
unset($Controller);
}
/**
* testConstructClasses method
*