CRM-21395 port https://github.com/dompdf/dompdf/pull/1570/files using patch files...

diff --git a/tools/scripts/composer/dompdf-cleanup.sh b/tools/scripts/composer/dompdf-cleanup.sh
index 9ee2e377e22a8201b94c10bbd8485a72ce38d56d..26345390dec8ed300c5953038df73bdcefa031af 100755 (executable)
--- a/tools/scripts/composer/dompdf-cleanup.sh
+++ b/tools/scripts/composer/dompdf-cleanup.sh
@@ -129,3 +129,5 @@ make_font_readme > vendor/dompdf/dompdf/lib/fonts/README.DejaVuFonts.txt
 
 # Remove debug_print_backtrace(), which can leak system details. Put backtrace in log.
 simple_replace vendor/dompdf/dompdf/lib/html5lib/TreeBuilder.php 'debug_print_backtrace();' 'CRM_Core_Error::backtrace("backTrace", TRUE);'
+
+patch vendor/dompdf/dompdf/src/Dompdf.php < tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch

diff --git a/tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch b/tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch
new file mode 100644 (file)
index 0000000..ead3df6
--- /dev/null
+++ b/tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch
@@ -0,0 +1,33 @@
+From 226061647fc7e30f99855c8b481a88f5d78f455b Mon Sep 17 00:00:00 2001
+From: Ed Preston <epreston@prestonsoft.com>
+Date: Mon, 9 Oct 2017 20:29:46 +1100
+Subject: [PATCH] Fix: Uncaught Dompdf\Exception: No block-level parent found.
+ Not good
+
+Fatal error: Uncaught Dompdf\Exception: No block-level parent found.
+Not good
+---
+ src/Dompdf.php | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/Dompdf.php b/src/Dompdf.php
+index 40329063..bfb1c2b1 100644
+--- a/src/Dompdf.php
++++ b/src/Dompdf.php
+@@ -490,6 +490,16 @@ public function loadHtml($str, $encoding = 'UTF-8')
+             $doc->loadHTML($str);
+             $doc->encoding = $encoding;
+ 
++            // Remove #text children nodes in nodes that shouldn't have
++            $tag_names = array("html", "table", "tbody", "thead", "tfoot", "tr");
++            foreach ($tag_names as $tag_name) {
++                $nodes = $doc->getElementsByTagName($tag_name);
++
++                foreach ($nodes as $node) {
++                    self::removeTextNodes($node);
++                }
++            }
++
+             // If some text is before the doctype, we are in quirksmode
+             if (preg_match("/^(.+)<!doctype/i", ltrim($str), $matches)) {
+                 $quirksmode = true;