From c0b5eb9f03c7f221cee62eb5ebafb29c7bc5400e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Fri, 2 Jun 2017 16:26:53 +0200 Subject: [PATCH 1/3] [Doc] Fixed documentation about 'Definition vs Runtime' --- doc/advanced.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/advanced.rst b/doc/advanced.rst index 88a78fefa..d86db501e 100644 --- a/doc/advanced.rst +++ b/doc/advanced.rst @@ -838,7 +838,7 @@ instance on the environment that knows how to instantiate such runtime classes 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; From b38636760c4c96b75c8d6c7ee2690485317ab4fa Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 5 Jun 2017 10:16:52 -0700 Subject: [PATCH 2/3] prepared the 1.34.0 release --- CHANGELOG | 2 +- ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 10fdbeb5c..64d1d87e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 1.34.0 (2017-XX-XX) +* 1.34.0 (2017-06-05) * added namespaced aliases for all (non-deprecated) classes and interfaces * dropped HHVM support diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index f60ba470c..07c081627 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -15,7 +15,7 @@ #ifndef PHP_TWIG_H #define PHP_TWIG_H -#define PHP_TWIG_VERSION "1.34.0-DEV" +#define PHP_TWIG_VERSION "1.34.0" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index c801a0f64..ac5ada062 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,12 +16,12 @@ */ class Twig_Environment { - const VERSION = '1.34.0-DEV'; + const VERSION = '1.34.0'; const VERSION_ID = 13400; const MAJOR_VERSION = 1; const MINOR_VERSION = 34; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; protected $charset; protected $loader; From 1cb696c6eac893325c58c4d21eae4078fea7eea1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 5 Jun 2017 10:17:28 -0700 Subject: [PATCH 3/3] bumped version to 1.34.1-DEV --- CHANGELOG | 4 ++++ ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 64d1d87e7..8a878074b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.34.1 (2017-XX-XX) + + * n/a + * 1.34.0 (2017-06-05) * added namespaced aliases for all (non-deprecated) classes and interfaces diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index 07c081627..fa3ca679e 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -15,7 +15,7 @@ #ifndef PHP_TWIG_H #define PHP_TWIG_H -#define PHP_TWIG_VERSION "1.34.0" +#define PHP_TWIG_VERSION "1.34.1-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index ac5ada062..ae5d27595 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,12 +16,12 @@ */ class Twig_Environment { - const VERSION = '1.34.0'; - const VERSION_ID = 13400; + const VERSION = '1.34.1'; + const VERSION_ID = 13401; const MAJOR_VERSION = 1; const MINOR_VERSION = 34; - const RELEASE_VERSION = 0; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = 1; + const EXTRA_VERSION = 'DEV'; protected $charset; protected $loader;