Skip to content
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

Change private to protected to be able extending class Html #1646

Merged
merged 2 commits into from
Aug 8, 2019
Merged

Change private to protected to be able extending class Html #1646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e93d5e
Update Html.php
SpinyMan Jul 3, 2019
415bdb3
Update Html.php
SpinyMan Jul 3, 2019
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
48 changes: 24 additions & 24 deletions src/PhpWord/Shared/Html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
*/
class Html
{
private static $listIndex = 0;
private static $xpath;
private static $options;
protected static $listIndex = 0;
protected static $xpath;
protected static $options;

/**
* Add HTML parts.
Expand Down Expand Up @@ -203,7 +203,7 @@ protected static function parseNode($node, $element, $styles = array(), $data =
* @param array $styles
* @param array $data
*/
private static function parseChildNodes($node, $element, $styles, $data)
protected static function parseChildNodes($node, $element, $styles, $data)
{
if ('li' != $node->nodeName) {
$cNodes = $node->childNodes;
Expand All @@ -225,7 +225,7 @@ private static function parseChildNodes($node, $element, $styles, $data)
* @param array &$styles
* @return \PhpOffice\PhpWord\Element\TextRun
*/
private static function parseParagraph($node, $element, &$styles)
protected static function parseParagraph($node, $element, &$styles)
{
$styles['paragraph'] = self::recursiveParseStylesInHierarchy($node, $styles['paragraph']);
$newElement = $element->addTextRun($styles['paragraph']);
Expand All @@ -244,7 +244,7 @@ private static function parseParagraph($node, $element, &$styles)
* @todo Think of a clever way of defining header styles, now it is only based on the assumption, that
* Heading1 - Heading6 are already defined somewhere
*/
private static function parseHeading($element, &$styles, $argument1)
protected static function parseHeading($element, &$styles, $argument1)
{
$styles['paragraph'] = $argument1;
$newElement = $element->addTextRun($styles['paragraph']);
Expand All @@ -259,7 +259,7 @@ private static function parseHeading($element, &$styles, $argument1)
* @param \PhpOffice\PhpWord\Element\AbstractContainer $element
* @param array &$styles
*/
private static function parseText($node, $element, &$styles)
protected static function parseText($node, $element, &$styles)
{
$styles['font'] = self::recursiveParseStylesInHierarchy($node, $styles['font']);

Expand All @@ -280,7 +280,7 @@ private static function parseText($node, $element, &$styles)
* @param string $argument1 Style name
* @param string $argument2 Style value
*/
private static function parseProperty(&$styles, $argument1, $argument2)
protected static function parseProperty(&$styles, $argument1, $argument2)
{
$styles['font'][$argument1] = $argument2;
}
Expand All @@ -291,7 +291,7 @@ private static function parseProperty(&$styles, $argument1, $argument2)
* @param \DOMNode $node
* @param array &$styles
*/
private static function parseSpan($node, &$styles)
protected static function parseSpan($node, &$styles)
{
self::parseInlineStyle($node, $styles['font']);
}
Expand All @@ -306,7 +306,7 @@ private static function parseSpan($node, &$styles)
*
* @todo As soon as TableItem, RowItem and CellItem support relative width and height
*/
private static function parseTable($node, $element, &$styles)
protected static function parseTable($node, $element, &$styles)
{
$elementStyles = self::parseInlineStyle($node, $styles['table']);

Expand Down Expand Up @@ -335,7 +335,7 @@ private static function parseTable($node, $element, &$styles)
* @param array &$styles
* @return Row $element
*/
private static function parseRow($node, $element, &$styles)
protected static function parseRow($node, $element, &$styles)
{
$rowStyles = self::parseInlineStyle($node, $styles['row']);
if ($node->parentNode->nodeName == 'thead') {
Expand All @@ -353,7 +353,7 @@ private static function parseRow($node, $element, &$styles)
* @param array &$styles
* @return \PhpOffice\PhpWord\Element\Cell|\PhpOffice\PhpWord\Element\TextRun $element
*/
private static function parseCell($node, $element, &$styles)
protected static function parseCell($node, $element, &$styles)
{
$cellStyles = self::recursiveParseStylesInHierarchy($node, $styles['cell']);

Expand All @@ -376,7 +376,7 @@ private static function parseCell($node, $element, &$styles)
* @param \DOMNode $node
* @return bool Returns true if the node contains an HTML element that cannot be added to TextRun
*/
private static function shouldAddTextRun(\DOMNode $node)
protected static function shouldAddTextRun(\DOMNode $node)
{
$containsBlockElement = self::$xpath->query('.//table|./p|./ul|./ol', $node)->length > 0;
if ($containsBlockElement) {
Expand All @@ -393,7 +393,7 @@ private static function shouldAddTextRun(\DOMNode $node)
* @param \DOMNode $node
* @param array &$styles
*/
private static function recursiveParseStylesInHierarchy(\DOMNode $node, array $style)
protected static function recursiveParseStylesInHierarchy(\DOMNode $node, array $style)
{
$parentStyle = self::parseInlineStyle($node, array());
$style = array_merge($parentStyle, $style);
Expand All @@ -412,7 +412,7 @@ private static function recursiveParseStylesInHierarchy(\DOMNode $node, array $s
* @param array &$styles
* @param array &$data
*/
private static function parseList($node, $element, &$styles, &$data)
protected static function parseList($node, $element, &$styles, &$data)
{
$isOrderedList = $node->nodeName === 'ol';
if (isset($data['listdepth'])) {
Expand All @@ -431,7 +431,7 @@ private static function parseList($node, $element, &$styles, &$data)
* @param bool $isOrderedList
* @return array
*/
private static function getListStyle($isOrderedList)
protected static function getListStyle($isOrderedList)
{
if ($isOrderedList) {
return array(
Expand Down Expand Up @@ -477,7 +477,7 @@ private static function getListStyle($isOrderedList)
* @todo This function is almost the same like `parseChildNodes`. Merged?
* @todo As soon as ListItem inherits from AbstractContainer or TextRun delete parsing part of childNodes
*/
private static function parseListItem($node, $element, &$styles, $data)
protected static function parseListItem($node, $element, &$styles, $data)
{
$cNodes = $node->childNodes;
if (!empty($cNodes)) {
Expand All @@ -495,7 +495,7 @@ private static function parseListItem($node, $element, &$styles, $data)
* @param array $styles
* @return array
*/
private static function parseStyle($attribute, $styles)
protected static function parseStyle($attribute, $styles)
{
$properties = explode(';', trim($attribute->value, " \t\n\r\0\x0B;"));

Expand Down Expand Up @@ -623,7 +623,7 @@ private static function parseStyle($attribute, $styles)
*
* @return \PhpOffice\PhpWord\Element\Image
**/
private static function parseImage($node, $element)
protected static function parseImage($node, $element)
{
$style = array();
$src = null;
Expand Down Expand Up @@ -726,7 +726,7 @@ private static function parseImage($node, $element)
* @param string $cssBorderStyle
* @return null|string
*/
private static function mapBorderStyle($cssBorderStyle)
protected static function mapBorderStyle($cssBorderStyle)
{
switch ($cssBorderStyle) {
case 'none':
Expand All @@ -739,7 +739,7 @@ private static function mapBorderStyle($cssBorderStyle)
}
}

private static function mapBorderColor(&$styles, $cssBorderColor)
protected static function mapBorderColor(&$styles, $cssBorderColor)
{
$numColors = substr_count($cssBorderColor, '#');
if ($numColors === 1) {
Expand All @@ -759,7 +759,7 @@ private static function mapBorderColor(&$styles, $cssBorderColor)
* @param string $cssAlignment
* @return string|null
*/
private static function mapAlign($cssAlignment)
protected static function mapAlign($cssAlignment)
{
switch ($cssAlignment) {
case 'right':
Expand All @@ -778,7 +778,7 @@ private static function mapAlign($cssAlignment)
*
* @param \PhpOffice\PhpWord\Element\AbstractContainer $element
*/
private static function parseLineBreak($element)
protected static function parseLineBreak($element)
{
$element->addTextBreak();
}
Expand All @@ -790,7 +790,7 @@ private static function parseLineBreak($element)
* @param \PhpOffice\PhpWord\Element\AbstractContainer $element
* @param array $styles
*/
private static function parseLink($node, $element, &$styles)
protected static function parseLink($node, $element, &$styles)
{
$target = null;
foreach ($node->attributes as $attribute) {
Expand Down