geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 11:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,201 Commits 10 Branches 273 Tags
7f50a5e8d4dfc8332dc8723ce64d7ee8fee97a74
Commit Graph

3201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier 7f50a5e8d4 Merge branch '1.x' 
* 1.x:
  renamed Twig_Node::getLine() to Twig_Node::getTemplateLine()
  renamed Twig_Node::getName() to Twig_Node::getTemplateName()
  fix deprecation version number
 2016-10-19 15:07:54 -07:00
Fabien Potencier 801902ef31 feature #2193 rename Twig_Node::getName to getTemplateName and Twig_Node::getFile to getTemplateLine (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

rename Twig_Node::getName to getTemplateName and Twig_Node::getFile to getTemplateLine

Commits
-------

39d94df renamed Twig_Node::getLine() to Twig_Node::getTemplateLine()
e231aa5 renamed Twig_Node::getName() to Twig_Node::getTemplateName()
 2016-10-19 15:05:57 -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 63c2d08ddb minor #2187 fix deprecation version number (xabbuh) 
This PR was merged into the 1.x branch.

Discussion
----------

fix deprecation version number

Commits
-------

62c092b fix deprecation version number
 2016-10-18 07:29:26 -07:00
Christian Flothmann 62c092bd30 fix deprecation version number 2016-10-18 09:49:22 +02:00
Fabien Potencier b255b5185e Merge branch '1.x' 
* 1.x:
  fixed usage of deprecated features
 2016-10-17 17:56:57 -07:00
Fabien Potencier ed5506e3c6 fixed usage of deprecated features 2016-10-17 17:56:52 -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 ae9656a8b1 fixed typo 2016-10-17 15:39:21 -07:00
Fabien Potencier dfe6b124d4 Merge branch '1.x' 
* 1.x:
  optimized generated code
 2016-10-17 15:38:39 -07:00
Fabien Potencier 7082738cbf optimized generated code 2016-10-17 15:37:49 -07:00
Fabien Potencier 569ae34b76 removed obsolete code 2016-10-17 15:35:28 -07:00
Fabien Potencier 265cbc7b0f Merge branch '1.x' 
* 1.x:
  deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()
 2016-10-17 15:34:07 -07:00
Fabien Potencier 73e2c68ddd feature #2186 deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext() (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()

Commits
-------

7598f27 deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()
 2016-10-17 15:33:22 -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 c5259552e1 removed obsolete code 2016-10-17 15:13:54 -07:00
Fabien Potencier a7f0b26777 Merge branch '1.x' 
* 1.x:
  deprecated Twig_Node::getFilename() in favor of Twig_Node::getName()
  got rid of filename when we meant template name
 2016-10-17 15:12:09 -07:00
Fabien Potencier b646e503e9 feature #2185 Try to rename filename to name where we really mean the template name, not the template path on the filesystem (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Try to rename filename to name where we really mean the template name, not the template path on the filesystem

Commits
-------

d03297e deprecated Twig_Node::getFilename() in favor of Twig_Node::getName()
eb47dc9 got rid of filename when we meant template name
 2016-10-17 15:09:22 -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 eb47dc95d8 got rid of filename when we meant template name 2016-10-17 14:57:53 -07:00
Fabien Potencier 051be3b95f removed unneeded code 2016-10-17 14:10:44 -07:00
Fabien Potencier 0ea736ae9d fixed wrong merge 2016-10-17 14:04:54 -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 1b7b147768 feature #2182 added Twig_Source to hold information about the original template (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

added Twig_Source to hold information about the original template

Alternative to #2170

Commits
-------

6c76583 added Twig_Source to hold information about the original template
 2016-10-17 13:38:43 -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 abb10aa5fa removed deprecated code 2016-10-17 13:31:21 -07:00
Fabien Potencier 1cbce8b89f Merge branch '1.x' 
* 1.x:
  deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile()
 2016-10-17 13:30:11 -07:00
Fabien Potencier e292ab0eee feature #2184 deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile()

Commits
-------

b399ec0 deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile()
 2016-10-17 13:29:16 -07:00
Fabien Potencier 28b11876e0 removed deprecated code 2016-10-17 13:29:00 -07:00
Fabien Potencier 086f40cacd Merge branch '1.x' 
* 1.x:
  deprecated Parser::getFilename()
  fixed typo
 2016-10-17 13:25:00 -07:00
Fabien Potencier b399ec0d1a deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() 2016-10-17 13:20:25 -07:00
Fabien Potencier 1fe5e9bb3a feature #2183 deprecated Parser::getFilename() (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Parser::getFilename()

The name is misleading as it returns the logical template name and not the proper filesystem path. In #2182, this is then replaced with a proper object. This PR simplifies the code review for #2182 by avoiding the pollution of all the changes in the token parser classes.

Commits
-------

d77f3dd deprecated Parser::getFilename()
 2016-10-17 12:07:13 -07:00
Fabien Potencier d77f3dd34b deprecated Parser::getFilename() 2016-10-17 11:33:14 -07:00
Fabien Potencier b98f431828 fixed typo 2016-10-15 11:18:26 -07:00
Fabien Potencier 2f6d8ba6aa Merge branch '1.x' 
* 1.x:
  made it possible to store templates with vfsStream
  Improved Sandbox error handling
  fixed .travis.yml
  marked Twig_TokenStream::getSource() as being internal
  fixed CHANGELOGO
  bumped version to 1.26.2-DEV
  prepared the 1.26.1 release
  removed template source code for generated template classes when debug is disabled
  updated CHANGELOG
 2016-10-14 11:54:55 -07:00
Fabien Potencier 13a63b29ae minor #2179 undeprecate interface for a smooth upgrade path (xabbuh) 
This PR was merged into the 2.0-dev branch.

Discussion
----------

undeprecate interface for a smooth upgrade path

The interface should then become deprecated in Twig 2.1 (see https://github.com/symfony/symfony/issues/18427#issuecomment-253293223).

Commits
-------

232e5be revert deprecations for a smooth upgrade path
 2016-10-14 11:45:05 -07:00
Christian Flothmann 232e5bee8c revert deprecations for a smooth upgrade path 
Let users safely migrate their code to Twig 2.0. These deprecations
should be readded in Twig 2.1.
 2016-10-14 17:35:01 +02:00
Fabien Potencier ef942f60d8 bug #2178 made it possible to store templates with vfsStream (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

made it possible to store templates with vfsStream

closes #2166

Commits
-------

4d60758 made it possible to store templates with vfsStream
 2016-10-13 07:03:03 -07:00
Fabien Potencier 4d607583ff made it possible to store templates with vfsStream 2016-10-13 07:01:51 -07:00
Fabien Potencier 3879038edc feature #2176 Improved Sandbox error handling (kitbs) 
This PR was squashed before being merged into the 1.x branch (closes #2176).

Discussion
----------

Improved Sandbox error handling

On the model of the SecurityNotAllowedFilterError, SecurityNotAllowedFunctionError and SecurityNotAllowedTagError, I added SecurityNotAllowedMethodError and SecurityNotAllowedPropertyError to allow the user to retrieve both the $className and $methodName/$propertyName from the exception.

Commits
-------

e1c980f Improved Sandbox error handling
 2016-10-12 11:47:38 -07:00
Kit Burton-Senior e1c980fa87 Improved Sandbox error handling 2016-10-12 11:47:36 -07:00
Fabien Potencier 614ade9ae0 fixed .travis.yml 2016-10-11 19:11:37 -07:00
Fabien Potencier d9b2b72013 minor #2173 marked Twig_TokenStream::getSource() as being internal (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

marked Twig_TokenStream::getSource() as being internal

Commits
-------

4b1573b marked Twig_TokenStream::getSource() as being internal
 2016-10-09 08:59:36 -07:00
Fabien Potencier 4b1573b965 marked Twig_TokenStream::getSource() as being internal 2016-10-09 07:58:47 -07:00
Fabien Potencier 33dfadb752 fixed CHANGELOGO 2016-10-05 12:07:20 -07:00