Commit Graph

3381 Commits

Author SHA1 Message Date
Nicolas Grekas b8dabf6734 Cleanups 2016-12-13 14:22:28 +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
Fabien Potencier ae9b503b17 updated CHANGELOG 2016-12-05 09:53:08 +01:00
Fabien Potencier 6ab2774002 feature #2279 Deprecate usage of undefined blocks (julienfalque)
This PR was merged into the 1.x branch.

Discussion
----------

Deprecate usage of undefined blocks

Alternative to #2277.

Commits
-------

75d474a Deprecate usage of undefined blocks
2016-12-05 09:49:29 +01:00
Julien Falque 75d474a223 Deprecate usage of undefined blocks 2016-11-26 12:48:23 +01:00
Fabien Potencier 717365d089 feature #2271 Deprecate support for mbstring.func_overload != 0 (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Deprecate support for mbstring.func_overload != 0

see https://wiki.php.net/rfc/deprecations_php_7_2

Commits
-------

6668d47 deprecated support for mbstring.func_overload != 0
2016-11-23 10:59:28 -08:00
Fabien Potencier 6668d475d6 deprecated support for mbstring.func_overload != 0 2016-11-23 10:49:23 -08:00
Fabien Potencier 2436915b46 bumped version to 1.28.3-DEV 2016-11-23 10:45:18 -08:00
Fabien Potencier b22ce0eb07 prepared the 1.28.2 release v1.28.2 2016-11-23 10:41:40 -08:00
Fabien Potencier 99b28e273c Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
  added some tests
  Fix unconsistent behavior with "get"  and "is"
2016-11-21 17:08:24 -08:00
Fabien Potencier 62aefc57ac updated CHANGELOG 2016-11-21 17:07:11 -08:00
Fabien Potencier 8778313990 added some tests 2016-11-21 17:05:04 -08:00
Fabien Potencier e7aa8e5448 bug #2272 Fix unconsistent behavior with "get" and "is" (wolfx)
This PR was squashed before being merged into the 1.x branch (closes #2272).

Discussion
----------

Fix unconsistent behavior with "get"  and "is"

Commits
-------

8fb35d5 Fix unconsistent behavior with "get"  and "is"
2016-11-21 17:03:53 -08:00
Cyril PERROT 8fb35d5fd4 Fix unconsistent behavior with "get" and "is" 2016-11-21 17:03:50 -08:00
Fabien Potencier 819844de89 Merge branch '1.x' into 2.x
* 1.x:
  fixed tests
2016-11-21 16:55:28 -08:00
Fabien Potencier 9fce825115 fixed tests 2016-11-21 16:55:02 -08:00
Fabien Potencier b962e80d0f removed obsolete code 2016-11-19 11:48:02 -08:00
Fabien Potencier 2675139c93 Merge branch '1.x' into 2.x
* 1.x:
  fixed message
  improved a deprecation notice
  bumped version to 1.28.2-DEV
  prepared the 1.28.1 release
  added tests for block() when using a template argument
  fixed block() is defined call when using a template argument
  Bugfix: When rendering blocks of other templates, don't pass the local blocks array.
  fixed doc issues
  fixed typo in the docs
  fix wrong __CLASS__ constant
  bumped version to 1.28.1-DEV
  prepared the 1.28.0 release
  fixed render block with template wrapper
2016-11-19 11:45:49 -08:00
Fabien Potencier ed6e8972ac fixed message 2016-11-19 11:44:10 -08:00
Fabien Potencier b7e60cf37f minor #2270 improved a deprecation notice (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

improved a deprecation notice

Commits
-------

0595c40 improved a deprecation notice
2016-11-19 11:25:47 -08:00
Fabien Potencier 0595c402d7 improved a deprecation notice 2016-11-19 11:13:58 -08:00
Fabien Potencier 4c9603121d bumped version to 1.28.2-DEV 2016-11-18 21:55:27 -08:00
Fabien Potencier fff80c4a7a prepared the 1.28.1 release v1.28.1 2016-11-18 21:52:49 -08:00
Fabien Potencier f59b33a93e bug #2269 Bugfix: When rendering blocks of other templates, don't pass the local blocks array (derrabus, fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Bugfix: When rendering blocks of other templates, don't pass the local blocks array

This PR fixes symfony/symfony#20556.

When referring to a block of another template from within a template that also has a block with the same name, Twig renders the wrong block.

Commits
-------

8c090a7 added tests for block() when using a template argument
a5526f3 fixed block() is defined call when using a template argument
c04d077 Bugfix: When rendering blocks of other templates, don't pass the local blocks array.
2016-11-18 21:51:10 -08:00
Fabien Potencier 8c090a7cc4 added tests for block() when using a template argument 2016-11-18 15:57:16 -05:00
Fabien Potencier a5526f32fb fixed block() is defined call when using a template argument 2016-11-18 15:51:16 -05:00
Alexander M. Turek c04d077e4f Bugfix: When rendering blocks of other templates, don't pass the local blocks array. 2016-11-18 18:23:01 +01:00
Fabien Potencier a1eb0f5601 minor #2268 fixed doc issues (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed doc issues

Commits
-------

629810c fixed doc issues
2016-11-18 10:09:22 -05:00
Fabien Potencier 629810c91e fixed doc issues 2016-11-18 10:07:48 -05:00
Fabien Potencier 9c9816874d fixed typo in the docs 2016-11-18 09:49:07 -05:00