From e14c046a17de23bc6345416248552a5e8ee4b8ab Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Sun, 19 Dec 2021 12:22:14 +0100
Subject: [PATCH] MDL-73405 libraries: php80 compatibility fix to Horde Imap
 Client

The fix is already available upstream for versions 2.30.4 and up
See https://github.com/horde/Imap_Client/pull/13
---
 .../Horde/Imap/Client/Exception/ServerResponse.php          | 6 +++---
 lib/horde/readme_moodle.txt                                 | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/horde/framework/Horde/Imap/Client/Exception/ServerResponse.php b/lib/horde/framework/Horde/Imap/Client/Exception/ServerResponse.php
index e4646ef523d..6c83276b22b 100644
--- a/lib/horde/framework/Horde/Imap/Client/Exception/ServerResponse.php
+++ b/lib/horde/framework/Horde/Imap/Client/Exception/ServerResponse.php
@@ -44,14 +44,14 @@ class Horde_Imap_Client_Exception_ServerResponse extends Horde_Imap_Client_Excep
     /**
      * Constructor.
      *
-     * @param string $msg                                       Error message.
+     * @param string|null $msg                                  Error message.
      * @param integer $code                                     Error code.
      * @param Horde_Imap_Client_Interaction_Server $server      Server ob.
      * @param Horde_Imap_Client_Interaction_Pipeline $pipeline  Pipeline ob.
      */
     public function __construct(
-        $msg = null,
-        $code = 0,
+        $msg,
+        $code,
         Horde_Imap_Client_Interaction_Server $server,
         Horde_Imap_Client_Interaction_Pipeline $pipeline
     )
diff --git a/lib/horde/readme_moodle.txt b/lib/horde/readme_moodle.txt
index d4bcaa61718..df47b9f2377 100644
--- a/lib/horde/readme_moodle.txt
+++ b/lib/horde/readme_moodle.txt
@@ -36,3 +36,8 @@ do
     cp -Rf $locale/* $target/locale
   fi
 done
+
+Local modifications:
+- lib/Horde/Imap/Client/Exception/ServerResponse.php has been minimally modified for php80 compatibility
+  The fix applied is already upstream, see https://github.com/horde/Imap_Client/pull/13 and it's available
+  in Imap_Client 2.30.4 and up. See MDL-73405 for more details.