Skip to content

[TwigBundle] remove deprecations and fix tests #32696

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

Merged

Conversation

Tobion
Copy link
Contributor

@Tobion Tobion commented Jul 24, 2019

Q A
Branch? master
Bug fix? no
New feature? no
BC breaks? yes
Deprecations? no
Tests pass? yes
Fixed tickets
License MIT
Doc PR

Removing deprecations from #31398 which should also fix tests in master as I removed some legacy code like (exception_controller: ~ # to be removed in 5.0 relying on default) while resolving conflicts when merging 4.4 into master.

@Tobion
Copy link
Contributor Author

Tobion commented Jul 24, 2019

@yceruto the deprecated layout.html.twig file is still referenced in

and the images in
<span class="icon icon-close">{{ include('@Twig/images/icon-minus-square.svg') }}</span>
<span class="icon icon-open">{{ include('@Twig/images/icon-plus-square.svg') }}</span>

What's the plan there? Ah #32695, I see. So we can remove the remaining deprecated templates/images separately after #32695

@Tobion Tobion force-pushed the remove-deprecated-twig-error-templates branch from d73c722 to 78e71a2 Compare July 24, 2019 05:49
@Tobion Tobion force-pushed the remove-deprecated-twig-error-templates branch from 78e71a2 to 452f66d Compare July 24, 2019 06:01

$code = $exception->getStatusCode();

return new Response($this->twig->render(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Marked the controller as internal in #32695 so the twig dependency can easily be removed in master

@Tobion Tobion requested a review from yceruto July 24, 2019 06:25
@Tobion Tobion changed the title [TwigBundle] remove deprecations [TwigBundle] remove deprecations and fix tests Jul 24, 2019
@nicolas-grekas nicolas-grekas added this to the 5.0 milestone Jul 24, 2019
@fabpot
Copy link
Member

fabpot commented Jul 24, 2019

Thank you @Tobion.

@fabpot fabpot merged commit 452f66d into symfony:master Jul 24, 2019
fabpot added a commit that referenced this pull request Jul 24, 2019
This PR was merged into the 5.0-dev branch.

Discussion
----------

[TwigBundle] remove deprecations and fix tests

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| BC breaks?    | yes     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets |
| License       | MIT
| Doc PR        |

Removing deprecations from #31398 which should also fix tests in master as I removed some legacy code like (`exception_controller: ~ # to be removed in 5.0 relying on default`) while resolving conflicts when merging 4.4 into master.

Commits
-------

452f66d [TwigBundle] remove deprecations
@Tobion Tobion deleted the remove-deprecated-twig-error-templates branch July 24, 2019 16:41
Tobion added a commit that referenced this pull request Jul 25, 2019
…precated templates (yceruto)

This PR was squashed before being merged into the 5.0-dev branch (closes #32714).

Discussion
----------

[TwigBundle] Add missing CHANGELOG entries and remove deprecated templates

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Follow up #32696,
Require merge 4.4 into master after #32695 to make WebProfilerBundle work properly in master.

Commits
-------

0222860 [TwigBundle] Add missing CHANGELOG entries and remove deprecated templates
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants