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.

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

Fix EZP-26083: handle change of behaviour in Twig's ExceptionController #679

Merged
merged 1 commit into from Sep 23, 2016

Conversation

@bdunogier
Copy link
Member

bdunogier commented Sep 20, 2016

Fixes EZP-26083

From Symfony 2.8.0, TwigBundle's ExceptionController::findTemplate() method doesn't return a TemplateReferenceInterface anymore, but a string.

This changes PlatformUIBundle's custom controller to handle both object and string templates.

Copy link
Member

andrerom left a comment

+1

@yannickroger

This comment has been minimized.

Copy link
Contributor

yannickroger commented Sep 21, 2016

+1

1 similar comment
@glye

This comment has been minimized.

Copy link
Member

glye commented Sep 21, 2016

+1

@bdunogier bdunogier force-pushed the ezp26083-controller_exception_template_error branch from e7d3515 to ee691e6 Sep 21, 2016
@bdunogier bdunogier changed the base branch from master to 1.5 Sep 21, 2016
@bdunogier

This comment has been minimized.

Copy link
Member Author

bdunogier commented Sep 21, 2016

Rebase on top of 1.5. Support for sf 2.8 was added in this release.

@bdunogier bdunogier force-pushed the ezp26083-controller_exception_template_error branch from ee691e6 to 77a3067 Sep 21, 2016
@bdunogier

This comment has been minimized.

Copy link
Member Author

bdunogier commented Sep 21, 2016

Approve button, @glye and @yannickroger, approve button :)

@glye
glye approved these changes Sep 22, 2016
Copy link
Member

glye left a comment

@yannickroger Please check if @bdunogier banged his head or something, seems he's already forgotten what +1 means 😛

@bdunogier bdunogier merged commit 32585dc into 1.5 Sep 23, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
ezrobot Code review by ezrobot
Details
@bdunogier bdunogier deleted the ezp26083-controller_exception_template_error branch Sep 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
You can’t perform that action at this time.