Skip to content
Permalink
Browse files

Fix strict and warning errors from type hints.

  • Loading branch information...
markstory committed Feb 26, 2012
1 parent 973dce9 commit e958e6c25fc1b2d4d4180e5c29380895ad1c27af
@@ -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 @@ public function startup() {
if (!in_array($this->command, array('initdb'))) {
$collection = new ComponentCollection();
$this->Acl = new AclComponent($collection);
$controller = null;
$controller = new Controller();
$this->Acl->startup($controller);
}
}
@@ -41,8 +41,7 @@ public function setUp() {
}
/**
*
* @expectedException CakeException
* @expectedException PHPUnit_Framework_Error
*/
public function testControllerTypeError() {
$this->auth->controller(new StdClass());
@@ -63,7 +63,7 @@ protected function _execute($sql, $params = array(), $prepareOptions = array())
* @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)));
}

0 comments on commit e958e6c

Please sign in to comment.
You can’t perform that action at this time.