geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-20 14:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 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
This commit is contained in:
Fabien Potencier
2016-11-19 11:45:49 -08:00
parent 5a9a2ccbaf ed6e8972ac
commit 2675139c93
13 changed files with 157 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -31,7 +31,7 @@
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7",
"symfony/phpunit-bridge": "~3.2@dev",
"symfony/debug": "~2.7"
},
"autoload": {