From a6ec023c09983af2486c2b4c02a77a8d36ff9e05 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 24 Apr 2019 15:19:52 +0200 Subject: [PATCH] bumped version to 1.40 --- CHANGELOG | 2 +- composer.json | 2 +- ext/twig/php_twig.h | 2 +- src/Environment.php | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 37a7bbadd..5471e2943 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 1.39.2 (2019-XX-XX) +* 1.40.0 (2019-XX-XX) * allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning) * added support for "Twig\Markup" instances in the "in" test diff --git a/composer.json b/composer.json index 84a08a71f..452692c24 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.39-dev" + "dev-master": "1.40-dev" } } } diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index f7638e944..5a1ee5342 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.39.2-DEV" +#define PHP_TWIG_VERSION "1.40.0-DEV" #include "php.h" diff --git a/src/Environment.php b/src/Environment.php index 9e3fdf382..898cde04f 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -41,11 +41,11 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '1.39.2-DEV'; - const VERSION_ID = 13902; + const VERSION = '1.40.0-DEV'; + const VERSION_ID = 14000; const MAJOR_VERSION = 1; - const MINOR_VERSION = 39; - const RELEASE_VERSION = 2; + const MINOR_VERSION = 40; + const RELEASE_VERSION = 0; const EXTRA_VERSION = 'DEV'; protected $charset;