From 6ba5881793a27c14da987c689f7bf9d05e808ee4 Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Thu, 14 Nov 2024 18:24:09 -0800
Subject: [PATCH 1/2] Prep 4.14

[ci skip]
---
 .github/workflows/ci.yml | 1 +
 CHANGELOG-WIP.md         | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 CHANGELOG-WIP.md

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71f52a66b0a..6fdf310603b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 4.x
+      - '4.14'
   pull_request:
 permissions:
   contents: read
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
new file mode 100644
index 00000000000..84efb7f715a
--- /dev/null
+++ b/CHANGELOG-WIP.md
@@ -0,0 +1 @@
+# Release notes for Craft CMS 4.14 (WIP)

From 29cce1b560a87e295643971e19953d43b25a5a67 Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Fri, 22 Nov 2024 06:12:51 -0800
Subject: [PATCH 2/2] Twig 3.15

---
 CHANGELOG-WIP.md           |  3 +++
 composer.json              |  2 +-
 composer.lock              | 14 +++++++-------
 src/web/twig/Extension.php |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
index 84efb7f715a..3b18b61437c 100644
--- a/CHANGELOG-WIP.md
+++ b/CHANGELOG-WIP.md
@@ -1 +1,4 @@
 # Release notes for Craft CMS 4.14 (WIP)
+
+## System
+- Updated Twig to 3.15.
diff --git a/composer.json b/composer.json
index 1bccd38a067..4c12537464a 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
     "symfony/var-dumper": "^5.0|^6.0",
     "symfony/yaml": "^5.2.3",
     "theiconic/name-parser": "^1.2",
-    "twig/twig": "~3.14.0",
+    "twig/twig": "~3.15.0",
     "voku/stringy": "^6.4.0",
     "webonyx/graphql-php": "~14.11.5",
     "yiisoft/yii2": "~2.0.51.0",
diff --git a/composer.lock b/composer.lock
index 6d819a5cefa..9cf60ebb392 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "57bf9fc56114c7fa8dccb28d10127e97",
+    "content-hash": "b3194ba327d9c4d752ee34859ba4ea02",
     "packages": [
         {
             "name": "cebe/markdown",
@@ -5322,16 +5322,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.14.2",
+            "version": "v3.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a"
+                "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
-                "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/2d5b3964cc21d0188633d7ddce732dc8e874db02",
+                "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02",
                 "shasum": ""
             },
             "require": {
@@ -5385,7 +5385,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.14.2"
+                "source": "https://github.com/twigphp/Twig/tree/v3.15.0"
             },
             "funding": [
                 {
@@ -5397,7 +5397,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-07T12:36:22+00:00"
+            "time": "2024-11-17T15:59:19+00:00"
         },
         {
             "name": "voku/anti-xss",
diff --git a/src/web/twig/Extension.php b/src/web/twig/Extension.php
index 10388a51a95..8b6d3a45c73 100644
--- a/src/web/twig/Extension.php
+++ b/src/web/twig/Extension.php
@@ -353,6 +353,7 @@ public function getTests(): array
     /**
      * @inheritdoc
      */
+    /** @phpstan-ignore-next-line */
     public function getOperators(): array
     {
         return [