From 3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 25 Oct 2016 12:17:17 -0700 Subject: [PATCH 1/4] prepared the 1.27.0 release --- CHANGELOG | 2 +- ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d027ad590..c236a7769 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 1.27.0 (2016-XX-XX) +* 1.27.0 (2016-10-25) * deprecated Twig_Parser::getEnvironment() * deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor() diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index f1be50962..c5a3203ad 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.27.0-DEV" +#define PHP_TWIG_VERSION "1.27.0" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 8e76764d0..9f579ff9e 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,7 +16,7 @@ */ class Twig_Environment { - const VERSION = '1.27.0-DEV'; + const VERSION = '1.27.0'; protected $charset; protected $loader; From 3ff5abf75bf2fb9b9bffcc15c4384e08d0763c7f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 25 Oct 2016 12:28:14 -0700 Subject: [PATCH 2/4] bumped version to 1.27.1-DEV --- CHANGELOG | 4 ++++ ext/twig/php_twig.h | 2 +- lib/Twig/Environment.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c236a7769..7922320ff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.27.1 (2016-XX-XX) + + * n/a + * 1.27.0 (2016-10-25) * deprecated Twig_Parser::getEnvironment() diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index c5a3203ad..b615e54aa 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.27.0" +#define PHP_TWIG_VERSION "1.27.1-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 9f579ff9e..e7b5dc45b 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,7 +16,7 @@ */ class Twig_Environment { - const VERSION = '1.27.0'; + const VERSION = '1.27.1-DEV'; protected $charset; protected $loader; From 0a3d3c7ce169fa0d6f8cd33079eded3134843465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Wer=C5=82os?= Date: Fri, 28 Oct 2016 15:23:58 +0200 Subject: [PATCH 3/4] Fixing wrong function name in deprecation notice --- lib/Twig/Node.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Twig/Node.php b/lib/Twig/Node.php index 60a80f3c3..f9fe958f0 100644 --- a/lib/Twig/Node.php +++ b/lib/Twig/Node.php @@ -128,7 +128,7 @@ class Twig_Node implements Twig_NodeInterface */ public function getLine() { - @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', E_USER_DEPRECATED); + @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateLine() instead.', E_USER_DEPRECATED); return $this->lineno; } From bf07db4f1305bab3a779e0875540f4fe8e5cdc84 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 7 Nov 2016 19:49:36 +0100 Subject: [PATCH 4/4] add machine-readable version constants --- lib/Twig/Environment.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index e7b5dc45b..29d66c82a 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -17,6 +17,11 @@ class Twig_Environment { const VERSION = '1.27.1-DEV'; + const VERSION_ID = 12701; + const MAJOR_VERSION = 1; + const MINOR_VERSION = 27; + const RELEASE_VERSION = 1; + const EXTRA_VERSION = 'DEV'; protected $charset; protected $loader;