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

Anticipate Dependabot November 2023 #3780

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Anticipate Dependabot November 2023 #3780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b5317c
Anticipate Dependabot November 2023
oleibman Oct 31, 2023
5885f2c
Merge branch 'master' into depend202311
oleibman Oct 31, 2023
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
51 changes: 23 additions & 28 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/PhpSpreadsheet/Calculation/Calculation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4409,7 +4409,7 @@ private function internalParseFormula($formula, ?Cell $cell = null): bool|array
[$rangeWS2, $val] = Worksheet::extractSheetTitle($val, true);
if ($rangeWS2 !== '') {
$rangeWS2 .= '!';
} else { // @phpstan-ignore-line
} else {
$rangeWS2 = $rangeWS1;
}

Expand Down
3 changes: 1 addition & 2 deletions src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,7 @@ public function stream_seek($offset, $whence): bool // @codingStandardsIgnoreLin
$this->pos = $offset;
} elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
$this->pos += $offset;
// @phpstan-ignore-next-line
} elseif ($whence == SEEK_END && -$offset <= count($this->data)) {
} elseif ($whence == SEEK_END && -$offset <= count($this->data)) { // @phpstan-ignore-line
$this->pos = strlen($this->data) + $offset;
} else {
return false;
Expand Down
10 changes: 5 additions & 5 deletions src/PhpSpreadsheet/Writer/Xls.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,12 +747,12 @@ private function writeDocumentSummaryInformation(): string
$dataSection_Content .= $dataProp['data']['data'];

$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
/* Condition below can never be true
} elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
$dataSection_Content .= $dataProp['data']['data'];
/* Condition below can never be true
} elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
$dataSection_Content .= $dataProp['data']['data'];

$dataSection_Content_Offset += 4 + 8;
*/
$dataSection_Content_Offset += 4 + 8;
*/
} else {
$dataSection_Content .= $dataProp['data']['data'];

Expand Down