Commit Graph

843 Commits

Author SHA1 Message Date
Fabien Potencier d03297ed52 deprecated Twig_Node::getFilename() in favor of Twig_Node::getName() 2016-10-17 15:04:06 -07:00
Fabien Potencier 6490ae6126 removed obsolete code 2016-10-17 13:59:54 -07:00
Fabien Potencier 9aadaae00c Merge branch '1.x'
* 1.x:
  added Twig_Source to hold information about the original template
2016-10-17 13:51:13 -07:00
Fabien Potencier 09b2b8a5c3 fixed docs 2016-10-17 13:36:23 -07:00
Fabien Potencier 6c76583e23 added Twig_Source to hold information about the original template 2016-10-17 13:33:17 -07:00
Fabien Potencier b399ec0d1a deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() 2016-10-17 13:20:25 -07:00
Fabien Potencier d77f3dd34b deprecated Parser::getFilename() 2016-10-17 11:33:14 -07:00
Fabien Potencier 907366d053 made some cleanup 2016-10-05 11:16:59 -07:00
Fabien Potencier 32d3cc90e7 Merge branch '1.x'
* 1.x:
  added missing var decl
  allowed filters/functions/tests implementation to use a different class than the extension they belong to
2016-09-29 13:51:46 -07:00
Fabien Potencier 9cb6860e53 allowed filters/functions/tests implementation to use a different class than the extension they belong to 2016-09-29 11:43:35 -07:00
Fabien Potencier 94586346be removed obsolete features 2016-09-28 10:49:38 -07:00
Fabien Potencier df9a1151ee Merge branch '1.x'
* 1.x:
  deprecated Twig_ExtensionInterface::getName()
  added some missing tests for functions/filters as static calls
  added missing information in deprecatd.rst
2016-09-28 10:45:26 -07:00
Fabien Potencier 71f03df011 deprecated Twig_ExtensionInterface::getName() 2016-09-28 10:05:09 -07:00
Fabien Potencier 48a6df29e8 added missing information in deprecatd.rst 2016-09-26 21:10:54 -07:00
Fabien Potencier 105924b822 Merge branch '1.x'
* 1.x:
  fixed CS
  added a recipe about how to use Twig and AngularJS together
2016-09-26 21:01:42 -07:00
Fabien Potencier b162a91eeb added a recipe about how to use Twig and AngularJS together 2016-09-26 14:01:23 -07:00
Fabien Potencier 7187f2cf51 Merge branch '1.x'
* 1.x:
  fixed error message
  Improved the error message when a child template defines contents outside parent blocks
  adding missing dots to some exception messages
  fixed exception message that might end with a ?
  added a missing deprecation notice
  removed obsolete comment
  bumped version to 1.25.1-DEV
  prepared the 1.25.0 release
  fixed docs
  Expanded definition of empty
2016-09-24 12:03:36 -07:00
Fabien Potencier bba5e1a1b3 removed obsolete comment 2016-09-22 08:15:13 -07:00
Fabien Potencier 349b0885cd fixed docs 2016-09-21 13:27:56 -07:00
Nathan Perry 9c6b8cb3e4 Expanded definition of empty 2016-09-21 13:27:28 -07:00
Fabien Potencier 620613ced8 Merge branch '1.x'
* 1.x: (23 commits)
  changed a test to make it more robust
  bumped version to 1.24.3-DEV
  prepared the 1.24.2 release
  updated CHANGELOG
  Floor - use cast and not intval
  fixed CS
  Do not mix indention levels
  fixed typo
  Add Visual Studio Code to the list of IDE integrations
  Fixed all deprecation notices by using
  [Doc] Fixed small error in code example
  Update macro.rst
  Update use.rst
  Fix exception message for static method and object without req. params.
  add named macro end-tag documentation
  fixed CS
  Fix load cache
  Minor rst syntax tweaks
  Reset blocks also in doLeaveNode
  fix a case where the autoescaping does not work as expected
  ...
2016-09-18 18:58:25 -07:00
shakealot 6d11813350 parenthesis typo 2016-08-25 11:39:08 +02:00
Fabien Potencier 21039777d8 minor #2062 [DOC] add named macro end-tag documentation (JakeFr)
This PR was merged into the 1.x branch.

Discussion
----------

[DOC] add named macro end-tag documentation

Hello!
Just discover endmacro tag supports name, just like block.
But it is not mentionned in the doc.
So here's a PR

Commits
-------

dcc5f45 add named macro end-tag documentation
2016-08-15 10:25:09 -07:00
Grégoire Paris 507f697ad0 Do not mix indention levels
Not sure if this was intentional, but the "if" line had an indention of 3 spaces,
while the "true" line has an indention of 4 spaces.
2016-08-15 10:21:29 -07:00
Fabien Potencier b7cd3a88dc fixed typo 2016-07-28 16:58:48 -04:00
Svante Richter e8b16c0693 Add Visual Studio Code to the list of IDE integrations
With the "TWIG pack" extension.
2016-07-28 16:58:12 -04:00
Thomas Schulz dc798d3bbb [Doc] Fixed small error in code example 2016-07-10 09:48:21 +02:00
Aaron Wallentine 080054501f Update macro.rst
Small grammar fix: subject-verb agreement "Macros differ" vs "Macros differs"
2016-06-24 07:05:43 +02:00
Aaron Wallentine 08c830a5aa Update use.rst
Small grammar fix.
2016-06-24 07:05:20 +02:00
JakeFr dcc5f450de add named macro end-tag documentation 2016-06-21 11:36:37 +02:00
Javier Eguiluz b42ddb3989 Minor rst syntax tweaks 2016-06-13 10:25:29 +02:00
Fabien Potencier cf96ecf366 Merge branch '1.x'
* 1.x:
  Small fixes
  Grammar
  [DOC] recipes.rst uses Twig_Function_Function
  handle Throwable
2016-05-30 11:07:11 +02:00
Sam e81e698187 Small fixes 2016-05-20 08:13:46 +02:00
Owen Kieffer-Jones 6dd784a2d5 Grammar 2016-05-13 14:46:43 -05:00
JakeFr 1a1ba8bba4 [DOC] recipes.rst uses Twig_Function_Function
Hello,
Here's a minor update for recipes.rst
I rewrite the code sample for registerUndefinedFunctionCallback to remove usage of deprecated class Twig_Function_Function.
2016-05-13 18:05:38 +02:00
Fabien Potencier 0ddc3c6395 Merge branch '1.x'
* 1.x:
  [ExpressionParser] forbids true, false, null and none keywords for variables names.
  fix a typo (add missing article)
  Implement Twig_Extension_GlobalsInterface on getGlobals example
  [Doc] Add a note about escaping backslashes inside strings
  Fixed minor syntax issues in templates.rst
  Promote the include() function instead of the "include" tag
2016-04-24 15:56:57 +02:00
Christian Flothmann e317c559a8 fix a typo (add missing article) 2016-04-21 09:43:05 +02:00
Darren Black b8a987ee33 Implement Twig_Extension_GlobalsInterface on getGlobals example 2016-04-20 08:47:42 +02:00
Fabien Potencier 3223e58253 minor #2005 [Doc] Add a note about escaping backslashes inside strings (javiereguiluz)
This PR was squashed before being merged into the 1.x branch (closes #2005).

Discussion
----------

[Doc] Add a note about escaping backslashes inside strings

Backslashes inside strings caused some confusion for some users. See https://github.com/symfony/symfony/issues/18207

Commits
-------

463ea80 [Doc] Add a note about escaping backslashes inside strings
2016-04-20 08:46:54 +02:00
Javier Eguiluz 463ea80126 [Doc] Add a note about escaping backslashes inside strings 2016-04-20 08:46:52 +02:00
Fabien Potencier 5cfdb76931 minor #2016 Promote the include() function instead of the "include" tag (javiereguiluz)
This PR was merged into the 1.x branch.

Discussion
----------

Promote the include() function instead of the "include" tag

The `{% include %}` tag is pseudo-officially deprecated in favor of the `include()` function. Let's update the documentation to promote the function instead of the tag.

Commits
-------

ea090df Promote the include() function instead of the "include" tag
2016-04-20 08:46:02 +02:00
Javier Eguiluz 4788e53d04 Fixed minor syntax issues in templates.rst 2016-04-17 19:46:21 +02:00
Javier Eguiluz ea090df8d9 Promote the include() function instead of the "include" tag 2016-04-17 19:40:15 +02:00
Fabien Potencier 16cfb31970 Merge branch '1.x'
* 1.x:
  Clarify exception message in Twig_Template::getAttribute
  Fix documentation, recipes section
2016-04-01 08:56:37 +02:00
Christian Flothmann d3c3c605d5 add hasser support to getAttribute() 2016-01-31 09:00:17 +01:00
iamluc ed8aa84881 Fix documentation, recipes section 2016-01-29 11:18:56 +01:00
Fabien Potencier 908990a9e5 Merge branch '1.x'
* 1.x:
  adding support for the ?? operator
  fixed the defined test when used on a constant, a map, or a sequence
  updated CHANGELOG
  compare charset strictly
2016-01-25 18:12:00 +01:00
Fabien Potencier cdd57f33b5 adding support for the ?? operator 2016-01-25 17:15:20 +01:00
Fabien Potencier 1015a8f9db reintroduced _self (returns the current template name) 2016-01-19 13:29:02 +01:00
Fabien Potencier b490e6594f undeprecated _self 2016-01-16 06:36:39 +01:00