adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10664 from ravage84/patch-2

Browse source 
Add inline type hint annotations
This commit is contained in:
Mark Story 2017-05-16 12:13:24 -04:00 • committed by GitHub
commit ffd9e71bb9
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/TestSuite/ControllerTestCase.php
View file

@ -256,6 +256,7 @@ abstract class ControllerTestCase extends CakeTestCase {
} }
$_SERVER['REQUEST_URI'] = $url; $_SERVER['REQUEST_URI'] = $url;
/** @var CakeRequest|PHPUnit_Framework_MockObject_MockObject $request */
$request = $this->getMock('CakeRequest', array('_readInput')); $request = $this->getMock('CakeRequest', array('_readInput'));
if (is_string($options['data'])) { if (is_string($options['data'])) {
@ -357,9 +358,12 @@ abstract class ControllerTestCase extends CakeTestCase {
), (array)$mocks); ), (array)$mocks);
list($plugin, $name) = pluginSplit($controller); list($plugin, $name) = pluginSplit($controller);
/** @var Controller|PHPUnit_Framework_MockObject_MockObject $controllerObj */
$controllerObj = $this->getMock($name . 'Controller', $mocks['methods'], array(), '', false); $controllerObj = $this->getMock($name . 'Controller', $mocks['methods'], array(), '', false);
$controllerObj->name = $name; $controllerObj->name = $name;
/** @var CakeRequest|PHPUnit_Framework_MockObject_MockObject $request */
$request = $this->getMock('CakeRequest'); $request = $this->getMock('CakeRequest');
/** @var CakeResponse|PHPUnit_Framework_MockObject_MockObject $response */
$response = $this->getMock($this->_responseClass, array('_sendHeader')); $response = $this->getMock($this->_responseClass, array('_sendHeader'));
$controllerObj->__construct($request, $response); $controllerObj->__construct($request, $response);
$controllerObj->Components->setController($controllerObj); $controllerObj->Components->setController($controllerObj);
@ -393,6 +397,7 @@ abstract class ControllerTestCase extends CakeTestCase {
)); ));
} }
$config = isset($controllerObj->components[$component]) ? $controllerObj->components[$component] : array(); $config = isset($controllerObj->components[$component]) ? $controllerObj->components[$component] : array();
/** @var Component|PHPUnit_Framework_MockObject_MockObject $componentObj */
$componentObj = $this->getMock($componentClass, $methods, array($controllerObj->Components, $config)); $componentObj = $this->getMock($componentClass, $methods, array($controllerObj->Components, $config));
$controllerObj->Components->set($name, $componentObj); $controllerObj->Components->set($name, $componentObj);
$controllerObj->Components->enable($name); $controllerObj->Components->enable($name);