Skip to content
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

Jump to bottom

Fixes #13058 caught exception thrown during view file rendering produces wrong output #14239

Merged
merged 2 commits into from
Jun 1, 2017
Merged

Fixes #13058 caught exception thrown during view file rendering produces wrong output #14239

merged 2 commits into from
Jun 1, 2017

Conversation

klimov-paul
Copy link
Member

Q A
Is bugfix? yes
New feature? no
Breaks BC? no
Tests pass? yes
Fixed issues #13058

@klimov-paul klimov-paul added the type:bug Bug label Jun 1, 2017
@klimov-paul klimov-paul added this to the 2.0.12 milestone Jun 1, 2017
@klimov-paul klimov-paul mentioned this pull request Jun 1, 2017
Closed
cebe
cebe reviewed Jun 1, 2017
View reviewed changes
framework/base/View.php
try {
require($_file_);
return ob_get_clean();
} catch (\Exception $e) {
Copy link
Member

Choose a reason for hiding this comment

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

for PHP 7 compatibility this should include catching \Throwable too.

Copy link
Member Author

Choose a reason for hiding this comment

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

added

cebe
cebe requested changes Jun 1, 2017
View reviewed changes
Copy link
Member

@cebe cebe left a comment

Choose a reason for hiding this comment

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

other than Throwable it looks good to me.

@samdark samdark merged commit 0beb593 into yiisoft:master Jun 1, 2017
@samdark
Copy link
Member

samdark commented Jun 1, 2017

Merged. Thank you!

@klimov-paul klimov-paul deleted the 13058-view-render-exception branch September 12, 2017 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samdark samdark samdark approved these changes

@cebe cebe cebe approved these changes

@SilverFire SilverFire Awaiting requested review from SilverFire

Assignees
No one assigned
Labels
type:bug Bug
Projects
None yet
Milestone
2.0.12
Development

Successfully merging this pull request may close these issues.
3 participants
@klimov-paul @samdark @cebe