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

Fix Debugger error output in CLI when Debugger is used as the error handler.

Browse source 
Merge changes from #6803 into 2.6.
This commit is contained in:
mark_story 2015-06-20 22:26:40 -04:00
commit bf82c95d64
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Console/ShellDispatcher.php
View file

@ -177,6 +177,9 @@ class ShellDispatcher {
} }
set_exception_handler($exception['consoleHandler']); set_exception_handler($exception['consoleHandler']);
set_error_handler($error['consoleHandler'], Configure::read('Error.level')); set_error_handler($error['consoleHandler'], Configure::read('Error.level'));
App::uses('Debugger', 'Utility');
Debugger::getInstance()->output('txt');
} }
/** /**

5
lib/Cake/Test/Case/Error/ErrorHandlerTest.php
View file

@ -19,6 +19,7 @@
App::uses('ErrorHandler', 'Error'); App::uses('ErrorHandler', 'Error');
App::uses('Controller', 'Controller'); App::uses('Controller', 'Controller');
App::uses('Router', 'Routing'); App::uses('Router', 'Routing');
App::uses('Debugger', 'Utility');
/** /**
* A faulty ExceptionRenderer to test nesting. * A faulty ExceptionRenderer to test nesting.
@ -92,6 +93,8 @@ class ErrorHandlerTest extends CakeTestCase {
set_error_handler('ErrorHandler::handleError'); set_error_handler('ErrorHandler::handleError');
$this->_restoreError = true; $this->_restoreError = true;
Debugger::getInstance()->output('html');
ob_start(); ob_start();
$wrong .= ''; $wrong .= '';
$result = ob_get_clean(); $result = ob_get_clean();
@ -123,6 +126,8 @@ class ErrorHandlerTest extends CakeTestCase {
set_error_handler('ErrorHandler::handleError'); set_error_handler('ErrorHandler::handleError');
$this->_restoreError = true; $this->_restoreError = true;
Debugger::getInstance()->output('html');
ob_start(); ob_start();
trigger_error('Test error', $error); trigger_error('Test error', $error);