From 024fdf9c1aa535a4772d25772684ddfe6c582be7 Mon Sep 17 00:00:00 2001 From: Franck Date: Fri, 7 Oct 2022 16:04:39 +0200 Subject: [PATCH 1/5] call static instead of self on protected method --- src/PhpWord/Shared/Html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php index ad5aec1181..96caff7610 100644 --- a/src/PhpWord/Shared/Html.php +++ b/src/PhpWord/Shared/Html.php @@ -61,7 +61,7 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit * @todo parse $stylesheet for default styles. Should result in an array based on id, class and element, * which could be applied when such an element occurs in the parseNode function. */ - self::$options = $options; + static::$options = $options; // Preprocess: remove all line ends, decode HTML entity, // fix ampersand and angle brackets and add body tag for HTML fragments @@ -82,10 +82,10 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit $dom = new DOMDocument(); $dom->preserveWhiteSpace = $preserveWhiteSpace; $dom->loadXML($html); - self::$xpath = new DOMXPath($dom); + static::$xpath = new DOMXPath($dom); $node = $dom->getElementsByTagName('body'); - self::parseNode($node->item(0), $element); + static::parseNode($node->item(0), $element); if (\PHP_VERSION_ID < 80000) { libxml_disable_entity_loader($orignalLibEntityLoader); } From 9ed82d1f5a8eff662d942d19c3686fc39f8ece7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franck=20Bou=C3=A9?= Date: Fri, 18 Nov 2022 13:31:04 +0100 Subject: [PATCH 2/5] delete blank lines --- src/PhpWord/Shared/Html.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php index 96caff7610..c21048ba73 100644 --- a/src/PhpWord/Shared/Html.php +++ b/src/PhpWord/Shared/Html.php @@ -536,11 +536,9 @@ protected static function parseList($node, $element, &$styles, &$data) switch ($attribute->name) { case 'start': $start = (int) $attribute->value; - break; case 'type': $type = $attribute->value; - break; } } From ecd2fcbda8a4747660c10d9ab7f5a25efcdf34ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franck=20Bou=C3=A9?= Date: Fri, 18 Nov 2022 13:34:21 +0100 Subject: [PATCH 3/5] add blank lines --- src/PhpWord/Shared/Html.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php index c21048ba73..99e5400205 100644 --- a/src/PhpWord/Shared/Html.php +++ b/src/PhpWord/Shared/Html.php @@ -536,9 +536,11 @@ protected static function parseList($node, $element, &$styles, &$data) switch ($attribute->name) { case 'start': $start = (int) $attribute->value; + break; case 'type': $type = $attribute->value; + break; } } From a075740e32d60867e1c0bdc503cb48f8172c3489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franck=20Bou=C3=A9?= Date: Fri, 18 Nov 2022 13:38:18 +0100 Subject: [PATCH 4/5] remove espaces --- src/PhpWord/Shared/Html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php index 99e5400205..fefd62b614 100644 --- a/src/PhpWord/Shared/Html.php +++ b/src/PhpWord/Shared/Html.php @@ -536,11 +536,11 @@ protected static function parseList($node, $element, &$styles, &$data) switch ($attribute->name) { case 'start': $start = (int) $attribute->value; - +- break; case 'type': $type = $attribute->value; - +- break; } } From 9afd53d6223b576258821af937310c9103998981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franck=20Bou=C3=A9?= Date: Fri, 18 Nov 2022 13:44:35 +0100 Subject: [PATCH 5/5] remove - --- src/PhpWord/Shared/Html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php index fefd62b614..96caff7610 100644 --- a/src/PhpWord/Shared/Html.php +++ b/src/PhpWord/Shared/Html.php @@ -536,11 +536,11 @@ protected static function parseList($node, $element, &$styles, &$data) switch ($attribute->name) { case 'start': $start = (int) $attribute->value; -- + break; case 'type': $type = $attribute->value; -- + break; } }