Commit Graph

3183 Commits

Author SHA1 Message Date
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
Fabien Potencier b75b3f7597 bumped version to 1.26.2-DEV 2016-10-05 12:06:51 -07:00
Fabien Potencier a09d8ee17a prepared the 1.26.1 release v1.26.1 2016-10-05 11:57:41 -07:00
Fabien Potencier 116e71ebe0 feature #2164 removed template source code for generated template classes when debug is disabled (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

removed template source code for generated template classes when debug is disabled

Commits
-------

7a04767 removed template source code for generated template classes when debug is disabled
2016-10-05 11:56:11 -07:00
Fabien Potencier 7a047679ab removed template source code for generated template classes when debug is disabled 2016-10-05 11:41:41 -07:00
Fabien Potencier 75e4aa5eef updated CHANGELOG 2016-10-05 11:20:38 -07:00
Fabien Potencier 907366d053 made some cleanup 2016-10-05 11:16:59 -07:00
Fabien Potencier 76ec69333b Merge branch '1.x'
* 1.x:
  fixed regression on static calls for functions/filters/tests
  default implementation of getDebugInfo() for BC
  fix docblock
  bumped version to 1.26.1-DEV
  prepared the 1.26.0 release
  fixed logic
  fixed error class
  updated CHANGELOG
  Take into account passed options when generating cache key (closes #1604)
  updated CHANGELOG
  normalizePath: Do not mangle phar URLs.
2016-10-05 11:12:27 -07:00
Fabien Potencier 9dde5456c7 bug #2161 fixed regression on static calls for functions/filters/tests (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed regression on static calls for functions/filters/tests

fixes #2160

What about deprecate this possibility? Using `__call()`/`__staticCall()` means that we don't support named arguments for instance.

Commits
-------

e01c29b fixed regression on static calls for functions/filters/tests
2016-10-05 11:08:14 -07:00
Fabien Potencier e01c29be32 fixed regression on static calls for functions/filters/tests 2016-10-05 11:02:40 -07:00
Fabien Potencier 6cebf7a3a7 minor #2162 fix docblock (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

fix docblock

Commits
-------

f93b703 fix docblock
2016-10-05 10:42:37 -07:00
Fabien Potencier c2aaa0edfa bug #2163 default implementation of getDebugInfo() for BC (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

default implementation of getDebugInfo() for BC

eZ updated the code on their side in the meantime (see ezsystems/LegacyBridge#63), but there may be other projects doing similar things (fixes https://github.com/twigphp/Twig/pull/2129#discussion_r80250969).

Commits
-------

7b4cfdb default implementation of getDebugInfo() for BC
2016-10-05 10:42:11 -07:00
Christian Flothmann 7b4cfdb5a1 default implementation of getDebugInfo() for BC 2016-10-05 18:17:37 +02:00
Christian Flothmann f93b7037e8 fix docblock 2016-10-05 18:13:13 +02:00
Fabien Potencier f00e7b8c14 bumped version to 1.26.1-DEV 2016-10-02 09:26:06 -07:00
Fabien Potencier 81c2b5fd36 prepared the 1.26.0 release v1.26.0 2016-10-02 09:19:13 -07:00
Fabien Potencier 90a65d3b0e fixed logic 2016-10-02 09:12:12 -07:00
Fabien Potencier 8f0733eb11 fixed error class 2016-10-02 09:09:50 -07:00
Fabien Potencier a15f4ce740 updated CHANGELOG 2016-10-02 09:06:32 -07:00