Skip to content

[ticket/16958] Add exception handler for handling uncaught exceptions #6361

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

Open
marc1706 wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[ticket/16958] Add exception handler for handling uncaught exceptions #6361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d82aff4
[ticket/16958] Start implemention of exception handler based on Symfony
marc1706 Jan 23, 2022
2049295
[ticket/16958] Clean up code and add copyright notice
marc1706 Jan 23, 2022
3217b7f
[ticket/16958] Further clean up code and improve message wording on page
marc1706 Jan 30, 2022
0bca418
[ticket/16958] Resolve code sniffer errors
marc1706 Jan 30, 2022
20e6550
[ticket/16958] Add renderer for HTML & JSON output of exceptions
marc1706 Mar 2, 2022
7fefab5
[ticket/16958] Handle exceptions with arguments in array format
marc1706 Mar 3, 2022
9a578d6
[ticket/16958] Split function across multiple lines
marc1706 Mar 3, 2022
925733b
[ticket/16958] Use simpler html5 linebreak in sql report/error
marc1706 May 1, 2023
8c31f7c
[ticket/16958] Use new ErrorHandler instead of deprecated Debug
marc1706 May 1, 2023
b54fa2b
[ticket/16958] Properly display paragraphs in messages
marc1706 May 1, 2023
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
Prev Previous commit
[ticket/16958] Properly display paragraphs in messages 
PHPBB3-16958
  • Loading branch information
@marc1706
marc1706 committed May 1, 2023
commit b54fa2bfd15f67e4b808ca69e7b390aa07d754ad
14 changes: 13 additions & 1 deletion phpBB/phpbb/debug/renderer/html_renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected function get_stack_trace(FlattenException $exception): array
$stack_item_data = [
'index' => $index,
'total' => $total,
'message' => $this->escape_html($stack_item['message']),
'message' => $this->separate_paragraphs($stack_item['message']),
'traces' => [],
];

Expand Down Expand Up @@ -261,4 +261,16 @@ private function escape_html(string $str): string
{
return htmlspecialchars($str, ENT_COMPAT, $this->charset);
}

/**
* Separate paragraphs of messages
*
* @param string $text Message to separate by paragraphs
*
* @return array|false|string[]
*/
private function separate_paragraphs(string $text)
{
return preg_split('/(<br>)+/', $text, -1, PREG_SPLIT_NO_EMPTY);
}
}
4 changes: 3 additions & 1 deletion phpBB/styles/all/template/exception.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ <h3 class="trace-class">
<abbr title="{{ stack_item.full_class }}">{{ stack_item.class }}</abbr>
</span>
</h3>
<p class="break-long-words trace-message">{{ stack_item.message }}</p>
{% for message in stack_item.message %}
<p class="break-long-words trace-message">{{ message }}</p>
{% endfor %}
</th>
</tr>
</thead>
Expand Down