Minor cosmetic changes
This commit is contained in:
parent
813c2c7c70
commit
6e93505cf5
|
|
@ -1660,6 +1660,11 @@ parameters:
|
||||||
count: 1
|
count: 1
|
||||||
path: src/PhpSpreadsheet/Reader/Xls/RC4.php
|
path: src/PhpSpreadsheet/Reader/Xls/RC4.php
|
||||||
|
|
||||||
|
-
|
||||||
|
message: "#^Cannot access property \\$r on SimpleXMLElement\\|null\\.$#"
|
||||||
|
count: 2
|
||||||
|
path: src/PhpSpreadsheet/Reader/Xlsx.php
|
||||||
|
|
||||||
-
|
-
|
||||||
message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|false given\\.$#"
|
message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|false given\\.$#"
|
||||||
count: 1
|
count: 1
|
||||||
|
|
@ -2750,6 +2755,16 @@ parameters:
|
||||||
count: 1
|
count: 1
|
||||||
path: src/PhpSpreadsheet/Writer/Xls.php
|
path: src/PhpSpreadsheet/Writer/Xls.php
|
||||||
|
|
||||||
|
-
|
||||||
|
message: "#^Offset 'length' does not exist on array\\{data\\: non\\-empty\\-string, length\\?\\: int\\<1, max\\>\\}\\|array\\{pack\\?\\: 'V', data\\: non\\-empty\\-string\\}\\.$#"
|
||||||
|
count: 1
|
||||||
|
path: src/PhpSpreadsheet/Writer/Xls.php
|
||||||
|
|
||||||
|
-
|
||||||
|
message: "#^Offset 'length' does not exist on array\\{data\\: non\\-empty\\-string\\|false, length\\?\\: int\\<1, max\\>\\}\\|array\\{pack\\?\\: 'V', data\\: 1252\\|786432\\|false\\}\\.$#"
|
||||||
|
count: 1
|
||||||
|
path: src/PhpSpreadsheet/Writer/Xls.php
|
||||||
|
|
||||||
-
|
-
|
||||||
message: "#^Offset 'startCoordinates' does not exist on array\\|null\\.$#"
|
message: "#^Offset 'startCoordinates' does not exist on array\\|null\\.$#"
|
||||||
count: 1
|
count: 1
|
||||||
|
|
@ -2912,7 +2927,7 @@ parameters:
|
||||||
|
|
||||||
-
|
-
|
||||||
message: "#^Cannot access offset 1 on array\\|false\\.$#"
|
message: "#^Cannot access offset 1 on array\\|false\\.$#"
|
||||||
count: 1
|
count: 2
|
||||||
path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
|
path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
|
||||||
|
|
||||||
-
|
-
|
||||||
|
|
|
||||||
|
|
@ -4864,6 +4864,7 @@ class Calculation
|
||||||
if (isset($storeKey)) {
|
if (isset($storeKey)) {
|
||||||
$branchStore[$storeKey] = $cellValue;
|
$branchStore[$storeKey] = $cellValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
} elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $token ?? '', $matches)) {
|
} elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $token ?? '', $matches)) {
|
||||||
// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
|
// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
|
||||||
if ($pCellParent) {
|
if ($pCellParent) {
|
||||||
|
|
|
||||||
|
|
@ -487,7 +487,7 @@ class Xlsx extends BaseReader
|
||||||
$propertyReader->readCustomProperties($this->getFromZipArchive($zip, $relTarget));
|
$propertyReader->readCustomProperties($this->getFromZipArchive($zip, $relTarget));
|
||||||
|
|
||||||
break;
|
break;
|
||||||
// Ribbon
|
//Ribbon
|
||||||
case Namespaces::EXTENSIBILITY:
|
case Namespaces::EXTENSIBILITY:
|
||||||
$customUI = $relTarget;
|
$customUI = $relTarget;
|
||||||
if ($customUI) {
|
if ($customUI) {
|
||||||
|
|
@ -1703,8 +1703,8 @@ class Xlsx extends BaseReader
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'application/vnd.ms-excel.controlproperties+xml':
|
|
||||||
// unparsed
|
// unparsed
|
||||||
|
case 'application/vnd.ms-excel.controlproperties+xml':
|
||||||
$unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
|
$unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
@ -1729,7 +1729,7 @@ class Xlsx extends BaseReader
|
||||||
if (isset($is->t)) {
|
if (isset($is->t)) {
|
||||||
$value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
|
$value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
|
||||||
} else {
|
} else {
|
||||||
if (isset($is->r) && is_object($is->r)) {
|
if (is_object($is->r)) {
|
||||||
/** @var SimpleXMLElement $run */
|
/** @var SimpleXMLElement $run */
|
||||||
foreach ($is->r as $run) {
|
foreach ($is->r as $run) {
|
||||||
if (!isset($run->rPr)) {
|
if (!isset($run->rPr)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue