From 7dfd511a1d8f6242da15afa25c6add7a08b0f8b0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Nov 2025 11:54:56 +0100
Subject: [PATCH] add league/commonmark and twig/twig

---
 composer-dist.json | 36 +++++++++++++++++++-----------------
 composer.json      |  6 ++++--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/composer-dist.json b/composer-dist.json
index 43c57b780..cc71eb34d 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -56,7 +56,7 @@
         "dragonmantank/cron-expression": "^3.1",
         "alecrabbit/php-console-colour": "*",
         "zf1/zend-search-lucene": "*",
-        "symfony/http-foundation": "^5.4",
+        "symfony/http-foundation": "^7",
         "php-di/php-di": "^7",
         "hfig/mapi": "*",
         "slim/psr7": "^1.7",
@@ -69,25 +69,13 @@
         "seeddms/http_webdav_server": "dev-master",
         "wikimedia/composer-merge-plugin": "dev-master",
         "cache/memcached-adapter": "^1.2",
-        "symfony/console": "^7.2"
+        "symfony/console": "^7.2",
+        "twig/twig": "^3.0",
+        "league/commonmark": "^2.7"
     },
     "require-dev": {
         "composer/composer": "dev-main"
     },
-    "extra": {
-        "merge-plugin": {
-            "include": [
-                "composer.local.json"
-            ],
-            "recurse": false,
-            "replace": true,
-            "ignore-duplicates": true,
-            "merge-dev": true,
-            "merge-extra": false,
-            "merge-extra-deep": false,
-            "merge-scripts": true
-        }
-    },
     "repositories": [
         {
             "type": "path",
@@ -124,5 +112,19 @@
                 "symlink": false
             }
         }
-    ]
+    ],
+    "extra": {
+        "merge-plugin": {
+            "include": [
+                "composer.local.json"
+            ],
+            "recurse": false,
+            "replace": true,
+            "ignore-duplicates": true,
+            "merge-dev": true,
+            "merge-extra": false,
+            "merge-extra-deep": false,
+            "merge-scripts": true
+        }
+    }
 }
diff --git a/composer.json b/composer.json
index 91a5712e9..3e26f1ff2 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,7 @@
         "dragonmantank/cron-expression": "^3.1",
         "alecrabbit/php-console-colour": "*",
         "zf1/zend-search-lucene": "*",
-        "symfony/http-foundation": "^5.4",
+        "symfony/http-foundation": "^7",
         "php-di/php-di": "^7",
         "hfig/mapi": "*",
         "slim/psr7": "^1.7",
@@ -72,7 +72,9 @@
         "seeddms/http_webdav_server": "dev-master",
         "wikimedia/composer-merge-plugin": "dev-master",
         "cache/memcached-adapter": "^1.2",
-        "symfony/console": "^7.2"
+        "symfony/console": "^7.2",
+        "twig/twig": "^3.0",
+        "league/commonmark": "^2.7"
     },
     "require-dev": {
         "composer/composer": "dev-main",