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

Fix strict and warning errors from type hints.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Console/Command/AclShell.php
View file

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

3
lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
View file

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

2
lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
View file

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