From 59c706ebe727f40db6a3daba4ee9883f71f33807 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Sun, 31 Oct 2021 22:39:08 +0900 Subject: [PATCH] Fix warnings in PHP 8.1 --- phpstan-baseline.neon | 2 +- src/PhpSpreadsheet/Shared/XMLWriter.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 96eeee15..4423b594 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -5636,7 +5636,7 @@ parameters: path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php - - message: "#^Parameter \\#1 \\$rawTextData of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\XMLWriter\\:\\:writeRawData\\(\\) expects array\\\\|string, int given\\.$#" + message: "#^Parameter \\#1 \\$rawTextData of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\XMLWriter\\:\\:writeRawData\\(\\) expects array\\\\|string\\|null, int given\\.$#" count: 1 path: src/PhpSpreadsheet/Writer/Xlsx/Chart.php diff --git a/src/PhpSpreadsheet/Shared/XMLWriter.php b/src/PhpSpreadsheet/Shared/XMLWriter.php index 6fb38438..84ad8a83 100644 --- a/src/PhpSpreadsheet/Shared/XMLWriter.php +++ b/src/PhpSpreadsheet/Shared/XMLWriter.php @@ -77,7 +77,7 @@ class XMLWriter extends \XMLWriter /** * Wrapper method for writeRaw. * - * @param string|string[] $rawTextData + * @param null|string|string[] $rawTextData * * @return bool */ @@ -87,6 +87,6 @@ class XMLWriter extends \XMLWriter $rawTextData = implode("\n", $rawTextData); } - return $this->writeRaw(htmlspecialchars($rawTextData)); + return $this->writeRaw(htmlspecialchars($rawTextData ?? '')); } }