Re-merge from baseline

This commit is contained in:
MarkBaker
2022-02-27 14:15:49 +01:00
parent 4d0f426f4f
commit cff8303f1b
2 changed files with 7 additions and 2 deletions
+5
View File
@@ -2170,6 +2170,11 @@ parameters:
count: 1
path: src/PhpSpreadsheet/Reader/Html.php
-
message: "#^Call to an undefined method DOMNode\\:\\:getElementsByTagNameNS\\(\\)\\.$#"
count: 2
path: src/PhpSpreadsheet/Reader/Ods.php
-
message: "#^Cannot call method children\\(\\) on SimpleXMLElement\\|false\\.$#"
count: 1
+2 -2
View File
@@ -625,7 +625,7 @@ class Ods extends BaseReader
}
}
private function activeSheet(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
private function activeSheet(DOMNode $settings, Spreadsheet $spreadsheet, string $configNs): void
{
/** @var DOMElement $t */
foreach ($settings->getElementsByTagNameNS($configNs, 'config-item') as $t) {
@@ -641,7 +641,7 @@ class Ods extends BaseReader
}
}
private function selectedCells(DOMElement $settings, Spreadsheet $spreadsheet, string $configNs): void
private function selectedCells(DOMNode $settings, Spreadsheet $spreadsheet, string $configNs): void
{
/** @var DOMElement $t */
foreach ($settings->getElementsByTagNameNS($configNs, 'config-item-map-named') as $t) {