From e7631fe8f07279279794045166efc18252831b1f Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Thu, 7 Nov 2024 22:17:45 +0000
Subject: [PATCH] Issue #3485956 by mradcliffe, jan kellermann, gillesbailleux,
 raphaelbertrand, cilefen, larowlan: Recursion limit exceeded with Twig
 v3.14.1 when editing a node or a block

---
 composer.lock                                    | 16 ++++++++--------
 .../Metapackage/CoreRecommended/composer.json    |  2 +-
 core/composer.json                               |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index fa47c638ccf..4e4c9fe10b3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -496,7 +496,7 @@
             "dist": {
                 "type": "path",
                 "url": "core",
-                "reference": "b70cc9a18bf7dd3f2dcbbf752473b0129bb4e655"
+                "reference": "922a52c9884742a2d4e9e31508543154951993d6"
             },
             "require": {
                 "asm89/stack-cors": "^2.1",
@@ -543,7 +543,7 @@
                 "symfony/serializer": "^7.1",
                 "symfony/validator": "^7.1",
                 "symfony/yaml": "^7.1",
-                "twig/twig": "^3.14.0"
+                "twig/twig": "^3.14.2"
             },
             "conflict": {
                 "drush/drush": "<12.4.3"
@@ -4265,16 +4265,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.14.0",
+            "version": "v3.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72"
+                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72",
-                "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
+                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
                 "shasum": ""
             },
             "require": {
@@ -4328,7 +4328,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.14.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.14.2"
             },
             "funding": [
                 {
@@ -4340,7 +4340,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T17:55:12+00:00"
+            "time": "2024-11-07T12:36:22+00:00"
         }
     ],
     "packages-dev": [
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index 3d5560d6826..c854d8a8403 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -60,6 +60,6 @@
         "symfony/var-dumper": "~v7.1.3",
         "symfony/var-exporter": "~v7.1.2",
         "symfony/yaml": "~v7.1.1",
-        "twig/twig": "~v3.14.0"
+        "twig/twig": "~v3.14.2"
     }
 }
diff --git a/core/composer.json b/core/composer.json
index c306917feb7..1d9586fce32 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -34,7 +34,7 @@
         "symfony/process": "^7.1",
         "symfony/polyfill-iconv": "^1.26",
         "symfony/yaml": "^7.1",
-        "twig/twig": "^3.14.0",
+        "twig/twig": "^3.14.2",
         "doctrine/annotations": "^2.0",
         "doctrine/lexer": "^2.0",
         "guzzlehttp/guzzle": "^7.5",