From 2d312b605aa82cd32fb8c57bc062ad6996ede276 Mon Sep 17 00:00:00 2001
From: David Prevot <dprevot+git@evolix.fr>
Date: Tue, 13 Feb 2024 10:00:14 +0100
Subject: [PATCH 1/2] Force system dependencies loading

---
 htdocs/lib/MailNotify.php     | 8 ++++----
 htdocs/lib/PageController.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/lib/MailNotify.php b/htdocs/lib/MailNotify.php
index 7793704..22984ad 100644
--- a/htdocs/lib/MailNotify.php
+++ b/htdocs/lib/MailNotify.php
@@ -1,9 +1,9 @@
 <?php
 
-if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
-    require_once 'Twig/autoload.php';
-} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
-    require_once 'Twig/Autoloader.php';
+if (file_exists(stream_resolve_include_path('/usr/share/php/Twig/autoload.php'))) {
+    require_once '/usr/share/php/Twig/autoload.php';
+} elseif (stream_resolve_include_path(file_exists('/usr/share/php/Twig/Autoloader.php'))) {
+    require_once '/usr/share/php/Twig/Autoloader.php';
     Twig_Autoloader::register();
 }
 
diff --git a/htdocs/lib/PageController.php b/htdocs/lib/PageController.php
index 9f967c9..73eea61 100644
--- a/htdocs/lib/PageController.php
+++ b/htdocs/lib/PageController.php
@@ -1,9 +1,9 @@
 <?php
 
-if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
-    require_once 'Twig/autoload.php';
-} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
-    require_once 'Twig/Autoloader.php';
+if (file_exists(stream_resolve_include_path('/usr/share/php/Twig/autoload.php'))) {
+    require_once '/usr/share/php/Twig/autoload.php';
+} elseif (stream_resolve_include_path(file_exists('/usr/share/php/Twig/Autoloader.php'))) {
+    require_once '/usr/share/php/Twig/Autoloader.php';
     Twig_Autoloader::register();
 }
 

From 0257f25e926bfb2135b500a799a3bff5c16b995d Mon Sep 17 00:00:00 2001
From: David Prevot <dprevot+git@evolix.fr>
Date: Tue, 13 Feb 2024 10:09:16 +0100
Subject: [PATCH 2/2] php-twig is psr-4 only since Bullseye

---
 htdocs/lib/MailNotify.php     | 11 +++--------
 htdocs/lib/PageController.php | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/htdocs/lib/MailNotify.php b/htdocs/lib/MailNotify.php
index 22984ad..d7d4579 100644
--- a/htdocs/lib/MailNotify.php
+++ b/htdocs/lib/MailNotify.php
@@ -1,18 +1,13 @@
 <?php
 
-if (file_exists(stream_resolve_include_path('/usr/share/php/Twig/autoload.php'))) {
-    require_once '/usr/share/php/Twig/autoload.php';
-} elseif (stream_resolve_include_path(file_exists('/usr/share/php/Twig/Autoloader.php'))) {
-    require_once '/usr/share/php/Twig/Autoloader.php';
-    Twig_Autoloader::register();
-}
+require_once '/usr/share/php/Twig/autoload.php';
 
 class MailNotify {
     private static $twig, $adminmail;
 
     public static function init() {
-        $loader = new Twig_Loader_Filesystem('tpl/mail');
-        self::$twig = new Twig_Environment($loader, array(
+        $loader = new Twig\Loader\FilesystemLoader('tpl/mail');
+        self::$twig = new Twig\Environment($loader, array(
             'cache' => false
         ));
 
diff --git a/htdocs/lib/PageController.php b/htdocs/lib/PageController.php
index 73eea61..8b1bac9 100644
--- a/htdocs/lib/PageController.php
+++ b/htdocs/lib/PageController.php
@@ -1,11 +1,6 @@
 <?php
 
-if (file_exists(stream_resolve_include_path('/usr/share/php/Twig/autoload.php'))) {
-    require_once '/usr/share/php/Twig/autoload.php';
-} elseif (stream_resolve_include_path(file_exists('/usr/share/php/Twig/Autoloader.php'))) {
-    require_once '/usr/share/php/Twig/Autoloader.php';
-    Twig_Autoloader::register();
-}
+require_once '/usr/share/php/Twig/autoload.php';
 
 class PageController {
     public static $alerts=array();
@@ -14,8 +9,8 @@ class PageController {
     public static function init(LdapServer $server=NULL) {
         self::$server = $server;
 
-        $loader = new Twig_Loader_Filesystem('tpl/page');
-        self::$twig = new Twig_Environment($loader, array(
+        $loader = new Twig\Loader\FilesystemLoader('tpl/page');
+        self::$twig = new Twig\Environment($loader, array(
             'cache' => false
         ));