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

Dispatch Controller.shutdown instead of calling afterFilter directly. Updated test

Browse source
This commit is contained in:
Kim Biesbjerg 2016-07-14 04:51:49 +02:00
parent a05639a30e
commit c77b628841
2 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Error/ExceptionRenderer.php
View file

@ -331,7 +331,8 @@ class ExceptionRenderer {
}
protected function _shutdown() {
$this->controller->afterFilter();
$afterFilterEvent = new CakeEvent('Controller.shutdown', $this->controller);
$this->controller->getEventManager()->dispatch($afterFilterEvent);
$Dispatcher = new Dispatcher();
$afterDispatchEvent = new CakeEvent('Dispatcher.afterDispatch', $Dispatcher, array(

39
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
View file

@ -20,7 +20,7 @@ App::uses('ExceptionRenderer', 'Error');
App::uses('Controller', 'Controller');
App::uses('Component', 'Controller');
App::uses('Router', 'Routing');
App::uses('CakeEvent', 'Event');
App::uses('CakeEventManager', 'Event');
/**
* Short description for class.
@ -62,26 +62,6 @@ class BlueberryComponent extends Component {
}
/**
* AfterDispatchEventCallable class
*
* @package Cake.Test.Case.Error
*/
class AfterDispatchEventCallable {
public $afterDispatchCalled = false;
/**
* AfterDispatchEventCallable::afterDispatch()
*
* @param mixed $event
* @return mixed boolean to stop the event dispatching or null to continue
*/
public function afterDispatch(CakeEvent $event) {
$this->afterDispatchCalled = true;
}
}
/**
* TestErrorController class
*
@ -905,18 +885,23 @@ class ExceptionRendererTest extends CakeTestCase {
* @return void
*/
public function testAfterDispatchEventOnErrorResponse() {
$callable = new AfterDispatchEventCallable();
Configure::write('Dispatcher.filters', array(
array('callable' => array($callable, 'afterDispatch'), 'on' => 'after')
));
$fired = array();
$listener = function ($event) use (&$fired) {
$fired[] = $event->name();
};
$exception = new Exception('Oh no!');
$EventManager = CakeEventManager::instance();
$EventManager->attach($listener, 'Controller.shutdown');
$EventManager->attach($listener, 'Dispatcher.afterDispatch');
$exception = new Exception('Terrible');
$ExceptionRenderer = new ExceptionRenderer($exception);
ob_start();
$ExceptionRenderer->render();
ob_get_clean();
$this->assertTrue($callable->afterDispatchCalled);
$expected = array('Controller.shutdown', 'Dispatcher.afterDispatch');
$this->assertEquals($expected, $fired);
}
}