Skip to content

Commit 24d120b

Browse files
troosantroosan
authored
Merge pull request #1646 from SpinyMan/develop
Change private to protected to be able extending class Html
2 parents 487622b + 415bdb3 commit 24d120b

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎src/PhpWord/Shared/Html.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
*/
3333
class Html
3434
{
35-
private static $listIndex = 0;
36-
private static $xpath;
37-
private static $options;
35+
protected static $listIndex = 0;
36+
protected static $xpath;
37+
protected static $options;
3838

3939
/**
4040
* Add HTML parts.
@@ -203,7 +203,7 @@ protected static function parseNode($node, $element, $styles = array(), $data =
203203
* @param array $styles
204204
* @param array $data
205205
*/
206-
private static function parseChildNodes($node, $element, $styles, $data)
206+
protected static function parseChildNodes($node, $element, $styles, $data)
207207
{
208208
if ('li' != $node->nodeName) {
209209
$cNodes = $node->childNodes;
@@ -225,7 +225,7 @@ private static function parseChildNodes($node, $element, $styles, $data)
225225
* @param array &$styles
226226
* @return \PhpOffice\PhpWord\Element\TextRun
227227
*/
228-
private static function parseParagraph($node, $element, &$styles)
228+
protected static function parseParagraph($node, $element, &$styles)
229229
{
230230
$styles['paragraph'] = self::recursiveParseStylesInHierarchy($node, $styles['paragraph']);
231231
$newElement = $element->addTextRun($styles['paragraph']);
@@ -244,7 +244,7 @@ private static function parseParagraph($node, $element, &$styles)
244244
* @todo Think of a clever way of defining header styles, now it is only based on the assumption, that
245245
* Heading1 - Heading6 are already defined somewhere
246246
*/
247-
private static function parseHeading($element, &$styles, $argument1)
247+
protected static function parseHeading($element, &$styles, $argument1)
248248
{
249249
$styles['paragraph'] = $argument1;
250250
$newElement = $element->addTextRun($styles['paragraph']);
@@ -259,7 +259,7 @@ private static function parseHeading($element, &$styles, $argument1)
259259
* @param \PhpOffice\PhpWord\Element\AbstractContainer $element
260260
* @param array &$styles
261261
*/
262-
private static function parseText($node, $element, &$styles)
262+
protected static function parseText($node, $element, &$styles)
263263
{
264264
$styles['font'] = self::recursiveParseStylesInHierarchy($node, $styles['font']);
265265

@@ -280,7 +280,7 @@ private static function parseText($node, $element, &$styles)
280280
* @param string $argument1 Style name
281281
* @param string $argument2 Style value
282282
*/
283-
private static function parseProperty(&$styles, $argument1, $argument2)
283+
protected static function parseProperty(&$styles, $argument1, $argument2)
284284
{
285285
$styles['font'][$argument1] = $argument2;
286286
}
@@ -291,7 +291,7 @@ private static function parseProperty(&$styles, $argument1, $argument2)
291291
* @param \DOMNode $node
292292
* @param array &$styles
293293
*/
294-
private static function parseSpan($node, &$styles)
294+
protected static function parseSpan($node, &$styles)
295295
{
296296
self::parseInlineStyle($node, $styles['font']);
297297
}
@@ -306,7 +306,7 @@ private static function parseSpan($node, &$styles)
306306
*
307307
* @todo As soon as TableItem, RowItem and CellItem support relative width and height
308308
*/
309-
private static function parseTable($node, $element, &$styles)
309+
protected static function parseTable($node, $element, &$styles)
310310
{
311311
$elementStyles = self::parseInlineStyle($node, $styles['table']);
312312

@@ -335,7 +335,7 @@ private static function parseTable($node, $element, &$styles)
335335
* @param array &$styles
336336
* @return Row $element
337337
*/
338-
private static function parseRow($node, $element, &$styles)
338+
protected static function parseRow($node, $element, &$styles)
339339
{
340340
$rowStyles = self::parseInlineStyle($node, $styles['row']);
341341
if ($node->parentNode->nodeName == 'thead') {
@@ -353,7 +353,7 @@ private static function parseRow($node, $element, &$styles)
353353
* @param array &$styles
354354
* @return \PhpOffice\PhpWord\Element\Cell|\PhpOffice\PhpWord\Element\TextRun $element
355355
*/
356-
private static function parseCell($node, $element, &$styles)
356+
protected static function parseCell($node, $element, &$styles)
357357
{
358358
$cellStyles = self::recursiveParseStylesInHierarchy($node, $styles['cell']);
359359

@@ -376,7 +376,7 @@ private static function parseCell($node, $element, &$styles)
376376
* @param \DOMNode $node
377377
* @return bool Returns true if the node contains an HTML element that cannot be added to TextRun
378378
*/
379-
private static function shouldAddTextRun(\DOMNode $node)
379+
protected static function shouldAddTextRun(\DOMNode $node)
380380
{
381381
$containsBlockElement = self::$xpath->query('.//table|./p|./ul|./ol', $node)->length > 0;
382382
if ($containsBlockElement) {
@@ -393,7 +393,7 @@ private static function shouldAddTextRun(\DOMNode $node)
393393
* @param \DOMNode $node
394394
* @param array &$styles
395395
*/
396-
private static function recursiveParseStylesInHierarchy(\DOMNode $node, array $style)
396+
protected static function recursiveParseStylesInHierarchy(\DOMNode $node, array $style)
397397
{
398398
$parentStyle = self::parseInlineStyle($node, array());
399399
$style = array_merge($parentStyle, $style);
@@ -412,7 +412,7 @@ private static function recursiveParseStylesInHierarchy(\DOMNode $node, array $s
412412
* @param array &$styles
413413
* @param array &$data
414414
*/
415-
private static function parseList($node, $element, &$styles, &$data)
415+
protected static function parseList($node, $element, &$styles, &$data)
416416
{
417417
$isOrderedList = $node->nodeName === 'ol';
418418
if (isset($data['listdepth'])) {
@@ -431,7 +431,7 @@ private static function parseList($node, $element, &$styles, &$data)
431431
* @param bool $isOrderedList
432432
* @return array
433433
*/
434-
private static function getListStyle($isOrderedList)
434+
protected static function getListStyle($isOrderedList)
435435
{
436436
if ($isOrderedList) {
437437
return array(
@@ -477,7 +477,7 @@ private static function getListStyle($isOrderedList)
477477
* @todo This function is almost the same like `parseChildNodes`. Merged?
478478
* @todo As soon as ListItem inherits from AbstractContainer or TextRun delete parsing part of childNodes
479479
*/
480-
private static function parseListItem($node, $element, &$styles, $data)
480+
protected static function parseListItem($node, $element, &$styles, $data)
481481
{
482482
$cNodes = $node->childNodes;
483483
if (!empty($cNodes)) {
@@ -495,7 +495,7 @@ private static function parseListItem($node, $element, &$styles, $data)
495495
* @param array $styles
496496
* @return array
497497
*/
498-
private static function parseStyle($attribute, $styles)
498+
protected static function parseStyle($attribute, $styles)
499499
{
500500
$properties = explode(';', trim($attribute->value, " \t\n\r\0\x0B;"));
501501

@@ -623,7 +623,7 @@ private static function parseStyle($attribute, $styles)
623623
*
624624
* @return \PhpOffice\PhpWord\Element\Image
625625
**/
626-
private static function parseImage($node, $element)
626+
protected static function parseImage($node, $element)
627627
{
628628
$style = array();
629629
$src = null;
@@ -726,7 +726,7 @@ private static function parseImage($node, $element)
726726
* @param string $cssBorderStyle
727727
* @return null|string
728728
*/
729-
private static function mapBorderStyle($cssBorderStyle)
729+
protected static function mapBorderStyle($cssBorderStyle)
730730
{
731731
switch ($cssBorderStyle) {
732732
case 'none':
@@ -739,7 +739,7 @@ private static function mapBorderStyle($cssBorderStyle)
739739
}
740740
}
741741

742-
private static function mapBorderColor(&$styles, $cssBorderColor)
742+
protected static function mapBorderColor(&$styles, $cssBorderColor)
743743
{
744744
$numColors = substr_count($cssBorderColor, '#');
745745
if ($numColors === 1) {
@@ -759,7 +759,7 @@ private static function mapBorderColor(&$styles, $cssBorderColor)
759759
* @param string $cssAlignment
760760
* @return string|null
761761
*/
762-
private static function mapAlign($cssAlignment)
762+
protected static function mapAlign($cssAlignment)
763763
{
764764
switch ($cssAlignment) {
765765
case 'right':
@@ -778,7 +778,7 @@ private static function mapAlign($cssAlignment)
778778
*
779779
* @param \PhpOffice\PhpWord\Element\AbstractContainer $element
780780
*/
781-
private static function parseLineBreak($element)
781+
protected static function parseLineBreak($element)
782782
{
783783
$element->addTextBreak();
784784
}
@@ -790,7 +790,7 @@ private static function parseLineBreak($element)
790790
* @param \PhpOffice\PhpWord\Element\AbstractContainer $element
791791
* @param array $styles
792792
*/
793-
private static function parseLink($node, $element, &$styles)
793+
protected static function parseLink($node, $element, &$styles)
794794
{
795795
$target = null;
796796
foreach ($node->attributes as $attribute) {

0 commit comments

Comments
 (0)