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

Merge branch '2.5' of github.com:cakephp/cakephp into 2.5

Browse source
This commit is contained in:
mark_story 2014-03-30 21:25:19 -04:00
commit 7419ac35b0
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/Routing/Dispatcher.php
View file

@ -162,7 +162,7 @@ class Dispatcher implements CakeEventListener {
));
}
$response = $this->_invoke($controller, $request, $response);
$response = $this->_invoke($controller, $request);
if (isset($request->params['return'])) {
return $response->body();
}
@ -174,18 +174,19 @@ class Dispatcher implements CakeEventListener {
/**
* Initializes the components and models a controller will be using.
* Triggers the controller action, and invokes the rendering if Controller::$autoRender is true and echo's the output.
* Otherwise the return value of the controller action are returned.
* Triggers the controller action, and invokes the rendering if Controller::$autoRender
* is true and echo's the output. Otherwise the return value of the controller
* action are returned.
*
* @param Controller $controller Controller to invoke
* @param CakeRequest $request The request object to invoke the controller for.
* @param CakeResponse $response The response object to receive the output
* @return CakeResponse the resulting response object
*/
protected function _invoke(Controller $controller, CakeRequest $request, CakeResponse $response) {
protected function _invoke(Controller $controller, CakeRequest $request) {
$controller->constructClasses();
$controller->startupProcess();
$response = $controller->response;
$render = true;
$result = $controller->invokeAction($request);
if ($result instanceof CakeResponse) {

11
lib/Cake/Test/Case/Routing/DispatcherTest.php
View file

@ -57,12 +57,11 @@ class TestDispatcher extends Dispatcher {
*
* @param Controller $controller
* @param CakeRequest $request
* @param CakeResponse $response
* @return void
* @return CakeResponse
*/
protected function _invoke(Controller $controller, CakeRequest $request, CakeResponse $response) {
protected function _invoke(Controller $controller, CakeRequest $request) {
$this->controller = $controller;
return parent::_invoke($controller, $request, $response);
return parent::_invoke($controller, $request);
}
/**
@ -508,7 +507,7 @@ class TestFilterDispatcher extends DispatcherFilter {
/**
* TestFilterDispatcher::beforeDispatch()
*
*
* @param mixed $event
* @return CakeResponse|boolean
*/
@ -521,7 +520,7 @@ class TestFilterDispatcher extends DispatcherFilter {
/**
* TestFilterDispatcher::afterDispatch()
*
*
* @param mixed $event
* @return mixed boolean to stop the event dispatching or null to continue
*/