geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  bumped version to 1.34.1-DEV
  prepared the 1.34.0 release
  [Doc] Fixed documentation about 'Definition vs Runtime'
This commit is contained in:
Fabien Potencier
2017-06-05 10:18:54 -07:00
parent d85c17e0dc 1cb696c6ea
commit e3eaa1737e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+6 -1
View File
@@ -1,5 +1,6 @@
* 2.4.0 (2017-XX-XX)
* dropped HHVM support
* added namespaced aliases for all (non-deprecated) classes and interfaces
* marked Twig_Filter, Twig_Function, Twig_Test, Twig_Node_Module and Twig_Profiler_Profile as final via the @final annotation
@@ -52,7 +53,11 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x
* 1.34.0 (2017-XX-XX)
* 1.34.1 (2017-XX-XX)
* n/a
* 1.34.0 (2017-06-05)
* added namespaced aliases for all (non-deprecated) classes and interfaces
* dropped HHVM support
doc/advanced.rst
+1 -1
View File
@@ -793,7 +793,7 @@ classes must be autoload-able)::
It is now possible to move the runtime logic to a new
``Project_Twig_RuntimeExtension`` class and use it directly in the extension::
class Project_Twig_RuntimeExtension extends Twig_Extension
class Project_Twig_RuntimeExtension
{
private $rot13Provider;