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

[Cookbook][Controller] use the jinja lexer to render Twig code #5378

Merged
merged 1 commit into from
Jun 28, 2015

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Jun 10, 2015

Q A
Doc fix? yes
New docs? no
Applies to all
Fixed tickets

Using twig works on newer Sphinx versions, but makes it harder for people to build the documentation locally with older versions.

@wouterj
Copy link
Member

wouterj commented Jun 19, 2015

👍

@xabbuh xabbuh merged commit 52316ac into symfony:2.3 Jun 28, 2015
xabbuh added a commit that referenced this pull request Jun 28, 2015
… code (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Cookbook][Controller] use the jinja lexer to render Twig code

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets |

Using `twig` works on newer Sphinx versions, but makes it harder for people to build the documentation locally with older versions.

Commits
-------

52316ac use the jinja lexer to render Twig code
@xabbuh xabbuh deleted the jinja-code-block-for-twig branch June 28, 2015 07:58
wouterj added a commit that referenced this pull request Nov 7, 2015
This PR was merged into the 2.3 branch.

Discussion
----------

Use Twig highlighter instead of Jinja

Pygments 2 supports the Twig highlighting language, which is (of course) closer to Twig than Jinja is.

Previously, we reverted one occurence of Twig in #5378 , because people might use older versions locally. I no longer think this is a good reason:

 * They can update the versions, Pygments 2 isn't that new
 * Now we have platform.sh and travis, building locally isn't recommended/required anymore (if it ever was)

| Q | A
| --- | ---
| Doc fix? | yes
| New docs? | no
| Applies to | 2.3+
| Fixed ticket | -

This requires fabpot/sphinx-php#31 to be merged first. (and Pygments 2 to be available on symfony.com's server, but I think it already is /cc @javiereguiluz )

Commits
-------

d116232 Fix formatting
57c2d4b Use Twig highlighter instead of Jinja
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants