Commit Graph

3138 Commits

Author SHA1 Message Date
Fabien Potencier 5268900793 minor #2319 Fix typo in phpdoc (chalasr)
This PR was merged into the 1.x branch.

Discussion
----------

Fix typo in phpdoc

Commits
-------

6a720ab Fix typo in phpdoc
2016-12-26 08:10:59 +01:00
Robin Chalas 6a720ab263 Fix typo in phpdoc 2016-12-25 11:15:02 +01:00
Fabien Potencier ae05130032 bug #2317 fix C89 compat (Jan-E)
This PR was merged into the 1.x branch.

Discussion
----------

fix C89 compat

@tucksaun @fabpot The extension did not compile anymore with old MSVC compilers. This PR contains the fix.

Commits
-------

c6be57f fix C89 compat
2016-12-24 11:35:17 +01:00
Fabien Potencier b42bacec7f fixed composer.json 2016-12-24 09:07:02 +01:00
Jan-E c6be57f903 fix C89 compat 2016-12-24 06:16:32 +01:00
Fabien Potencier 2cbc573aa5 bumped version to 1.30.1-DEV 2016-12-23 12:16:08 +01:00
Fabien Potencier c6ff71094f prepared the 1.30.0 release v1.30.0 2016-12-23 12:06:22 +01:00
Fabien Potencier 72762d6c2c fixed CS 2016-12-23 09:12:13 +01:00
Fabien Potencier d9e56ac6ac updated CHANGELOG 2016-12-23 09:11:24 +01:00
Fabien Potencier 2fd05fdd05 feature #2311 Add a simple Twig_RuntimeLoaderInterface implementation (chalasr)
This PR was merged into the 1.x branch.

Discussion
----------

Add a simple Twig_RuntimeLoaderInterface implementation

Next to https://github.com/symfony/symfony/pull/21023

This is related to the BC break reported in symfony/symfony#21008 which has been introduced in symfony/symfony#20093 when decoupling extensions from definitions.

What I propose here is to ease the upgrade to symfony 3.2+ by adding a simple `Twig_RuntimeLoaderInterface` implementation here, useful only when using the twig-bridge outside of the symfony fullstack framework (with the Form component for instance).

Upgrading would be as simple as:

```diff
$twig = new Twig_Environment(...);
$rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'), $twig);
- $twig->addExtension(new FormExtension(new TwigRenderer($rendererEngine, $csrfTokenManager)));
+ $twig->addExtension(new FormExtension());
+ $twig->addRuntimeLoader(new Twig_RuntimeLoader(array(TwigRenderer::class => new TwigRenderer($rendererEngine, $csrfTokenManager)));
```

Instead of having to write this runtime loader yourself.
Please see symfony/symfony#21008 for details and a concrete example of how this could help.

Commits
-------

91c8d59 Add a Twig_FactoryRuntimeLoader
2016-12-23 09:11:01 +01:00
Fabien Potencier 0457888fc3 added more final classes 2016-12-23 09:05:03 +01:00
Fabien Potencier 3824a4c2b7 minor #2314 add a comma to clarify the meaning (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

add a comma to clarify the meaning

Without the comma you could understand that the "if" not only applied
to `-1`, but to `1` as well if you read too quickly.

Commits
-------

7cd3c9d add a comma to clarify the meaning
2016-12-23 08:57:59 +01:00
Christian Flothmann 7cd3c9d25f add a comma to clarify the meaning
Without the comma you could understand that the "if" not only applied
to `-1`, but to `1` as well if you read too quickly.
2016-12-23 08:52:50 +01:00
Fabien Potencier c88edc8c75 removed unnneeded phpdocs 2016-12-23 08:09:25 +01:00
Fabien Potencier 97a8c53ec6 tweaked a deprecation notice 2016-12-23 07:51:44 +01:00
Fabien Potencier 40348480e7 added more docs about the range function 2016-12-23 07:21:48 +01:00
Robin Chalas 91c8d59978 Add a Twig_FactoryRuntimeLoader 2016-12-23 01:04:02 +01:00
Fabien Potencier 9b31db1ee6 minor #2308 added PHP CS Fixer config (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2308).

Discussion
----------

added PHP CS Fixer config

Commits
-------

aa9604a added PHP CS Fixer config
aa71a65 fixed CS
2016-12-22 13:16:28 +01:00
Fabien Potencier aa9604aad1 added PHP CS Fixer config 2016-12-22 13:07:38 +01:00
Fabien Potencier aa71a65f11 fixed CS 2016-12-22 13:04:37 +01:00
Fabien Potencier c33628267e feature #2304 deprecate function/test/filter/tag overriding (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecate function/test/filter/tag overriding

closes #2293

Commits
-------

7ffb188 deprecated function/test/filter/tag overriding
2016-12-20 05:02:06 +01:00
Fabien Potencier 7ffb188710 deprecated function/test/filter/tag overriding 2016-12-20 04:58:45 +01:00
Fabien Potencier 9dd38e29e3 feature #2303 deprecate the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr (fabpot, tucksaun)
This PR was merged into the 1.x branch.

Discussion
----------

deprecate the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr

Commits
-------

c215966 Sync PHP ext with PHP code to trigger deprecations
014ab1f deprecated the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr
2016-12-19 14:18:22 +01:00
Tugdual Saunier c215966a9e Sync PHP ext with PHP code to trigger deprecations 2016-12-19 14:02:16 +01:00
Fabien Potencier 014ab1f8e1 deprecated the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr 2016-12-17 21:04:25 +01:00
Fabien Potencier 7478b58b3d minor #2300 removed ltrim because $class variable already ltrim'ed (sapogov.n)
This PR was merged into the 1.x branch.

Discussion
----------

removed ltrim because $class variable already ltrim'ed

removed ltrim because $class variable already ltrim'ed

Commits
-------

3badb14 removed ltrim because $class variable already ltrim'ed
2016-12-16 17:06:44 +01:00
sapogov.n 3badb14147 removed ltrim because $class variable already ltrim'ed 2016-12-16 18:25:29 +03:00
Fabien Potencier 2c92684f15 bug #2298 Remove $env argument type from ExpressionParser constructor (fancyweb)
This PR was merged into the 1.x branch.

Discussion
----------

Remove $env argument type from ExpressionParser constructor

Either the argument type should be removed, or the whole "else" block and the deprecation warning is useless.

Commits
-------

3de96ef Remove  argument type from ExpressionParser constructor
2016-12-16 11:11:06 +01:00
Thomas Calvet 3de96ef8f9 Remove argument type from ExpressionParser constructor 2016-12-16 10:35:07 +01:00
Fabien Potencier 1ee6bee3db bumped version to 1.29.1-DEV 2016-12-13 18:39:54 +01:00
Fabien Potencier 74f723e542 prepared the 1.29.0 release v1.29.0 2016-12-13 18:28:18 +01:00
Fabien Potencier 5f2132dbb5 updated CHANGELOG 2016-12-13 18:08:57 +01:00
Fabien Potencier 43a3dbfefb bug #2282 Fix sandbox being left enabled if an exception is thrown while rendering (CarsonF)
This PR was merged into the 1.x branch.

Discussion
----------

Fix sandbox being left enabled if an exception is thrown while rendering

What's happening for me:
- An exception is thrown while rendering inside the sandbox
- Render exception response
- WebProfiler toolbar tries to include a file
- Sandbox is still enabled, so a SecurityException is thrown (which hides the real error)

Commits
-------

171a1d4 Fix sandbox being left enabled if an exception is thrown while rendering with include function
2016-12-13 18:08:17 +01:00
Carson Full 171a1d47a6 Fix sandbox being left enabled if an exception is thrown while rendering with include function 2016-12-13 11:04:18 -06:00
Fabien Potencier 52af84c117 fixed CS 2016-12-13 18:00:09 +01:00
Fabien Potencier 1394bd01d5 minor #2294 Cleanup (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Cleanup

Two things here:

guessTemplateInfo is private in 2.x
this PR will fix tests on 2.x

setTemplateName is deprecated, and the removed code paths are never run

Commits
-------

782102d Cleanup
2016-12-13 15:08:14 +01:00
Nicolas Grekas 782102d3d7 Cleanup 2016-12-13 14:30:25 +01:00
Fabien Potencier b91182bdce fixed some tests 2016-12-13 11:43:21 +01:00
Fabien Potencier e33020becf simplified a test 2016-12-13 11:21:33 +01:00
Fabien Potencier 0e0c534252 fixed CS 2016-12-13 10:49:21 +01:00
Fabien Potencier ed37fc72e1 minor #2290 Better testing of operators returned by Extension (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Better testing of operators returned by Extension

Add better testing and docs description about operators when using an extension.

Commits
-------

282df53 Better type description on PHPDoc, better testing of returned value.
2016-12-13 10:48:03 +01:00
Fabien Potencier 4ab33413cc feature #2288 marked some classes as being final (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

marked some classes as being final

Not sure about this one. I'd like some reviews before merging (we might make some other ones final and I might have marked some as final which should not). ping @stof @nicolas-grekas

Commits
-------

e89c712 marked some classes as being final
2016-12-13 10:41:06 +01:00
Fabien Potencier e89c712f58 marked some classes as being final 2016-12-10 08:40:37 +01:00
SpacePossum 282df533de Better type description on PHPDoc, better testing of returned value. 2016-12-09 08:12:45 +01:00
Fabien Potencier e4125e6ef9 feature #2273 Make Twig_Error report real source path when possible (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Make Twig_Error report real source path when possible

To get useful stack traces like this one:
![capture du 2016-11-22 12-16-07](https://cloud.githubusercontent.com/assets/243674/20521829/7cc1fa80-b0ad-11e6-81b6-028e66ac9436.png)

Commits
-------

44f0f9c Make Twig_Error report real source path when possible
2016-12-08 11:31:05 +01:00
Nicolas Grekas 44f0f9cecd Make Twig_Error report real source path when possible 2016-12-08 11:07:42 +01:00
Fabien Potencier b6f28e066e feature #2287 added support for {{ _self }} to provide an upgrade path from 1.x to 2.0 (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added support for {{ _self }} to provide an upgrade path from 1.x to 2.0

fixes #2284

Commits
-------

8ab764b added support for {{ _self }} to provide an upgrade path from 1.x to 2.0
2016-12-08 09:35:14 +01:00
Fabien Potencier 8ab764b4d3 added support for {{ _self }} to provide an upgrade path from 1.x to 2.0 2016-12-08 08:54:19 +01:00
Fabien Potencier 8ad862b98e simplified code 2016-12-05 10:20:45 +01:00
Fabien Potencier ae9b503b17 updated CHANGELOG 2016-12-05 09:53:08 +01:00