Skip to content

Improve exception output #7

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
merged 4 commits into from
Jun 15, 2015
Merged

Improve exception output #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aaefc4
switches order of exception details for better readability
lode Jun 12, 2015
1a3b81e
skip exception details everyone knows (document-root)
lode Jun 12, 2015
a0f7e45
always include a status code in errors
lode Jun 12, 2015
a8570d9
Merge branch 'master' into improve-exception-output
lode Jun 15, 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
6 changes: 2 additions & 4 deletions src/error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ public function get_array() {
$response_part = array();

// the basics
if ($this->http_status) {
$status_message = errors::get_http_status_message($this->http_status);
$response_part['status'] = $status_message;
}
$status_message = errors::get_http_status_message($this->http_status);
$response_part['status'] = $status_message;
$response_part['code'] = $this->error_message;

// user guidance
Expand Down
24 changes: 14 additions & 10 deletions src/errors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,25 +186,16 @@ public function fill_errors($errors) {
* @todo hide exception meta data on production environments
*/
public function add_exception($exception=null, $friendly_message=null, $about_link=null) {
$previous_exception = $exception->getPrevious();
if ($previous_exception) {
$this->add_exception($previous_exception);
}

$error_message = $exception->getMessage();
$error_status = $exception->getCode();

$new_error = new error($error_message, $friendly_message, $about_link);
$new_error->set_http_status($error_status);

// meta data
$trace = $exception->getTrace();
if ($trace) {
$new_error->add_meta('trace', $trace);
}

$file = $exception->getFile();
if ($file) {
$file = str_replace($_SERVER['DOCUMENT_ROOT'].'/', '', $file);
$new_error->add_meta('file', $file);
}

Expand All @@ -213,7 +204,20 @@ public function add_exception($exception=null, $friendly_message=null, $about_li
$new_error->add_meta('line', $line);
}

$trace = $exception->getTrace();
if ($trace) {
foreach ($trace as &$place) {
$place['file'] = str_replace($_SERVER['DOCUMENT_ROOT'].'/', '', $place['file']);
}
$new_error->add_meta('trace', $trace);
}

$this->add_error_object($new_error);

$previous_exception = $exception->getPrevious();
if ($previous_exception) {
$this->add_exception($previous_exception);
}
}

/**
Expand Down