geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-19 13:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,429 Commits 16 Branches 274 Tags
45bfef5e8d9f7f677686ffe9f3866bd033f3c8f5
Commit Graph

3429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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 36493cd84f Merge branch '1.x' into 2.x 
* 1.x:
  fixed CS
 2016-12-13 18:01:02 +01:00
Fabien Potencier 52af84c117 fixed CS 2016-12-13 18:00:09 +01:00
Fabien Potencier cdb19b0877 minor #2295 Cleanups (nicolas-grekas) 
This PR was merged into the 2.x branch.

Discussion
----------

Cleanups

Minor cleanup (getTemplateName is deprecated in 1.x)

Commits
-------

b8dabf6 Cleanups
 2016-12-13 15:09:35 +01:00
Fabien Potencier 2486d3589e Merge branch '1.x' into 2.x 
* 1.x:
  Cleanup
 2016-12-13 15:08:37 +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
Nicolas Grekas b8dabf6734 Cleanups 2016-12-13 14:22:28 +01:00
Fabien Potencier a73280e69f marked @final classes as final 2016-12-13 11:46:01 +01:00
Fabien Potencier 5e0e1bd699 Merge branch '1.x' into 2.x 
* 1.x:
  fixed some tests
 2016-12-13 11:45:35 +01:00
Fabien Potencier b91182bdce fixed some tests 2016-12-13 11:43:21 +01:00
Fabien Potencier 502ddadf8a simplified code 2016-12-13 11:22:32 +01:00