Commit Graph

3409 Commits

Author SHA1 Message Date
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
Fabien Potencier ead4fff624 Merge branch '1.x' into 2.x
* 1.x:
  simplified a test
2016-12-13 11:21:44 +01:00
Fabien Potencier e33020becf simplified a test 2016-12-13 11:21:33 +01:00
Fabien Potencier c795267a4d Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  marked some classes as being final
  Better type description on PHPDoc, better testing of returned value.
  Make Twig_Error report real source path when possible
2016-12-13 11:18:37 +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 31801a18ce Merge branch '1.x' into 2.x
* 1.x:
  added support for {{ _self }} to provide an upgrade path from 1.x to 2.0
2016-12-08 10:24:50 +01:00
Fabien Potencier 117612109b minor #2289 Remove debugging class (stof)
This PR was merged into the 2.x branch.

Discussion
----------

Remove debugging class

this file was added in the repo in the 2.x branch during an upstream merge of the 1.x branch. It clearly looks like a mistake.

Commits
-------

8206f44 Remove debugging class
2016-12-08 10:01:40 +01:00
Christophe Coevoet 8206f446f8 Remove debugging class 2016-12-08 09:56:50 +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 fbbdeb53a7 Merge branch '1.x' into 2.x
* 1.x:
  simplified code
2016-12-05 10:21:22 +01:00
Fabien Potencier 8ad862b98e simplified code 2016-12-05 10:20:45 +01:00
Fabien Potencier b09faf8307 removed support for silent display of undefined blocks 2016-12-05 10:18:56 +01:00
Fabien Potencier 272f792b63 removed support for mbstring.func_overload != 0 2016-12-05 10:18:40 +01:00
Fabien Potencier 08f14d55f0 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
  Deprecate usage of undefined blocks
  deprecated support for mbstring.func_overload != 0
  bumped version to 1.28.3-DEV
  prepared the 1.28.2 release
2016-12-05 09:57:28 +01:00