Skip to content

Update twig_reference.rst #7939

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

Closed
wants to merge 2 commits into from
Closed

Update twig_reference.rst #7939

wants to merge 2 commits into from

Conversation

raulconti
Copy link
Contributor

Copy link
Member

@javiereguiluz javiereguiluz left a comment

Choose a reason for hiding this comment

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

@raulconti thanks for this fix!

Note to mergers: the srcContext argument is not available in 2.7 and 2.8, so this must be merged in 3.2 branch. Thanks!

xabbuh added a commit that referenced this pull request Jul 11, 2017
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #7939).

Discussion
----------

Update twig_reference.rst

Fix some doc errors

https://github.com/symfony/twig-bridge/blob/master/Extension/CodeExtension.php

Commits
-------

c2033c9 Minor reword
f67762d Update twig_reference.rst
xabbuh added a commit that referenced this pull request Jul 11, 2017
* 2.7:
  [#7939] revert some changes (revert them for 3.2)
  Minor reword
  Update twig_reference.rst
  [#7958] fix minor typo
  improve examples of how we create test doubles
  Minor reword
  Add default indication in input arguments/options description
  Improved the explanation about deployment + parameters.yml
  Explained how to run tests in multiple kernel apps
  Fixed the explanation about PHPUnit event listeners in PHPUnitBridge
  File example update
  [#8003] add XML and PHP config examples
  Reworded the help note
  adding note that CSRF protection has to be enabled in config
  follow best practices for template files
  Added a note about disabling FastCGI buffering in Nginx
  Add some doc on missing options of framework bundle configuration
  Reworded the explanation about the --router option
xabbuh added a commit that referenced this pull request Jul 11, 2017
* 2.8:
  [#7939] revert some changes (revert them for 3.2)
  Minor reword
  Update twig_reference.rst
  [#7958] fix minor typo
  improve examples of how we create test doubles
  Minor reword
  Add default indication in input arguments/options description
  Improved the explanation about deployment + parameters.yml
  Explained how to run tests in multiple kernel apps
  Fixed the explanation about PHPUnit event listeners in PHPUnitBridge
  File example update
  [#8003] add XML and PHP config examples
  Reworded the help note
  adding note that CSRF protection has to be enabled in config
  follow best practices for template files
  Added a note about disabling FastCGI buffering in Nginx
  Add some doc on missing options of framework bundle configuration
  Reworded the explanation about the --router option
xabbuh added a commit that referenced this pull request Jul 11, 2017
@xabbuh
Copy link
Member

xabbuh commented Jul 11, 2017

Thank you @raulconti. I have merged your PR into the 2.7 branch as some of your changes applied there as well, but made some changes in 32c72bd since the srcContext was not available in these versions as @javiereguiluz said. I then merged the branches up and reverted my commit in 412f112 in the 3.2 branch so that it contains all the changes you made here.

@xabbuh xabbuh closed this Jul 11, 2017
xabbuh added a commit that referenced this pull request Jul 11, 2017
* 3.2:
  Revert "[#7939] revert some changes (revert them for 3.2)"
  [#7939] revert some changes (revert them for 3.2)
  Minor reword
  Update twig_reference.rst
  [#7958] fix minor typo
  improve examples of how we create test doubles
  Minor reword
  Add default indication in input arguments/options description
  Improved the explanation about deployment + parameters.yml
  Explained how to run tests in multiple kernel apps
  Fixed the explanation about PHPUnit event listeners in PHPUnitBridge
  fixed typo in choice.rst regarding choice_loader
  File example update
  [#8003] add XML and PHP config examples
  Reworded the help note
  adding note that CSRF protection has to be enabled in config
  follow best practices for template files
  Added a note about disabling FastCGI buffering in Nginx
  Add some doc on missing options of framework bundle configuration
  Reworded the explanation about the --router option
xabbuh added a commit that referenced this pull request Jul 11, 2017
* 3.3: (31 commits)
  Revert "[#7939] revert some changes (revert them for 3.2)"
  [#7939] revert some changes (revert them for 3.2)
  Minor reword
  Update twig_reference.rst
  [#7958] fix minor typo
  improve examples of how we create test doubles
  Minor reword
  Add default indication in input arguments/options description
  Improved the explanation about deployment + parameters.yml
  Minor change
  Add reference to docs in frontend page
  Add typescript loader documentation
  Explained how to run tests in multiple kernel apps
  Fixed the explanation about PHPUnit event listeners in PHPUnitBridge
  Fix minor typo
  fixed typo in choice.rst regarding choice_loader
  File example update
  [#8003] add XML and PHP config examples
  Reworded the help note
  adding note that CSRF protection has to be enabled in config
  ...
xabbuh added a commit that referenced this pull request Jul 11, 2017
* 3.4: (31 commits)
  Revert "[#7939] revert some changes (revert them for 3.2)"
  [#7939] revert some changes (revert them for 3.2)
  Minor reword
  Update twig_reference.rst
  [#7958] fix minor typo
  improve examples of how we create test doubles
  Minor reword
  Add default indication in input arguments/options description
  Improved the explanation about deployment + parameters.yml
  Minor change
  Add reference to docs in frontend page
  Add typescript loader documentation
  Explained how to run tests in multiple kernel apps
  Fixed the explanation about PHPUnit event listeners in PHPUnitBridge
  Fix minor typo
  fixed typo in choice.rst regarding choice_loader
  File example update
  [#8003] add XML and PHP config examples
  Reworded the help note
  adding note that CSRF protection has to be enabled in config
  ...
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