From 08d2037f264e45113896fee52f31d688fe4fd57c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 9 Feb 2023 07:45:16 +0100 Subject: [PATCH] Bump version to 3.6 --- CHANGELOG | 2 +- composer.json | 5 ----- extra/cache-extra/composer.json | 5 ----- extra/cssinliner-extra/composer.json | 5 ----- extra/html-extra/composer.json | 5 ----- extra/inky-extra/composer.json | 5 ----- extra/intl-extra/composer.json | 5 ----- extra/markdown-extra/composer.json | 5 ----- extra/string-extra/composer.json | 5 ----- extra/twig-extra-bundle/composer.json | 5 ----- src/Environment.php | 8 ++++---- 11 files changed, 5 insertions(+), 50 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 568087f46..2b71ee32c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -# 3.5.2 (2023-XX-XX) +# 3.6.0 (2023-XX-XX) * n/a diff --git a/composer.json b/composer.json index 18d3135bb..5e9999ae3 100644 --- a/composer.json +++ b/composer.json @@ -41,10 +41,5 @@ "psr-4" : { "Twig\\Tests\\" : "tests/" } - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/cache-extra/composer.json b/extra/cache-extra/composer.json index 05d75afd5..ec116d7d4 100644 --- a/extra/cache-extra/composer.json +++ b/extra/cache-extra/composer.json @@ -27,10 +27,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/cssinliner-extra/composer.json b/extra/cssinliner-extra/composer.json index 1866f417e..a6799ed0d 100644 --- a/extra/cssinliner-extra/composer.json +++ b/extra/cssinliner-extra/composer.json @@ -27,10 +27,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/html-extra/composer.json b/extra/html-extra/composer.json index e5a545cf0..44f5a9faa 100644 --- a/extra/html-extra/composer.json +++ b/extra/html-extra/composer.json @@ -27,10 +27,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/inky-extra/composer.json b/extra/inky-extra/composer.json index 0a813c7bf..17e1be92c 100644 --- a/extra/inky-extra/composer.json +++ b/extra/inky-extra/composer.json @@ -27,10 +27,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/intl-extra/composer.json b/extra/intl-extra/composer.json index 24f3f0577..d357ad725 100644 --- a/extra/intl-extra/composer.json +++ b/extra/intl-extra/composer.json @@ -27,10 +27,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/markdown-extra/composer.json b/extra/markdown-extra/composer.json index f26143525..20389ff9b 100644 --- a/extra/markdown-extra/composer.json +++ b/extra/markdown-extra/composer.json @@ -30,10 +30,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/string-extra/composer.json b/extra/string-extra/composer.json index 2b4a6950e..ed5d3ffa2 100644 --- a/extra/string-extra/composer.json +++ b/extra/string-extra/composer.json @@ -28,10 +28,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/extra/twig-extra-bundle/composer.json b/extra/twig-extra-bundle/composer.json index 3e1837044..b7f739bdf 100644 --- a/extra/twig-extra-bundle/composer.json +++ b/extra/twig-extra-bundle/composer.json @@ -36,10 +36,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } diff --git a/src/Environment.php b/src/Environment.php index 5f91d6322..39b7cec2f 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -40,11 +40,11 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - public const VERSION = '3.5.2-DEV'; - public const VERSION_ID = 30502; + public const VERSION = '3.6.0-DEV'; + public const VERSION_ID = 30600; public const MAJOR_VERSION = 3; - public const MINOR_VERSION = 5; - public const RELEASE_VERSION = 2; + public const MINOR_VERSION = 3; + public const RELEASE_VERSION = 0; public const EXTRA_VERSION = 'DEV'; private $charset;