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

Error views hot fix #136

Merged
merged 1 commit into from
Oct 11, 2016
Merged

Error views hot fix #136

merged 1 commit into from
Oct 11, 2016

Conversation

michalbundyra
Copy link
Member

Exception in error views could be \Exception or \Error instance

@@ -52,7 +52,8 @@ if (! empty($this->reason)) :

<?php if (! empty($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

Choose a reason for hiding this comment

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

Elsewhere we check first for Throwable, than Exception, which optimizes for PHP 7 (where both exception and errors are types of Throwable). I'll make that change on merge.

@weierophinney weierophinney added this to the 1.4.1 milestone Oct 11, 2016
@weierophinney weierophinney self-assigned this Oct 11, 2016
@weierophinney weierophinney merged commit 71b04a7 into zfcampus:master Oct 11, 2016
weierophinney added a commit that referenced this pull request Oct 11, 2016
weierophinney added a commit that referenced this pull request Oct 11, 2016
weierophinney added a commit that referenced this pull request Oct 11, 2016
@michalbundyra michalbundyra deleted the hotfix/error-instance branch November 27, 2019 19:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants