Skip to content
This repository was archived by the owner on Jan 1, 2020. It is now read-only.

Added additional instanceof checks for Error types #338

Merged
merged 1 commit into from
Jun 9, 2016
Merged

Added additional instanceof checks for Error types #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion module/Application/view/error/404.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if (isset($this->controller_class)

<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>

<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
<?php if(isset($this->exception) && ($this->exception instanceof Exception || $this->exception instanceof Error)): ?>
Copy link
Member Author

@weierophinney weierophinney Jun 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note: we cannot typehint against just Throwable, as the skeleton also supports PHP 5.6. As such, testing for either Exception or Error will satisfy any Throwable type from PHP 7.

<hr/>
<h2>Additional information:</h2>
<h3><?php echo get_class($this->exception); ?></h3>
Expand Down
2 changes: 1 addition & 1 deletion module/Application/view/error/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>

<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
<?php if(isset($this->exception) && ($this->exception instanceof Exception || $this->exception instanceof Error)): ?>
<hr/>
<h2>Additional information:</h2>
<h3><?php echo get_class($this->exception); ?></h3>
Expand Down