Commit Graph

2962 Commits

Author SHA1 Message Date
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 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 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
Fabien Potencier 73c0777435 bug #2144 [WIP] Take into account passed options when generating cache key (closes #1604) (Koc)
This PR was merged into the 1.x branch.

Discussion
----------

[WIP] Take into account passed options when generating cache key (closes #1604)

Cache depends on options like optimization or debug mode. If we generate different cache files depends on php version or enabled extensions - we can take into account options with wich env was created.

Commits
-------

9f3cfc3 Take into account passed options when generating cache key (closes #1604)
2016-10-02 09:03:45 -07:00
Konstantin.Myakshin 9f3cfc3884 Take into account passed options when generating cache key (closes #1604) 2016-10-01 00:07:10 +03:00
Fabien Potencier 94ca4e993e updated CHANGELOG 2016-09-29 20:57:16 -07:00
Fabien Potencier 91d2adc061 bug #2152 normalizePath: Do not mangle phar URLs. (apapsch)
This PR was squashed before being merged into the 1.x branch (closes #2152).

Discussion
----------

normalizePath: Do not mangle phar URLs.

Removing consecutive slashes breaks phar URLs. Example:
phar:///foo/bar is turned into phar:/foo/bar.

This change preserves the three slashes if path starts with phar://.

Commits
-------

7dd63fc normalizePath: Do not mangle phar URLs.
2016-09-29 20:46:34 -07:00
Aljosha Papsch 7dd63fc087 normalizePath: Do not mangle phar URLs. 2016-09-29 20:46:32 -07:00
Fabien Potencier a0971db72b added missing var decl 2016-09-29 13:02:49 -07:00
Fabien Potencier 1704c48ff7 feature #1913 added runtime extensions (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added runtime extensions

Commits
-------

9cb6860 allowed filters/functions/tests implementation to use a different class than the extension they belong to
2016-09-29 12:51:18 -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 c8e96e8c89 fixed profiler extension name 2016-09-28 17:59:53 -07:00
Fabien Potencier f58cce77d7 feature #2148 deprecated Twig_ExtensionInterface::getName() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_ExtensionInterface::getName()

see #2147

Commits
-------

71f03df deprecated Twig_ExtensionInterface::getName()
2016-09-28 10:18:54 -07:00
Fabien Potencier 71f03df011 deprecated Twig_ExtensionInterface::getName() 2016-09-28 10:05:09 -07:00
Fabien Potencier 52e9e01353 minor #2150 added some missing tests for functions/filters as static calls (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added some missing tests for functions/filters as static calls

Commits
-------

c73e97e added some missing tests for functions/filters as static calls
2016-09-27 10:24:00 -07:00
Fabien Potencier c73e97ece4 added some missing tests for functions/filters as static calls 2016-09-27 10:19:55 -07:00
Fabien Potencier 48a6df29e8 added missing information in deprecatd.rst 2016-09-26 21:10:54 -07:00
Fabien Potencier c96ffc314f fixed CS 2016-09-26 21:00:51 -07:00
Fabien Potencier 86e4c0d484 minor #2140 added a recipe about how to use Twig and AngularJS together (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added a recipe about how to use Twig and AngularJS together

Commits
-------

b162a91 added a recipe about how to use Twig and AngularJS together
2016-09-26 14:01:40 -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 9ee6fe3380 adding missing dots to some exception messages 2016-09-24 12:21:25 -07:00
Fabien Potencier 0980fe0871 fixed error message 2016-09-24 12:10:10 -07:00
Fabien Potencier af2e1111ae bug #2141 added a missing deprecation notice (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added a missing deprecation notice

Commits
-------

9c27479 added a missing deprecation notice
2016-09-24 12:01:42 -07:00
Fabien Potencier 73d029b212 minor #2143 fixed exception message that might end with a ? (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed exception message that might end with a ?

Commits
-------

5c43548 adding missing dots to some exception messages
fbf99fc fixed exception message that might end with a ?
2016-09-24 12:00:56 -07:00
Fabien Potencier b2a1805146 fixed error message 2016-09-24 12:00:09 -07:00