Commit Graph

3442 Commits

Author SHA1 Message Date
Fabien Potencier e36f33dae0 fixed composer.json 2016-12-24 09:32:21 +01:00
Fabien Potencier 8aee0809c3 fixed version in documentation 2016-12-24 09:08:07 +01:00
Fabien Potencier 4411071959 Merge branch '1.x' into 2.x
* 1.x:
  fixed composer.json
  bumped version to 1.30.1-DEV
  prepared the 1.30.0 release
2016-12-24 09:07:51 +01:00
Fabien Potencier b42bacec7f fixed composer.json 2016-12-24 09:07:02 +01:00
Fabien Potencier 73e9104baa feature #2316 moved Twig_Template::getAttribute() to a function (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

moved Twig_Template::getAttribute() to a function

Commits
-------

6405684 moved Twig_Template::getAttribute() to a function
2016-12-23 12:18:13 +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 1055dd5767 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  updated CHANGELOG
  Add a Twig_FactoryRuntimeLoader
2016-12-23 11:51:01 +01:00
Fabien Potencier 640568437f moved Twig_Template::getAttribute() to a function 2016-12-23 11:50:47 +01:00
Fabien Potencier 45bfef5e8d minor #2315 modified code to use variadics when possible (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

modified code to use variadics when possible

Commits
-------

a002d59 modified code to use variadics when possible
2016-12-23 09:17:23 +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 f03ddaef43 Merge branch '1.x' into 2.x
* 1.x:
  added more final classes
  add a comma to clarify the meaning
2016-12-23 09:06:20 +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
Fabien Potencier a002d591f7 modified code to use variadics when possible 2016-12-23 08:53:30 +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 0f398a3463 Merge branch '1.x' into 2.x
* 1.x:
  removed unnneeded phpdocs
2016-12-23 08:11:22 +01:00
Fabien Potencier c88edc8c75 removed unnneeded phpdocs 2016-12-23 08:09:25 +01:00
Fabien Potencier b7a5597f09 Merge branch '1.x' into 2.x
* 1.x:
  tweaked a deprecation notice
  added more docs about the range function
2016-12-23 07:53:11 +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 eac76a848a fixed CS 2016-12-22 13:17:12 +01:00
Fabien Potencier 8044631f0e Merge branch '1.x' into 2.x
* 1.x:
  added PHP CS Fixer config
  fixed CS
2016-12-22 13:16:40 +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 af64acb714 feature #2302 drop PHP 5.x support (fabpot, robfrawley)
This PR was merged into the 2.x branch.

Discussion
----------

drop PHP 5.x support

Commits
-------

b6761e1 removed old C extension
747d7be dropped PHP 5.x support
12e7545 fix travis build matrix to support 7.x and hhvm
2016-12-21 19:56:11 +01:00
Fabien Potencier b6761e1934 removed old C extension 2016-12-21 19:53:52 +01:00
Fabien Potencier 747d7bea87 dropped PHP 5.x support 2016-12-21 10:34:59 +01:00
Rob Frawley 2nd 12e75458bc fix travis build matrix to support 7.x and hhvm 2016-12-21 10:34:59 +01:00
Fabien Potencier 9eeaa699ca removed deprecated disable_c_ext attribute on Twig_Node_Expression_GetAttr 2016-12-21 10:31:38 +01:00
Fabien Potencier c9cb8becd9 remove deprecations 2016-12-20 05:06:14 +01:00
Fabien Potencier 56dc5e781a Merge branch '1.x' into 2.x
* 1.x:
  deprecated function/test/filter/tag overriding
2016-12-20 05:04:11 +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 dc36ae32a4 Merge branch '1.x' into 2.x
* 1.x:
  Sync PHP ext with PHP code to trigger deprecations
  deprecated the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr
  removed ltrim because $class variable already ltrim'ed
  Remove  argument type from ExpressionParser constructor
  bumped version to 1.29.1-DEV
  prepared the 1.29.0 release
2016-12-19 14:29:38 +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 5c0aabb0ee Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
  Fix sandbox being left enabled if an exception is thrown while rendering with include function
2016-12-13 18:10:29 +01:00
Fabien Potencier 5f2132dbb5 updated CHANGELOG 2016-12-13 18:08:57 +01:00