Skip to content

bumped min version of Twig to 1.28 #20484

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
merged 1 commit into from
Nov 16, 2016
Merged

Conversation

fabpot
Copy link
Member

@fabpot fabpot commented Nov 10, 2016

Q A
Branch? 2.7
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets see twigphp/Twig#2236
License MIT
Doc PR n/a

@javiereguiluz
Copy link
Member

What about using this great feature in Form, the component that needs it most? They even define a method called renderBlock()

* @return array
* @return Twig_Template[]
*
* @deprecated not used anymore internally
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't it throw a deprecation warning ?

Copy link
Member

Choose a reason for hiding this comment

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

Agreed, but not in Symfony 2.7. This must be added after merging this to master.

Copy link
Member Author

Choose a reason for hiding this comment

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

Agreed with @xabbuh, but this class should probably be marked as being internal as well in master.

@@ -200,7 +200,7 @@ public function toolbarAction(Request $request, $token)
return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array(
'position' => $position,
'profile' => $profile,
'templates' => $this->getTemplateManager()->getTemplates($profile),
'templates' => $this->getTemplateManager()->getNames($profile),
Copy link
Member

Choose a reason for hiding this comment

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

getNames() must become public then

Copy link
Member Author

Choose a reason for hiding this comment

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

sure :)

@fabpot fabpot force-pushed the safe-renderblocks branch 2 times, most recently from 5c8bc22 to 73e1c06 Compare November 11, 2016 15:20
@fabpot
Copy link
Member Author

fabpot commented Nov 11, 2016

@javiereguiluz Unfortunately the logic in the Form integration is complex and cannot use this technique as we are manually passing blocks to renderBlock().

@fabpot
Copy link
Member Author

fabpot commented Nov 13, 2016

Updated based on the latest changes for Twig 1.28.

@xabbuh
Copy link
Member

xabbuh commented Nov 16, 2016

👍

Status: Reviewed

@fabpot fabpot merged commit b8f7614 into symfony:2.7 Nov 16, 2016
fabpot added a commit that referenced this pull request Nov 16, 2016
This PR was merged into the 2.7 branch.

Discussion
----------

bumped min version of Twig to 1.28

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | see twigphp/Twig#2236
| License       | MIT
| Doc PR        | n/a

Commits
-------

b8f7614 bumped min version of Twig to 1.28
@fabpot fabpot mentioned this pull request Nov 17, 2016
This was referenced Nov 21, 2016
@fabpot fabpot deleted the safe-renderblocks branch January 7, 2017 00:34
fabpot added a commit that referenced this pull request Jul 6, 2017
…etTemplates() (maidmaid)

This PR was merged into the 4.0-dev branch.

Discussion
----------

[WebProfilerBundle] Remove deprecated TemplateManager::getTemplates()

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

Commits
-------

f8be69d Remove TemplateManager::getTemplates()
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.

5 participants