Fix strict and warning errors from type hints.

This commit is contained in:
mark_story 2012-02-25 20:06:48 -05:00
parent 973dce916a
commit e958e6c25f
3 changed files with 4 additions and 4 deletions

View file

@ -17,6 +17,7 @@
*/
App::uses('AppShell', 'Console/Command');
App::uses('Controller', 'Controller');
App::uses('ComponentCollection', 'Controller');
App::uses('AclComponent', 'Controller/Component');
App::uses('DbAcl', 'Model');
@ -90,7 +91,7 @@ class AclShell extends AppShell {
if (!in_array($this->command, array('initdb'))) {
$collection = new ComponentCollection();
$this->Acl = new AclComponent($collection);
$controller = null;
$controller = new Controller();
$this->Acl->startup($controller);
}
}

View file

@ -41,8 +41,7 @@ class ControllerAuthorizeTest extends CakeTestCase {
}
/**
*
* @expectedException CakeException
* @expectedException PHPUnit_Framework_Error
*/
public function testControllerTypeError() {
$this->auth->controller(new StdClass());

View file

@ -63,7 +63,7 @@ class SqlserverTestDb extends Sqlserver {
* @param mixed $sql
* @return void
*/
protected function _matchRecords($model, $conditions = null) {
protected function _matchRecords(Model $model, $conditions = null) {
return $this->conditions(array('id' => array(1, 2)));
}