From 004eacc49b5f06a27b0b916a985a3da2d5db25b1 Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Thu, 27 May 2021 11:46:39 +0200 Subject: [PATCH] Update changelog, and phpstan appeasement --- CHANGELOG.md | 1 + phpstan-baseline.neon | 5 ----- src/PhpSpreadsheet/DocumentGenerator.php | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ade195d37c..2ffa265bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). - Use of `nb` rather than `no` as the locale language code for Norsk Bokmål. ### Fixed +- Resolve default values when a null argument is passed for HLOOKUP(), VLOOKUP() and ADDRESS() functions [Issue #2120](https://github.com/PHPOffice/PhpSpreadsheet/issues/2120) - [PR #2121](https://github.com/PHPOffice/PhpSpreadsheet/pull/2121) - Fixed incorrect R1C1 to A1 subtraction formula conversion (`R[-2]C-R[2]C`) [Issue #2076](https://github.com/PHPOffice/PhpSpreadsheet/pull/2076) [PR #2086](https://github.com/PHPOffice/PhpSpreadsheet/pull/2086) - Correctly handle absolute A1 references when converting to R1C1 format [PR #2060](https://github.com/PHPOffice/PhpSpreadsheet/pull/2060) - Correct default fill style for conditional without a pattern defined [Issue #2035](https://github.com/PHPOffice/PhpSpreadsheet/issues/2035) [PR #2050](https://github.com/PHPOffice/PhpSpreadsheet/pull/2050) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index b209e82282..b2da4ec1d0 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2240,11 +2240,6 @@ parameters: count: 1 path: src/PhpSpreadsheet/DocumentGenerator.php - - - message: "#^Cannot access offset 0 on \\(int\\|string\\)\\.$#" - count: 2 - path: src/PhpSpreadsheet/DocumentGenerator.php - - message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\HashTable\\:\\:getIndexForHashCode\\(\\) should return int but returns int\\|string\\|false\\.$#" count: 1 diff --git a/src/PhpSpreadsheet/DocumentGenerator.php b/src/PhpSpreadsheet/DocumentGenerator.php index acd25100c9..e67d967443 100644 --- a/src/PhpSpreadsheet/DocumentGenerator.php +++ b/src/PhpSpreadsheet/DocumentGenerator.php @@ -78,6 +78,7 @@ public static function generateFunctionListByName(array $phpSpreadsheetFunctions $result = "# Function list by name\n"; $lastAlphabet = null; foreach ($phpSpreadsheetFunctions as $excelFunction => $functionInfo) { + /** @var string $excelFunction */ $lengths = [25, 31, 37]; if ($lastAlphabet !== $excelFunction[0]) { $lastAlphabet = $excelFunction[0];