Skip to content

Add current file/line to exception stack-trace #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eric-martin merged 2 commits into from
Jan 23, 2015
Merged

Add current file/line to exception stack-trace #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4586520
Add current file/line to exception stack-trace
Jan 23, 2015
b8bbc3d
Appending current file/line instead of prepending
Jan 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/Stackify/Log/Entities/ErrorWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class ErrorWrapper
private $sourceMethod;

const TYPE_STRING_EXCEPTION = 'StringException';
const UNKNOWN_METHOD = '{unknown}';

/**
* @var \Stackify\Log\Entities\ErrorWrapper
Expand All @@ -24,7 +25,12 @@ public function __construct($object, $nestingLevel = 1)
$this->message = $object->getMessage();
$this->type = get_class($object);
$this->code = $object->getCode();
$this->setTrace($object->getTrace());
$trace = $object->getTrace();
$trace[] = array(
'file' => $object->getFile(),
'line' => $object->getLine(),
);
$this->setTrace($trace);
$previous = $object->getPrevious();
if (null !== $previous) {
// limit nesting level if needed here
Expand Down Expand Up @@ -80,7 +86,11 @@ private function setTrace(array $trace)
{
$result = array();
foreach ($this->filterTrace($trace) as $index => $item) {
$function = $item['function'] . '()';
if (isset($item['function'])) {
$function = $item['function'] . '()';
} else {
$function = self::UNKNOWN_METHOD;
}
if (isset($item['class'])) {
// type is -> or :: which means dynamic or static method call
$type = isset($item['type']) ? $item['type'] : '->';
Expand Down
2 changes: 0 additions & 2 deletions src/Stackify/Log/Entities/NativeError.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ public function getTrace()
$traceItem = array(
'file' => $this->file,
'line' => $this->line,
// "method" is not defined in native error
'function' => '{unknown}',
);
return array($traceItem);
}
Expand Down