From 126b2c97818dbff0cdf3fbfc881aedb3d40aae72 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 9 Sep 2024 19:55:12 +0200
Subject: [PATCH] Prepare the 3.14.0 release

---
 CHANGELOG           | 3 ++-
 src/Environment.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8d16b9428..44c79b133 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-# 3.14.0 (2024-XX-XX)
+# 3.14.0 (2024-09-09)
 
+ * Fix a security issue when an included sandboxed template has been loaded before without the sandbox context
  * Add the possibility to reset globals via `Environment::resetGlobals()`
  * Deprecate `Environment::mergeGlobals()`
 
diff --git a/src/Environment.php b/src/Environment.php
index fb5342b62..24e55e979 100644
--- a/src/Environment.php
+++ b/src/Environment.php
@@ -43,12 +43,12 @@ use Twig\TokenParser\TokenParserInterface;
  */
 class Environment
 {
-    public const VERSION = '3.14.0-DEV';
+    public const VERSION = '3.14.0';
     public const VERSION_ID = 31400;
     public const MAJOR_VERSION = 3;
     public const MINOR_VERSION = 14;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     private $charset;
     private $loader;