Skip to content

Call static instead of self on protected method #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 23, 2022
Merged

Call static instead of self on protected method #2308

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
024fdf9
call static instead of self on protected method
Oct 7, 2022
9ed82d1
delete blank lines
fbclol Nov 18, 2022
ecd2fcb
add blank lines
fbclol Nov 18, 2022
a075740
remove espaces
fbclol Nov 18, 2022
9afd53d
remove -
fbclol Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/PhpWord/Shared/Html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
}
Expand Down