Fix html2text for PHP 8; closes #1601

diff --git a/galette/composer.json b/galette/composer.json
index 2bc9f911f1a7aa2eb75a1e89376b5d676a5e8dc1..7cc648eafaf293d9801119e0e47e63dd3b0bfaed 100644 (file)
--- a/galette/composer.json
+++ b/galette/composer.json
@@ -68,7 +68,8 @@
             "patch -d vendor/smarty/smarty/ -p3 < ../patches/smarty-php81.patch",
             "patch -d vendor/mathmarques/smarty-view/ -p3 < ../patches/smarty-view-php81.patch",
             "patch -d vendor/laminas/ -p2 < ../patches/laminas-php81.patch",
-            "patch -d vendor/tecnickcom/tcpdf/ -p3 < ../patches/tcpdf-php81.patch"
+            "patch -d vendor/tecnickcom/tcpdf/ -p3 < ../patches/tcpdf-php81.patch",
+            "patch -d vendor/soundasleep/html2text/ -p3 < ../patches/html2text-php80.patch"
         ]
     }
 }

diff --git a/patches/html2text-php80.patch b/patches/html2text-php80.patch
new file mode 100644 (file)
index 0000000..64bb1ae
--- /dev/null
+++ b/patches/html2text-php80.patch
@@ -0,0 +1,12 @@
+diff -up vendor/soundasleep/html2text/src/Html2Text.php.patch vendor/soundasleep/html2text/src/Html2Text.php
+--- vendor/soundasleep/html2text/src/Html2Text.php.patch       2021-12-07 08:29:17.500834976 +0100
++++ vendor/soundasleep/html2text/src/Html2Text.php     2021-12-07 08:29:29.577097261 +0100
+@@ -228,7 +228,7 @@ class Html2Text {
+               return $nextName;
+       }
+ 
+-      static function iterateOverNode($node, $prevName = null, $in_pre = false, $is_office_document = false, $options) {
++      static function iterateOverNode($node, $prevName = null, $in_pre = false, $is_office_document = false, $options = []) {
+               if ($node instanceof \DOMText) {
+                 // Replace whitespace characters with a space (equivilant to \s)
+                       if ($in_pre) {