Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 11 Packages Wiki Activity Actions

Improved exception display

Browse source
This commit is contained in:
Netkas 2022-12-16 03:08:04 -05:00
parent 4bd8a0f017
commit f41a3a6351
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ncc/Utilities/Console.php
View file

@ -11,6 +11,7 @@
use ncc\ncc;
use ncc\Objects\CliHelpSection;
use ncc\ThirdParty\Symfony\Process\ExecutableFinder;
use Throwable;
class Console
{
@ -317,16 +318,20 @@
* Prints out a detailed exception display (unfinished)
*
* @param Exception $e
* @param bool $sub
* @return void
*/
private static function outExceptionDetails(Exception $e): void
private static function outExceptionDetails(Throwable $e, bool $sub=false): void
{
if(!ncc::cliMode())
return;
// Exception name without namespace
$trace_header = self::formatColor($e->getFile() . ':' . $e->getLine(), ConsoleColors::Magenta);
$trace_error = self::formatColor('error: ', ConsoleColors::Red);
$trace_error = self::formatColor( 'Error: ', ConsoleColors::Red);
self::out($trace_header . ' ' . $trace_error . $e->getMessage());
self::out(sprintf('Exception: %s', get_class($e)));
self::out(sprintf('Error code: %s', $e->getCode()));
$trace = $e->getTrace();
if(count($trace) > 1)
@ -338,7 +343,16 @@
}
}
if(Main::getArgs() !== null)
if($e->getPrevious() !== null)
{
// Check if previous is the same as the current
if($e->getPrevious()->getMessage() !== $e->getMessage())
{
self::outExceptionDetails($e->getPrevious(), true);
}
}
if(Main::getArgs() !== null && !$sub)
{
if(isset(Main::getArgs()['dbg-ex']))
{

5
src/ncc/Utilities/Functions.php
View file

@ -36,6 +36,7 @@
use ncc\ThirdParty\jelix\Version\Parser;
use ncc\ThirdParty\Symfony\Filesystem\Filesystem;
use PharData;
use Throwable;
use ZipArchive;
/**
@ -290,7 +291,7 @@
* @param Exception $e
* @return array
*/
public static function exceptionToArray(Exception $e): array
public static function exceptionToArray(Throwable $e): array
{
$exception = [
'message' => $e->getMessage(),
@ -303,7 +304,7 @@
if($e->getPrevious() !== null)
{
$exception['trace'] = self::exceptionToArray($e);
$exception['previous'] = self::exceptionToArray($e->getPrevious());
}
return $exception;