Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set default value on empty value attribute

Browse Source
This commit is contained in:
Artem Vasilev 2022-11-22 13:43:03 +03:00
parent 0af4ca1f6e
commit 573f1c3ea1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PhpWord/Reader/Word2007/AbstractPart.php
View File

@ -626,7 +626,7 @@ abstract class AbstractPart
$styles = []; $styles = [];
foreach ($styleDefs as $styleProp => $styleVal) { foreach ($styleDefs as $styleProp => $styleVal) {
[$method, $element, $attribute, $expected] = array_pad($styleVal, 4, null); [$method, $element, $attribute, $expected, $default] = array_pad($styleVal, 5, null);
$element = $this->findPossibleElement($xmlReader, $parentNode, $element); $element = $this->findPossibleElement($xmlReader, $parentNode, $element);
if ($element === null) { if ($element === null) {
@ -640,7 +640,7 @@ abstract class AbstractPart
// Use w:val as default if no attribute assigned // Use w:val as default if no attribute assigned
$attribute = ($attribute === null) ? 'w:val' : $attribute; $attribute = ($attribute === null) ? 'w:val' : $attribute;
$attributeValue = $xmlReader->getAttribute($attribute, $node); $attributeValue = $xmlReader->getAttribute($attribute, $node) ?? $default;
$styleValue = $this->readStyleDef($method, $attributeValue, $expected); $styleValue = $this->readStyleDef($method, $attributeValue, $expected);
if ($styleValue !== null) { if ($styleValue !== null) {