fix(HTMLPurifier): php 7.4 compatibility

update HTMLPurifier to dev-master: ezyang/htmlpurifier@d158902 execute composer: composer require ezyang/htmlpurifier dev-master TODO - switch back to stable branch later, when they have a release with the php 7.4 fixes Change-Id: Iac2576c603fd5459b2f900926780afbb4b92bc7a Reviewed-on: http://gerrit.tine20.com/customers/15183 Reviewed-by: Philipp Schüle <p.schuele@metaways.de> Tested-by: Philipp Schüle <p.schuele@metaways.de>
tine20 · Jan 7, 2020 · 514e86d · 514e86d
1 parent a8eba11
commit 514e86d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/tests/tine20/Felamimail/Controller/MessageTest.php b/tests/tine20/Felamimail/Controller/MessageTest.php
@@ -1401,7 +1401,7 @@ public function testHtmlPurify()
 
 //     <p>text</p>', $message->body);
         $this->assertContains('<div></div>
-    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="w38GIAXDIBKE0DHxgljNBAAO 9TXL0Y4OHwAAAAB" />
+    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="w38GIAXDIBKE0DHxgljNBAAO 9TXL0Y4OHwAAAABJRU5ErkJggg==" />
     
     <p>text</p>', $message->body);
     }

diff --git a/tine20/composer.json b/tine20/composer.json
@@ -75,7 +75,7 @@
     "ext-zip": "*",
     "doctrine/dbal": "v2.5.13pl4 as v2.5.13",
     "doctrine/orm": "2.5.14pl1 as v2.5.14",
-    "ezyang/htmlpurifier": "v4.6.0",
+    "ezyang/htmlpurifier": "dev-master",
     "giggsey/libphonenumber-for-php": "^8.10",
     "metaways/opendocument": "1.1",
     "metaways/timezoneconvert": "1.*",

diff --git a/tine20/composer.lock b/tine20/composer.lock