geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-11-11 21:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,273 Commits 29 Branches 275 Tags
abaa2c19de4aeb7c8c42a335cd465824dbfb5ae4
Commit Graph

762 Commits

Author SHA1 Message Date
Fabien Potencier af3b0a550c bumped minimum version to PHP 5.6 2016-11-10 11:37:20 -08:00
Fabien Potencier fa4a5ebf31 Merge branch '1.x' into 2.x 
* 1.x:
  updated CHANGELOG
  bumped version to 1.28
  added testing PHP 7.1
  Enhance perf of Template::getAttribute()
  added a note about the default escaping strategy
  removed Xdebug on Travis
 2016-11-10 11:33:40 -08:00
Fabien Potencier 1c99469bcc minor #2227 added a note about the default escaping strategy (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

added a note about the default escaping strategy

fixes #2061

Commits
-------

56556d7 added a note about the default escaping strategy
 2016-11-10 10:28:59 -08:00
Fabien Potencier 56556d72f8 added a note about the default escaping strategy 2016-11-10 10:28:06 -08:00
Fabien Potencier 4deb03aeb1 deprecated Twig_Parser::getEnvironment() 2016-10-24 16:37:44 -07:00
Fabien Potencier 9cab8b9f37 feature #2202 deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor() (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()

I don't even understand why these methods are here. It looks like they never had any usage in the core.

Commits
-------

31c444b deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()
 2016-10-24 08:26:26 -07:00
Fabien Potencier bc499a47e1 deprecated Twig_Compiler::addIndentation() 2016-10-23 22:44:52 -07:00
Fabien Potencier 31c444b511 deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor() 2016-10-23 13:50:47 -07:00
Fabien Potencier 07957af326 removed obsolete doc 2016-10-21 17:38:22 -07:00
Fabien Potencier 0fdae163ea Merge branch '1.x' 
* 1.x:
  added missing phpdoc
  made using Twig_SourceContextLoaderInterface required
  made name required for Twig_Source
 2016-10-21 17:29:34 -07:00
Fabien Potencier 21ecba8c44 made using Twig_SourceContextLoaderInterface required 2016-10-21 17:07:14 -07:00
Fabien Potencier 9c50224837 Merge branch '1.x' 
* 1.x:
  fixed the filesystem loader with relative paths
 2016-10-21 07:04:16 -07:00
Fabien Potencier a343c92805 fixed the filesystem loader with relative paths 2016-10-21 06:52:23 -07:00
Fabien Potencier 39d94dfb40 renamed Twig_Node::getLine() to Twig_Node::getTemplateLine() 2016-10-19 14:59:29 -07:00
Fabien Potencier e231aa539f renamed Twig_Node::getName() to Twig_Node::getTemplateName() 2016-10-19 14:59:16 -07:00
Fabien Potencier 95ad579e37 Merge branch '1.x' 
* 1.x:
  fixed docs
  fixed typo
  fixed typo
 2016-10-17 15:42:41 -07:00
Fabien Potencier 3c764b2b01 fixed docs 2016-10-17 15:41:50 -07:00
Fabien Potencier de385b25be fixed typo 2016-10-17 15:41:50 -07:00
Fabien Potencier 7598f27e6d deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext() 2016-10-17 15:30:12 -07:00
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